From 48d3cf46643cf8e1bf4d44ff898f15b2a2f89f98 Mon Sep 17 00:00:00 2001 From: Gavin Yu Date: Tue, 30 Apr 2024 11:38:52 +0800 Subject: [PATCH] fix(prover): fix `nil` of `MinSgxAndZkVMTierFee` in Prover Server (#780) --- integration_test/l1_env.sh | 4 +++- prover/prover.go | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/integration_test/l1_env.sh b/integration_test/l1_env.sh index a7ff9e49d..2b068ae86 100755 --- a/integration_test/l1_env.sh +++ b/integration_test/l1_env.sh @@ -5,7 +5,7 @@ source internal/docker/docker_env.sh export PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 export TAIKO_L2_ADDRESS=0x1670010000000000000000000000000000010001 export L2_SIGNAL_SERVICE=0x1670010000000000000000000000000000010005 -export SECURITY_COUNCIL=0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f +export CONTRACT_OWNER=0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f export TAIKO_TOKEN_PREMINT_RECIPIENT=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 export TAIKO_TOKEN_NAME="Taiko Token Test" export TAIKO_TOKEN_SYMBOL="TTKOt" @@ -22,6 +22,8 @@ GUARDIAN_PROVERS_ADDRESSES_LIST=( "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC" "0x90F79bf6EB2c4f870365E785982E1f101E93b906" "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65" + "0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f" + "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720" ) GUARDIAN_PROVERS_ADDRESSES=$(printf ",%s" "${GUARDIAN_PROVERS_ADDRESSES_LIST[@]}") export GUARDIAN_PROVERS=${GUARDIAN_PROVERS_ADDRESSES:1} diff --git a/prover/prover.go b/prover/prover.go index d630a115d..8c06b7398 100644 --- a/prover/prover.go +++ b/prover/prover.go @@ -173,6 +173,7 @@ func InitFromConfig(ctx context.Context, p *Prover, cfg *Config) (err error) { ProverPrivateKey: p.cfg.L1ProverPrivKey, MinOptimisticTierFee: p.cfg.MinOptimisticTierFee, MinSgxTierFee: p.cfg.MinSgxTierFee, + MinSgxAndZkVMTierFee: p.cfg.MinSgxAndZkVMTierFee, MinEthBalance: p.cfg.MinEthBalance, MinTaikoTokenBalance: p.cfg.MinTaikoTokenBalance, MaxExpiry: p.cfg.MaxExpiry,