From f720ec408900118a3c6e10eb650398f78bbd5275 Mon Sep 17 00:00:00 2001 From: ToniRamirezM Date: Mon, 17 Apr 2023 12:56:04 +0200 Subject: [PATCH 1/5] not use zkcounters on eth_Call --- jsonrpc/endpoints_eth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonrpc/endpoints_eth.go b/jsonrpc/endpoints_eth.go index 7d86db721f..9341cdd4f9 100644 --- a/jsonrpc/endpoints_eth.go +++ b/jsonrpc/endpoints_eth.go @@ -93,7 +93,7 @@ func (e *EthEndpoints) Call(arg *types.TxArgs, blockArg *types.BlockNumberOrHash return rpcErrorResponse(types.DefaultErrorCode, "failed to convert arguments into an unsigned transaction", err) } - result, err := e.state.ProcessUnsignedTransaction(ctx, tx, sender, blockToProcess, false, dbTx) + result, err := e.state.ProcessUnsignedTransaction(ctx, tx, sender, blockToProcess, true, dbTx) if err != nil { return rpcErrorResponse(types.DefaultErrorCode, "failed to execute the unsigned transaction", err) } From efd159ae30d0a8afd67613c7a4b7715b254e2ce6 Mon Sep 17 00:00:00 2001 From: ToniRamirezM Date: Mon, 17 Apr 2023 15:38:11 +0200 Subject: [PATCH 2/5] fix test --- jsonrpc/endpoints_eth_test.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/jsonrpc/endpoints_eth_test.go b/jsonrpc/endpoints_eth_test.go index cfcaab2419..e1d89f5ec1 100644 --- a/jsonrpc/endpoints_eth_test.go +++ b/jsonrpc/endpoints_eth_test.go @@ -170,7 +170,7 @@ func TestCall(t *testing.T) { m.State.On("GetL2BlockByNumber", context.Background(), blockNumOneUint64, m.DbTx).Return(block, nil).Once() m.State.On("GetNonce", context.Background(), *txArgs.From, blockRoot).Return(nonce, nil).Once() m.State. - On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, &blockNumOneUint64, false, m.DbTx). + On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, &blockNumOneUint64, true, m.DbTx). Return(&runtime.ExecutionResult{ReturnValue: testCase.expectedResult}, nil). Once() }, @@ -214,7 +214,7 @@ func TestCall(t *testing.T) { }) m.State.On("GetNonce", context.Background(), *txArgs.From, blockRoot).Return(nonce, nil).Once() m.State. - On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, &blockNumOneUint64, false, m.DbTx). + On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, &blockNumOneUint64, true, m.DbTx). Return(&runtime.ExecutionResult{ReturnValue: testCase.expectedResult}, nil). Once() }, @@ -256,7 +256,7 @@ func TestCall(t *testing.T) { m.State.On("GetL2BlockByNumber", context.Background(), blockNumOneUint64, m.DbTx).Return(block, nil).Once() m.State.On("GetNonce", context.Background(), *txArgs.From, blockRoot).Return(nonce, nil).Once() m.State. - On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, nilUint64, false, m.DbTx). + On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, nilUint64, true, m.DbTx). Return(&runtime.ExecutionResult{ReturnValue: testCase.expectedResult}, nil). Once() }, @@ -298,7 +298,7 @@ func TestCall(t *testing.T) { }) m.State.On("GetNonce", context.Background(), *txArgs.From, blockRoot).Return(nonce, nil).Once() m.State. - On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, &blockNumTenUint64, false, m.DbTx). + On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, &blockNumTenUint64, true, m.DbTx). Return(&runtime.ExecutionResult{ReturnValue: testCase.expectedResult}, nil). Once() }, @@ -338,7 +338,7 @@ func TestCall(t *testing.T) { m.State.On("GetL2BlockByNumber", context.Background(), blockNumTenUint64, m.DbTx).Return(block, nil).Once() m.State.On("GetNonce", context.Background(), *txArgs.From, blockRoot).Return(nonce, nil).Once() m.State. - On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, &blockNumTenUint64, false, m.DbTx). + On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, &blockNumTenUint64, true, m.DbTx). Return(&runtime.ExecutionResult{ReturnValue: testCase.expectedResult}, nil). Once() }, @@ -377,7 +377,7 @@ func TestCall(t *testing.T) { block := ethTypes.NewBlockWithHeader(ðTypes.Header{Number: blockNumOne, Root: blockRoot}) m.State.On("GetL2BlockByNumber", context.Background(), blockNumOneUint64, m.DbTx).Return(block, nil).Once() m.State. - On("ProcessUnsignedTransaction", context.Background(), txMatchBy, common.HexToAddress(c.DefaultSenderAddress), nilUint64, false, m.DbTx). + On("ProcessUnsignedTransaction", context.Background(), txMatchBy, common.HexToAddress(c.DefaultSenderAddress), nilUint64, true, m.DbTx). Return(&runtime.ExecutionResult{ReturnValue: testCase.expectedResult}, nil). Once() }, @@ -416,7 +416,7 @@ func TestCall(t *testing.T) { block := ethTypes.NewBlockWithHeader(ðTypes.Header{Number: blockNumOne, Root: blockRoot}) m.State.On("GetL2BlockByNumber", context.Background(), blockNumOneUint64, m.DbTx).Return(block, nil).Once() m.State. - On("ProcessUnsignedTransaction", context.Background(), txMatchBy, common.HexToAddress(c.DefaultSenderAddress), nilUint64, false, m.DbTx). + On("ProcessUnsignedTransaction", context.Background(), txMatchBy, common.HexToAddress(c.DefaultSenderAddress), nilUint64, true, m.DbTx). Return(&runtime.ExecutionResult{ReturnValue: testCase.expectedResult}, nil). Once() }, @@ -480,7 +480,7 @@ func TestCall(t *testing.T) { m.State.On("GetL2BlockByNumber", context.Background(), blockNumOneUint64, m.DbTx).Return(block, nil).Once() m.State.On("GetNonce", context.Background(), *txArgs.From, blockRoot).Return(nonce, nil).Once() m.State. - On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, nilUint64, false, m.DbTx). + On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, nilUint64, true, m.DbTx). Return(&runtime.ExecutionResult{Err: errors.New("failed to process unsigned transaction")}, nil). Once() }, @@ -522,7 +522,7 @@ func TestCall(t *testing.T) { m.State.On("GetL2BlockByNumber", context.Background(), blockNumOneUint64, m.DbTx).Return(block, nil).Once() m.State.On("GetNonce", context.Background(), *txArgs.From, blockRoot).Return(nonce, nil).Once() m.State. - On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, nilUint64, false, m.DbTx). + On("ProcessUnsignedTransaction", context.Background(), txMatchBy, *txArgs.From, nilUint64, true, m.DbTx). Return(&runtime.ExecutionResult{Err: runtime.ErrExecutionReverted}, nil). Once() }, From e18dc1289ca2a0dac70d7844f652267e280dd388 Mon Sep 17 00:00:00 2001 From: ToniRamirezM Date: Tue, 18 Apr 2023 14:46:02 +0200 Subject: [PATCH 3/5] prover image --- docker-compose.yml | 2 +- test/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index bcf2729d7c..894c6c4d8d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -107,7 +107,7 @@ services: zkevm-prover: container_name: zkevm-prover restart: unless-stopped - image: hermeznetwork/zkevm-prover:6d6e3aa + image: hermeznetwork/zkevm-prover:793eb64 depends_on: zkevm-state-db: condition: service_healthy diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 23e0d8c2e3..efce64c866 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -321,7 +321,7 @@ services: zkevm-prover: container_name: zkevm-prover - image: hermeznetwork/zkevm-prover:6d6e3aa + image: hermeznetwork/zkevm-prover:793eb64 ports: # - 50051:50051 # Prover - 50052:50052 # Mock prover From c5f64b8a37608f3ff39938658426b7d09d56fd75 Mon Sep 17 00:00:00 2001 From: ToniRamirezM Date: Wed, 19 Apr 2023 09:36:14 +0200 Subject: [PATCH 4/5] prover image --- docker-compose.yml | 2 +- test/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 894c6c4d8d..3860218a6a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -107,7 +107,7 @@ services: zkevm-prover: container_name: zkevm-prover restart: unless-stopped - image: hermeznetwork/zkevm-prover:793eb64 + image: hermeznetwork/zkevm-prover:8f06f90 depends_on: zkevm-state-db: condition: service_healthy diff --git a/test/docker-compose.yml b/test/docker-compose.yml index efce64c866..4ed2914278 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -321,7 +321,7 @@ services: zkevm-prover: container_name: zkevm-prover - image: hermeznetwork/zkevm-prover:793eb64 + image: hermeznetwork/zkevm-prover:8f06f90 ports: # - 50051:50051 # Prover - 50052:50052 # Mock prover From 4fbe4f7db0b54476356f467b26e5635881726980 Mon Sep 17 00:00:00 2001 From: ToniRamirezM Date: Wed, 19 Apr 2023 10:55:58 +0200 Subject: [PATCH 5/5] prover image --- docker-compose.yml | 2 +- test/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3860218a6a..2619f9f65b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -107,7 +107,7 @@ services: zkevm-prover: container_name: zkevm-prover restart: unless-stopped - image: hermeznetwork/zkevm-prover:8f06f90 + image: hermeznetwork/zkevm-prover:4e3272b depends_on: zkevm-state-db: condition: service_healthy diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 4ed2914278..2a107243c0 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -321,7 +321,7 @@ services: zkevm-prover: container_name: zkevm-prover - image: hermeznetwork/zkevm-prover:8f06f90 + image: hermeznetwork/zkevm-prover:4e3272b ports: # - 50051:50051 # Prover - 50052:50052 # Mock prover