From ca6c36384b5f23a72a6a99899973372b8c144a99 Mon Sep 17 00:00:00 2001 From: Matthieu Vachon Date: Mon, 11 Sep 2023 12:31:32 -0400 Subject: [PATCH] Updated to latest firehose-ethereum/types --- eth/tracers/firehose.go | 15 ++++++++------- go.mod | 4 ++-- go.sum | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/eth/tracers/firehose.go b/eth/tracers/firehose.go index 97ecb4948b..0358abc38c 100644 --- a/eth/tracers/firehose.go +++ b/eth/tracers/firehose.go @@ -784,7 +784,7 @@ func (f *Firehose) OnGasChange(old, new uint64, reason vm.GasChangeReason) { reason == vm.GasChangeTxRefunds || reason == vm.GasChangeTxBuyBack || reason == vm.GasChangeCallInitialBalance || - reason == vm.GasChangeCallLeftOverRefunded { + reason == vm.GasChangeCallLeftOverReturned { return } @@ -1126,15 +1126,16 @@ var gasChangeReasonToPb = map[vm.GasChangeReason]pbeth.GasChange_Reason{ // // New chain should uncomment the code below and remove the same assigments to UNKNOWN // - // vm.GasChangeTxInitialBalance: pbeth.GasChange_REASON_INITIAL_BALANCE, - // vm.GasChangeTxRefunds: pbeth.GasChange_REASON_REFUND, - // vm.GasChangeTxBuyBack: pbeth.GasChange_REASON_BUYBACK, - // vm.GasChangeCallInitialBalance: pbeth.GasChange_REASON_BUYBACK, + // vm.GasChangeTxInitialBalance: pbeth.GasChange_REASON_TX_INITIAL_BALANCE, + // vm.GasChangeTxRefunds: pbeth.GasChange_REASON_TX_REFUNDS, + // vm.GasChangeTxBuyBack: pbeth.GasChange_REASON_TX_BUY_BACK, + // vm.GasChangeCallInitialBalance: pbeth.GasChange_REASON_CALL_INITIAL_BALANCE, + // vm.GasChangeCallLeftOverReturned: pbeth.GasChange_REASON_CALL_LEFT_OVER_RETURNED, vm.GasChangeTxInitialBalance: pbeth.GasChange_REASON_UNKNOWN, vm.GasChangeTxRefunds: pbeth.GasChange_REASON_UNKNOWN, vm.GasChangeTxBuyBack: pbeth.GasChange_REASON_UNKNOWN, vm.GasChangeCallInitialBalance: pbeth.GasChange_REASON_UNKNOWN, - vm.GasChangeCallLeftOverRefunded: pbeth.GasChange_REASON_UNKNOWN, + vm.GasChangeCallLeftOverReturned: pbeth.GasChange_REASON_UNKNOWN, vm.GasChangeTxIntrinsicGas: pbeth.GasChange_REASON_INTRINSIC_GAS, vm.GasChangeCallContractCreation: pbeth.GasChange_REASON_CONTRACT_CREATION, @@ -1142,7 +1143,7 @@ var gasChangeReasonToPb = map[vm.GasChangeReason]pbeth.GasChange_Reason{ vm.GasChangeCallCodeStorage: pbeth.GasChange_REASON_CODE_STORAGE, vm.GasChangeCallPrecompiledContract: pbeth.GasChange_REASON_PRECOMPILED_CONTRACT, vm.GasChangeCallStorageColdAccess: pbeth.GasChange_REASON_STATE_COLD_ACCESS, - vm.GasChangeCallLeftOverReturned: pbeth.GasChange_REASON_REFUND_AFTER_EXECUTION, + vm.GasChangeCallLeftOverRefunded: pbeth.GasChange_REASON_REFUND_AFTER_EXECUTION, vm.GasChangeCallFailedExecution: pbeth.GasChange_REASON_FAILED_EXECUTION, // Ignored, we track them manually, newGasChange ensure that we panic if we see Unknown diff --git a/go.mod b/go.mod index 453d1c6bce..e0fff233e1 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,7 @@ require ( github.com/rs/cors v1.7.0 github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible github.com/status-im/keycard-go v0.2.0 - github.com/streamingfast/firehose-ethereum/types v0.0.0-20230706172428-1ea1414b9d6b + github.com/streamingfast/firehose-ethereum/types v0.0.0-20230911154550-654ed552f285 github.com/stretchr/testify v1.8.1 github.com/supranational/blst v0.3.11-0.20230406105308-e9dfc5ee724b github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 @@ -168,7 +168,7 @@ require ( github.com/tklauser/go-sysconf v0.3.5 // indirect github.com/tklauser/numcpus v0.2.2 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect - go.uber.org/atomic v1.11.0 + go.uber.org/atomic v1.11.0 // indirect golang.org/x/mod v0.10.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect diff --git a/go.sum b/go.sum index 0a618d96b3..d82eac20b3 100644 --- a/go.sum +++ b/go.sum @@ -679,8 +679,8 @@ github.com/streamingfast/dstore v0.1.1-0.20220607202639-35118aeaf648 h1:xpy3HNXe github.com/streamingfast/dstore v0.1.1-0.20220607202639-35118aeaf648/go.mod h1:SHSEIPowGeE1TfNNmGeAUUnlO3dwevmX5kFOSazU60M= github.com/streamingfast/eth-go v0.0.0-20220421042603-ebe2c94fcc92 h1:jMLyqSyOP0Wf1wbC0qhTW8GdFr+NM5WBwBzNc74TAk8= github.com/streamingfast/eth-go v0.0.0-20220421042603-ebe2c94fcc92/go.mod h1:GSWB6tldvuaUekmehj7yCv/8o6MIWPb+9Hf+m4uZdDM= -github.com/streamingfast/firehose-ethereum/types v0.0.0-20230706172428-1ea1414b9d6b h1:DIXZBExj65Kn4aoGGj0iD7obTVh910aHyY7R1+yfkSY= -github.com/streamingfast/firehose-ethereum/types v0.0.0-20230706172428-1ea1414b9d6b/go.mod h1:Kh5fptEEMKVw/QXrdfr49ldY3SP5+/MJoUPQfUtByUU= +github.com/streamingfast/firehose-ethereum/types v0.0.0-20230911154550-654ed552f285 h1:CHi8MSyRFe4ngApM2XbR5AueTd/6pSxAvzxFhqdy08Q= +github.com/streamingfast/firehose-ethereum/types v0.0.0-20230911154550-654ed552f285/go.mod h1:Kh5fptEEMKVw/QXrdfr49ldY3SP5+/MJoUPQfUtByUU= github.com/streamingfast/jsonpb v0.0.0-20210811021341-3670f0aa02d0 h1:g8eEYbFSykyzIyuxNMmHEUGGUvJE0ivmqZagLDK42gw= github.com/streamingfast/jsonpb v0.0.0-20210811021341-3670f0aa02d0/go.mod h1:cTNObq2Uofb330y05JbbZZ6RwE6QUXw5iVcHk1Fx3fk= github.com/streamingfast/logging v0.0.0-20210811175431-f3b44b61606a/go.mod h1:4GdqELhZOXj4xwc4IaBmzofzdErGynnaSzuzxy0ZIBo=