Skip to content

Commit 4ad82c5

Browse files
authoredDec 6, 2023
clients/erigon, simulators/ethereum/rpc: patch RPC tests for erigon (#953)
TTDPassed=true would make Erigon consider it POS chain - not applicable for clique or fakepow-based tests
1 parent 4138aa0 commit 4ad82c5

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed
 

‎clients/erigon/erigon.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fi
128128

129129
# Configure RPC.
130130
FLAGS="$FLAGS --http --http.addr=0.0.0.0 --http.api=admin,debug,eth,net,txpool,web3"
131-
FLAGS="$FLAGS --ws"
131+
FLAGS="$FLAGS --ws --ws.port=8546"
132132

133133
# Increase blob slots for tests
134134
FLAGS="$FLAGS --txpool.blobslots=1000"

‎clients/erigon/mapper.jq

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def to_bool:
5454
"grayGlacierBlock": env.HIVE_FORK_GRAY_GLACIER|to_int,
5555
"mergeNetsplitBlock": env.HIVE_MERGE_BLOCK_ID|to_int,
5656
"terminalTotalDifficulty": env.HIVE_TERMINAL_TOTAL_DIFFICULTY|to_int,
57-
"terminalTotalDifficultyPassed": true,
57+
"terminalTotalDifficultyPassed": (if env.HIVE_TERMINAL_TOTAL_DIFFICULTY_PASSED == null then 1 else env.HIVE_TERMINAL_TOTAL_DIFFICULTY_PASSED|to_bool end),
5858
"shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int,
5959
"cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int,
6060
}|remove_empty

‎simulators/ethereum/rpc/main.go

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ var clientEnv = hivesim.Params{
3131
"HIVE_CLIQUE_PERIOD": "1",
3232
"HIVE_CLIQUE_PRIVATEKEY": "9c647b8b7c4e7c3490668fb6c11473619db80c93704c70893d3813af4090c39c",
3333
"HIVE_MINER": "658bdf435d810c91414ec09147daa6db62406379",
34+
"HIVE_TERMINAL_TOTAL_DIFFICULTY_PASSED": "0",
3435
}
3536

3637
var files = map[string]string{

0 commit comments

Comments
 (0)