Skip to content
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

Jump to bottom

feat: test network long blocks #29

Merged
merged 4 commits into from
Sep 15, 2023
Merged

feat: test network long blocks #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b05a3fe
feat: optional custom block time
atanmarko Sep 15, 2023
18feda8
fix: lint
atanmarko Sep 15, 2023
bc1743a
fix: printout
atanmarko Sep 15, 2023
fc5ca83
fix: remove comments
atanmarko Sep 15, 2023
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
4 changes: 2 additions & 2 deletions consensus/ibft/signer/helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func Test_wrapCommitHash(t *testing.T) {
assert.Equal(t, expectedOutput, output)
}

// nolint
//nolint
atanmarko marked this conversation as resolved.
Show resolved Hide resolved
func Test_getOrCreateECDSAKey(t *testing.T) {
t.Parallel()

Expand Down Expand Up @@ -184,7 +184,7 @@ func Test_getOrCreateECDSAKey(t *testing.T) {
}
}

// nolint
//nolint
func Test_getOrCreateBLSKey(t *testing.T) {
t.Parallel()

Expand Down
6 changes: 5 additions & 1 deletion docker/local-topos/polygon-edge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CONTRACTS_PATH=/contracts
GENESIS_PATH=/data/genesis.json
CHAIN_ID="${CHAIN_ID:-100}" # 100 is Edge's default value
NUMBER_OF_NODES="${NUMBER_OF_NODES:-4}" # Number of subnet nodes in the consensus
BLOCK_TIME="${BLOCK_TIME:-2s}" # Block time in seconds
BOOTNODE_DOMAIN_NAME="${BOOTNODE_DOMAIN_NAME:-node-1}"
CHAIN_CUSTOM_OPTIONS=$(tr "\n" " " << EOL
--block-gas-limit 10000000
Expand Down Expand Up @@ -46,6 +47,7 @@ case "$1" in
cd /data && /polygon-edge/polygon-edge genesis $CHAIN_CUSTOM_OPTIONS \
--dir genesis.json \
--consensus ibft \
--block-time $BLOCK_TIME \
--ibft-validators-prefix-path data- \
--max-validator-count=$NUMBER_OF_NODES \
--bootnode /dns4/"$BOOTNODE_DOMAIN_NAME"/tcp/1478/p2p/$BOOTNODE_ID \
Expand Down Expand Up @@ -75,6 +77,7 @@ case "$1" in
"$POLYGON_EDGE_BIN" genesis $CHAIN_CUSTOM_OPTIONS \
--dir "$GENESIS_PATH" \
--consensus polybft \
--block-time $BLOCK_TIME \
--manifest /data/manifest.json \
--max-validator-count=$NUMBER_OF_NODES \
--bootnode /dns4/"$BOOTNODE_DOMAIN_NAME"/tcp/1478/p2p/$BOOTNODE_ID
Expand Down Expand Up @@ -102,12 +105,13 @@ case "$1" in
echo "Generating genesis script..."
"$POLYGON_EDGE_BIN" genesis --dir genesis.json \
--consensus ibft \
--block-time $BLOCK_TIME \
--ibft-validators-prefix-path data- \
--max-validator-count=1 \
--premine=0x4AAb25B4fAd0Beaac466050f3A7142A502f4Cf0a:1000000000000000000000 \
--bootnode /ip4/127.0.0.1/tcp/10001/p2p/$NODE_ID

echo "Executing polygon-edge standalone node..."
echo "Executing polygon-edge standalone node with block time " $BLOCK_TIME
exec "$POLYGON_EDGE_BIN" server --data-dir ./data-1 --chain genesis.json
;;

Expand Down
2 changes: 0 additions & 2 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,6 @@ func (j *jsonRPCHub) GetAccount(root types.Hash, addr types.Address) (*jsonrpc.A
return account, nil
}

// TODO: use eth_getProof once it is available in Polygon Edge
func (j *jsonRPCHub) GetAccountProof(root types.Hash, addr types.Address) ([][]byte, error) {
proof, err := getAccountProofImpl(j.state, root, addr)
if err != nil {
Expand Down Expand Up @@ -736,7 +735,6 @@ func (j *jsonRPCHub) GetStorage(stateRoot types.Hash, addr types.Address, slot t
return res.Bytes(), nil
}

// TODO: use eth_getProof once it is available in Polygon Edge
func (j *jsonRPCHub) GetStorageProof(stateRoot types.Hash, addr types.Address, slot types.Hash) ([][]byte, error) {
account, err := getAccountImpl(j.state, stateRoot, addr)
if err != nil {
Expand Down