diff --git a/docs/kiln_geth_local_testnet.md b/docs/kiln_geth_local_testnet.md index 263363752..28618bcc5 100644 --- a/docs/kiln_geth_local_testnet.md +++ b/docs/kiln_geth_local_testnet.md @@ -1,6 +1,6 @@ # How to run Geth -- Clone Geth: `git clone --branch merge-kiln https://github.com/MariusVanDerWijden/go-ethereum.git ~/execution_clients/go-ethereum +- Clone Geth: `git clone --branch merge-kiln-v2 https://github.com/MariusVanDerWijden/go-ethereum.git ~/go-ethereum` - Build Geth with `make geth` - Run `scripts/run-catalyst.sh` to run Geth. It listens on port 8551. diff --git a/scripts/run-catalyst.sh b/scripts/run-catalyst.sh index b7603d653..0f1b76aab 100755 --- a/scripts/run-catalyst.sh +++ b/scripts/run-catalyst.sh @@ -53,4 +53,4 @@ echo \{\ ~/go-ethereum/build/bin/geth --http --ws -http.api "engine" --datadir "${GETHDATADIR}" account import <(echo 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8) # Start the node (and press enter once to unlock the account) -~/go-ethereum/build/bin/geth --http --ws --ws.port 8551 --http.port 8550 --http.api "eth,net,engine" -ws.api "eth,net,engine" --datadir "${GETHDATADIR}" --allow-insecure-unlock --unlock "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" --password "" --nodiscover console +~/go-ethereum/build/bin/geth --http --ws --http.api "eth,net,engine" -ws.api "eth,net,engine" --datadir "${GETHDATADIR}" --allow-insecure-unlock --unlock "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" --password "" --nodiscover console diff --git a/scripts/test_merge_vectors.nim b/scripts/test_merge_vectors.nim index 6c6603fbd..fe19b57d0 100644 --- a/scripts/test_merge_vectors.nim +++ b/scripts/test_merge_vectors.nim @@ -6,12 +6,12 @@ import chronos, web3/[engine_api_types, ethtypes], ../beacon_chain/eth1/eth1_monitor, ../beacon_chain/spec/[digest, presets], - ./testutil + ../tests/testutil suite "Merge test vectors": setup: let web3Provider = (waitFor Web3DataProvider.new( - default(Eth1Address), "ws://127.0.0.1:8551")).get + default(Eth1Address), "http://127.0.0.1:8545")).get test "getPayload, newPayload, and forkchoiceUpdated": const feeRecipient =