diff --git a/tests/integration/multinodes.nim b/tests/integration/multinodes.nim index f31d6802..b09507f7 100644 --- a/tests/integration/multinodes.nim +++ b/tests/integration/multinodes.nim @@ -196,6 +196,7 @@ template multinodesuite*(name: string, body: untyped) = proc startClientNode(conf: CodexConfig): Future[NodeProcess] {.async.} = let clientIdx = clients().len var config = conf + config.addCliOption(StartUpCmd.persistence, "--eth-provider", "http://localhost:8545") config.addCliOption(StartUpCmd.persistence, "--eth-account", $accounts[running.len]) return await newCodexProcess(clientIdx, config, Role.Client) @@ -203,6 +204,7 @@ template multinodesuite*(name: string, body: untyped) = let providerIdx = providers().len var config = conf config.addCliOption("--bootstrap-node", bootstrap) + config.addCliOption(StartUpCmd.persistence, "--eth-provider", "http://localhost:8545") config.addCliOption(StartUpCmd.persistence, "--eth-account", $accounts[running.len]) config.addCliOption(PersistenceCmd.prover, "--circom-r1cs", "vendor/codex-contracts-eth/verifier/networks/hardhat/proof_main.r1cs") @@ -217,6 +219,7 @@ template multinodesuite*(name: string, body: untyped) = let validatorIdx = validators().len var config = conf config.addCliOption("--bootstrap-node", bootstrap) + config.addCliOption(StartUpCmd.persistence, "--eth-provider", "http://localhost:8545") config.addCliOption(StartUpCmd.persistence, "--eth-account", $accounts[running.len]) config.addCliOption(StartUpCmd.persistence, "--validator") @@ -261,7 +264,10 @@ template multinodesuite*(name: string, body: untyped) = quit(1) try: - ethProvider = JsonRpcProvider.new("ws://localhost:8545") + # Workaround for https://github.com/NomicFoundation/hardhat/issues/2053 + # Do not use websockets, but use http and polling to stop subscriptions + # from being removed after 5 minutes + ethProvider = JsonRpcProvider.new("http://localhost:8545") # if hardhat was NOT started by the test, take a snapshot so it can be # reverted in the test teardown if nodeConfigs.hardhat.isNone: diff --git a/tests/integration/twonodes.nim b/tests/integration/twonodes.nim index abf20c57..1cc2ae89 100644 --- a/tests/integration/twonodes.nim +++ b/tests/integration/twonodes.nim @@ -43,6 +43,7 @@ template twonodessuite*(name: string, debug1, debug2: string, body) = "--circom-r1cs=tests/circuits/fixtures/proof_main.r1cs", "--circom-wasm=tests/circuits/fixtures/proof_main.wasm", "--circom-zkey=tests/circuits/fixtures/proof_main.zkey", + "--eth-provider=http://localhost:8545", "--eth-account=" & $account1 ] @@ -67,6 +68,7 @@ template twonodessuite*(name: string, debug1, debug2: string, body) = "--circom-r1cs=tests/circuits/fixtures/proof_main.r1cs", "--circom-wasm=tests/circuits/fixtures/proof_main.wasm", "--circom-zkey=tests/circuits/fixtures/proof_main.zkey", + "--eth-provider=http://localhost:8545", "--eth-account=" & $account2 ] diff --git a/vendor/codex-contracts-eth b/vendor/codex-contracts-eth index cc69f3a3..11ccefd7 160000 --- a/vendor/codex-contracts-eth +++ b/vendor/codex-contracts-eth @@ -1 +1 @@ -Subproject commit cc69f3a3ae7001baa2425e5cbb90f7b1b2cab05b +Subproject commit 11ccefd720f1932608b67db95af5b72d73d1257b