Skip to content

Commit

Permalink
Add tfhe-rs error handling + disable memory management finalizer ( + …
Browse files Browse the repository at this point in the history
…associated config toml file) (#156)

* Remove tfhe-rs conf from zama_config

* build: update go ethereum with error handling improvement

* build: update all zama config files + use relase from go-etehreum

---------

Co-authored-by: Petar Ivanov <29689712+dartdart26@users.noreply.github.com>
  • Loading branch information
leventdem and dartdart26 authored Jun 30, 2023
1 parent 31d4b79 commit 5f8fb29
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ZBC_ORACLE_DB_VERSION ?= main

ZBC_SOLIDITY_PATH ?= $(WORKDIR)/zbc-solidity
ZBC_SOLIDITY_PATH_EXISTS := $(shell test -d $(ZBC_SOLIDITY_PATH)/.git && echo "true" || echo "false")
ZBC_SOLIDITY_VERSION ?= v0.1.1
ZBC_SOLIDITY_VERSION ?= v0.1.2

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)
Expand Down Expand Up @@ -395,7 +395,7 @@ endif

run_e2e_test:
@cd $(ZBC_SOLIDITY_PATH) && ci/scripts/prepare_fhe_keys_for_e2e_test.sh $(CURDIR)/volumes/network-public-fhe-keys
@cd $(ZBC_SOLIDITY_PATH) && npm install @openzeppelin/contracts
@cd $(ZBC_SOLIDITY_PATH) && npm install
ifeq ($(LOCAL_BUILD),true)
$(info LOCAL_BUILD is set)
@cd $(ZBC_SOLIDITY_PATH) && ci/scripts/run_ERC20_e2e_test.sh mykey1 $(CURDIR)
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/docker-compose.local.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ version: '3'

services:
evmosnodelocal:
entrypoint: /usr/bin/evmosd start --home /root/.evmosd --minimum-gas-prices=0.000000000000000001aevmos --json-rpc.gas-cap=9999999999999999 --gas-prices=0.00000000000000000000000000000000001aevmos --gas-adjustment=0.000000000000000000000000001 --json-rpc.api eth,txpool,personal,net,debug,web3
entrypoint: /usr/bin/evmosd start --home /root/.evmosd --minimum-gas-prices=0.000000000000000001aevmos --json-rpc.gas-cap=9999999999999999 --gas-prices=0.00000000000000000000000000000000001aevmos --gas-adjustment=0.000000000000000000000000001 --json-rpc.api eth,txpool,personal,net,web3
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.4
replace github.com/ethereum/go-ethereum v1.10.19 => github.com/zama-ai/go-ethereum v0.1.6

replace github.com/evmos/ethermint v0.19.3 => github.com/zama-ai/ethermint v0.1.0
4 changes: 0 additions & 4 deletions node/zama_config/zama_config_full_node.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@
mode = "node"
oracle_db_address = "http://13.37.31.214:8001"
require_retry_count = 1

[tfhe]
ciphertexts_to_garbage_collect = 1000
ciphertexts_garbage_collect_interval_secs = 2
3 changes: 0 additions & 3 deletions node/zama_config/zama_config_local_testnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,3 @@ mode = "oracle"
oracle_db_address = "http://zbcoracledb:8001"
require_retry_count = 1

[tfhe]
ciphertexts_to_garbage_collect = 1000
ciphertexts_garbage_collect_interval_secs = 2
4 changes: 0 additions & 4 deletions node/zama_config/zama_config_validator.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@
mode = "oracle"
oracle_db_address = "http://zbcoracledb:8001"
require_retry_count = 1

[tfhe]
ciphertexts_to_garbage_collect = 1000
ciphertexts_garbage_collect_interval_secs = 2

0 comments on commit 5f8fb29

Please sign in to comment.