Skip to content

fix: 0x prefixes, missing parameters, readme.md inconsistencies #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juanmardefago wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −5
Open

fix: 0x prefixes, missing parameters, readme.md inconsistencies #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,10 @@ Runs alongside the data provider (substreams-tier1) and handles:
```bash
# Using devenv addresses (User1 as accepted signer)
sds provider sidecar \
--service-provider-address 0xa6f1845e54b1d6a95319251f1ca775b4ad406cdf \
--service-provider 0xa6f1845e54b1d6a95319251f1ca775b4ad406cdf \
--collector-address 0x1d01649b4f94722b55b5c3b3e10fe26cd90c1ba9 \
--escrow-address 0xfc7487a37ca8eac2e64cba61277aa109e9b8631e \
--rpc-endpoint <RPC_URL_FROM_DEVENV> \
--accepted-signers 0x90353af8461a969e755ef1e1dbadb9415ae5cb6e
```

Expand Down
6 changes: 4 additions & 2 deletions cmd/sds/consumer_sidecar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"strings"
"time"

"github.com/graphprotocol/substreams-data-service/consumer/sidecar"
Expand Down Expand Up @@ -42,8 +43,9 @@ func runConsumerSidecar(cmd *cobra.Command, args []string) error {
collectorHex := sflags.MustGetString(cmd, "collector-address")

cli.Ensure(signerKeyHex != "", "<signer-private-key> is required")
signerKey, err := eth.NewPrivateKey(signerKeyHex)
cli.NoError(err, "invalid <signer-private-key> %q", signerKeyHex)
normalizedSignerKeyHex := strings.TrimPrefix(signerKeyHex, "0x")
signerKey, err := eth.NewPrivateKey(normalizedSignerKeyHex)
cli.NoError(err, "invalid <signer-private-key> %q (expected 32-byte hex, with or without 0x prefix)", signerKeyHex)

cli.Ensure(collectorHex != "", "<collector-address> is required")
collectorAddr, err := eth.NewAddress(collectorHex)
Expand Down
6 changes: 4 additions & 2 deletions cmd/sds/provider_fake_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package main
import (
"math/big"
"net/http"
"strings"
"time"

"connectrpc.com/connect"
Expand Down Expand Up @@ -65,8 +66,9 @@ func runProviderFakeOperator(cmd *cobra.Command, args []string) error {
delayBetweenBatches := sflags.MustGetDuration(cmd, "delay-between-batches")

cli.Ensure(signerKeyHex != "", "<signer-private-key> is required")
signerKey, err := eth.NewPrivateKey(signerKeyHex)
cli.NoError(err, "invalid <signer-private-key> %q", signerKeyHex)
normalizedSignerKeyHex := strings.TrimPrefix(signerKeyHex, "0x")
signerKey, err := eth.NewPrivateKey(normalizedSignerKeyHex)
cli.NoError(err, "invalid <signer-private-key> %q (expected 32-byte hex, with or without 0x prefix)", signerKeyHex)

cli.Ensure(collectorHex != "", "<collector-address> is required")
collectorAddr, err := eth.NewAddress(collectorHex)
Expand Down