From 4f4207a1d5d7f38b2c85675095d19c3d87587903 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 7 Aug 2023 12:54:59 +0300 Subject: [PATCH 1/2] Allow extra arguments for evmos image --- scripts/run_developer_image.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/run_developer_image.sh b/scripts/run_developer_image.sh index 515a6367..e1f95293 100755 --- a/scripts/run_developer_image.sh +++ b/scripts/run_developer_image.sh @@ -23,4 +23,5 @@ LOGLEVEL="info" evmosd start --home /root/.evmosd --pruning=nothing $TRACE --log_level $LOGLEVEL \ --minimum-gas-prices=0.0001aevmos \ --json-rpc.gas-cap=50000000 \ - --json-rpc.api eth,txpool,net,web3 + --json-rpc.api eth,txpool,net,web3 \ + "$@" From af0356e11f4ca2275856de94877b69952f548aa1 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 24 Aug 2023 12:24:14 +0300 Subject: [PATCH 2/2] Update go-ethereum to v0.1.9 --- Makefile | 8 ++++---- go.mod | 2 +- scripts/run_developer_image.sh | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 19de8582..26f1dce0 100755 --- a/Makefile +++ b/Makefile @@ -35,21 +35,21 @@ GOPRIVATE = github.com/zama-ai/* TFHE_RS_PATH ?= $(WORKDIR)/tfhe-rs TFHE_RS_EXISTS := $(shell test -d $(TFHE_RS_PATH)/.git && echo "true" || echo "false") -TFHE_RS_VERSION ?= 0.3.0-beta.0 +TFHE_RS_VERSION ?= 0.3.1 # If false, fhevm-tfhe-cli is cloned, built (version is FHEVM_TFHE_CLI_VERSION) USE_DOCKER_FOR_FHE_KEYS ?= true FHEVM_TFHE_CLI_PATH ?= $(WORKDIR)/fhevm-tfhe-cli FHEVM_TFHE_CLI_PATH_EXISTS := $(shell test -d $(FHEVM_TFHE_CLI_PATH)/.git && echo "true" || echo "false") -FHEVM_TFHE_CLI_VERSION ?= v0.1.2 +FHEVM_TFHE_CLI_VERSION ?= v0.2.0 FHEVM_DECRYPTIONS_DB_PATH ?= $(WORKDIR)/fhevm-decryptions-db FHEVM_DECRYPTIONS_DB_PATH_EXISTS := $(shell test -d $(FHEVM_DECRYPTIONS_DB_PATH)/.git && echo "true" || echo "false") -FHEVM_DECRYPTIONS_DB_VERSION ?= v0.1.0 +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.8 +FHEVM_SOLIDITY_VERSION ?= v0.1.9 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) diff --git a/go.mod b/go.mod index 4eef5391..72e6ac91 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.8 +replace github.com/ethereum/go-ethereum v1.10.19 => github.com/zama-ai/go-ethereum v0.1.9 replace github.com/evmos/ethermint v0.19.3 => github.com/zama-ai/ethermint v0.1.2 diff --git a/scripts/run_developer_image.sh b/scripts/run_developer_image.sh index e1f95293..515a6367 100755 --- a/scripts/run_developer_image.sh +++ b/scripts/run_developer_image.sh @@ -23,5 +23,4 @@ LOGLEVEL="info" evmosd start --home /root/.evmosd --pruning=nothing $TRACE --log_level $LOGLEVEL \ --minimum-gas-prices=0.0001aevmos \ --json-rpc.gas-cap=50000000 \ - --json-rpc.api eth,txpool,net,web3 \ - "$@" + --json-rpc.api eth,txpool,net,web3