From 2b7c2cdae88961303b5b0e924875615057751af2 Mon Sep 17 00:00:00 2001 From: Ayoub Benaissa Date: Thu, 5 Oct 2023 15:06:45 +0100 Subject: [PATCH 1/4] chore: update geth to add remainder support --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1817da62..5e994395 100644 --- a/go.mod +++ b/go.mod @@ -173,6 +173,6 @@ replace ( replace github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 // TODO: Remove once our forks are public. -replace github.com/ethereum/go-ethereum v1.10.19 => github.com/zama-ai/go-ethereum v0.1.11 +replace github.com/ethereum/go-ethereum v1.10.19 => github.com/zama-ai/go-ethereum v0.1.12 replace github.com/evmos/ethermint v0.19.3 => github.com/zama-ai/ethermint v0.1.2 From bde6b358ab47bcf37c0f4f7ee1f6eb16dd6e5233 Mon Sep 17 00:00:00 2001 From: Ayoub Benaissa Date: Thu, 5 Oct 2023 15:08:14 +0100 Subject: [PATCH 2/4] chore: update solidity lib to add remainder support --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 77050383..28c798f7 100755 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ FHEVM_DECRYPTIONS_DB_VERSION ?= v0.2.0 FHEVM_SOLIDITY_PATH ?= $(WORKDIR)/fhevm-solidity FHEVM_SOLIDITY_PATH_EXISTS := $(shell test -d $(FHEVM_SOLIDITY_PATH)/.git && echo "true" || echo "false") -FHEVM_SOLIDITY_VERSION ?= v0.1.12 +FHEVM_SOLIDITY_VERSION ?= v0.1.14 ETHERMINT_VERSION := $(shell ./scripts/get_module_version.sh go.mod zama.ai/ethermint) GO_ETHEREUM_VERSION := $(shell ./scripts/get_module_version.sh go.mod zama.ai/go-ethereum) UPDATE_GO_MOD = go.mod.updated From a3b6cf55020eef34ba922a0833b2ec7e21cadbc2 Mon Sep 17 00:00:00 2001 From: Levent Demir Date: Fri, 6 Oct 2023 09:22:32 +0200 Subject: [PATCH 3/4] ci: add LOCAL_IMAGE_NAME=evmosnode0 to allow specific docker image name for faucet call in fhevm --- scripts/run_tests.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index 7dc49418..a17e2dc3 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -1,9 +1,4 @@ #!/bin/bash cp .env.example .env -docker exec -i evmosnodelocal0 faucet $(npx hardhat task:getEthereumAddress) -sleep 8 -docker exec -i evmosnodelocal0 faucet $(npx hardhat accounts | grep 0x | sed -n '2p') -sleep 8 -docker exec -i evmosnodelocal0 faucet $(npx hardhat accounts | grep 0x | sed -n '3p') -npm test +LOCAL_IMAGE_NAME=evmosnodelocal0 npm run test:inband From 2862692229b032d9430b899081ae1f3e9d34d62a Mon Sep 17 00:00:00 2001 From: Levent Demir Date: Fri, 6 Oct 2023 09:27:09 +0200 Subject: [PATCH 4/4] ci: update env variable name --- scripts/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index a17e2dc3..bf90eeaa 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -1,4 +1,4 @@ #!/bin/bash cp .env.example .env -LOCAL_IMAGE_NAME=evmosnodelocal0 npm run test:inband +TEST_CONTAINER_NAME=evmosnodelocal0 npm run test:inband