From a021c7f12d0c05ccb61ff62e41a4c5ab4cb7a5f8 Mon Sep 17 00:00:00 2001 From: dudong2 Date: Wed, 30 Oct 2024 19:12:37 +0900 Subject: [PATCH 01/10] chore: Update go.mod --- go.mod | 8 ++++---- go.sum | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index af84c95e75..db5d7251b1 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/evmos/ethermint go 1.22.2 -toolchain go1.22.3 +// toolchain go1.22.3 require ( cosmossdk.io/api v0.7.6 @@ -245,9 +245,9 @@ require ( replace ( // release/v0.50.x - cosmossdk.io/store => github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240930015419-f4ea363b3fdf - cosmossdk.io/x/tx => github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240930015419-f4ea363b3fdf - github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240930015419-f4ea363b3fdf + cosmossdk.io/store => github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030054415-ad69ee001cc8 + cosmossdk.io/x/tx => github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241030095706-9a094eafbb87 + github.com/cosmos/cosmos-sdk => github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f ) replace ( diff --git a/go.sum b/go.sum index 26744c4247..461bc1f9c2 100644 --- a/go.sum +++ b/go.sum @@ -265,6 +265,12 @@ github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX github.com/aws/aws-sdk-go v1.44.224 h1:09CiaaF35nRmxrzWZ2uRq5v6Ghg/d2RiPjZnSgtt+RQ= github.com/aws/aws-sdk-go v1.44.224/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f h1:Y/kLwnoGpQV6S++JCEi91d/yvFNgRsRy2ClmWaDUR34= +github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f/go.mod h1:swzHMI2C9wU0c5WPyPS/ihryqQmvHukx0/RWS6u8WAY= +github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030054415-ad69ee001cc8 h1:mvaoU7Js0SeE3vjx1qWbvfPf0F8MjCzBYENscUxppQI= +github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030054415-ad69ee001cc8/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng= +github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241030095706-9a094eafbb87 h1:VVrRHM7NoGQ1/lGmM/c/rv0adf1uFayPu7VbFW0HcuY= +github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241030095706-9a094eafbb87/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -412,12 +418,6 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c h1:MOgfS4+FBB8cMkDE2j2VBVsbY+HCkPIu0YsJ/9bbGeQ= github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= -github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240930015419-f4ea363b3fdf h1:QNQ9uB3DEfJqSMwERDSaYQMofgfzfcSp49iDt7B2jvc= -github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240930015419-f4ea363b3fdf/go.mod h1:iJLknPnyzlcQGdgfIp9d8QCuqt8g1RjJeh8pJ/p5wj4= -github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240930015419-f4ea363b3fdf h1:vGFA8f1EbNLgabbSBBnT1bArLnrl4ETk4PUTJLb01Pc= -github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240930015419-f4ea363b3fdf/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= -github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240930015419-f4ea363b3fdf h1:u6BY+dtlmhuQYfPDnpGhDBF2uiCA0HvrIk22L67nB6Q= -github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240930015419-f4ea363b3fdf/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716 h1:OvD5Rm0B6LHUJk6z858UgwdP72jU2DuUdXeclRyKpDI= github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE= github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a h1:IUPD+dg1YQl8cLocxQ/Mbx/ObTgAgcrZlcBhFjsLO40= From 40bae991a0f617fdffefed66a8098c1b576e89d9 Mon Sep 17 00:00:00 2001 From: dudong2 Date: Wed, 30 Oct 2024 19:52:37 +0900 Subject: [PATCH 02/10] chore: Update go.mod --- go.mod | 3 +-- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index db5d7251b1..03196be446 100644 --- a/go.mod +++ b/go.mod @@ -244,17 +244,16 @@ require ( ) replace ( - // release/v0.50.x cosmossdk.io/store => github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030054415-ad69ee001cc8 cosmossdk.io/x/tx => github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241030095706-9a094eafbb87 github.com/cosmos/cosmos-sdk => github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f + github.com/ethereum/go-ethereum => github.com/b-harvest/go-ethereum v0.0.0-20241030045232-36fbb2cddc00 ) replace ( // use cosmos keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // release/v1.11.x - github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0 diff --git a/go.sum b/go.sum index 461bc1f9c2..ee49257ccb 100644 --- a/go.sum +++ b/go.sum @@ -271,6 +271,8 @@ github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030054415-ad69ee001cc8 h1:mvao github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030054415-ad69ee001cc8/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng= github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241030095706-9a094eafbb87 h1:VVrRHM7NoGQ1/lGmM/c/rv0adf1uFayPu7VbFW0HcuY= github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241030095706-9a094eafbb87/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= +github.com/b-harvest/go-ethereum v0.0.0-20241030045232-36fbb2cddc00 h1:7s2WNRLlFqLkgeOv7QI78MqpOapk5GVQTN2QgOOPr3s= +github.com/b-harvest/go-ethereum v0.0.0-20241030045232-36fbb2cddc00/go.mod h1:uGFqiVeidhYHnAoU1koPGoWI5bVKbVeYH7WjbkIC+Mo= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -420,8 +422,6 @@ github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c h1:MOgfS4+F github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716 h1:OvD5Rm0B6LHUJk6z858UgwdP72jU2DuUdXeclRyKpDI= github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE= -github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a h1:IUPD+dg1YQl8cLocxQ/Mbx/ObTgAgcrZlcBhFjsLO40= -github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a/go.mod h1:A249HEl6XyiV5zSnKM9j9RF3szMghMNONMyNvYuqQIw= github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE= github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -1769,8 +1769,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= -gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= From 8415ec10edb3d218ed39cb8f8fb07a810721e129 Mon Sep 17 00:00:00 2001 From: dudong2 Date: Thu, 31 Oct 2024 01:21:18 +0900 Subject: [PATCH 03/10] chore: Update go.mod --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 03196be446..f422aa3452 100644 --- a/go.mod +++ b/go.mod @@ -244,7 +244,7 @@ require ( ) replace ( - cosmossdk.io/store => github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030054415-ad69ee001cc8 + cosmossdk.io/store => github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17 cosmossdk.io/x/tx => github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241030095706-9a094eafbb87 github.com/cosmos/cosmos-sdk => github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f github.com/ethereum/go-ethereum => github.com/b-harvest/go-ethereum v0.0.0-20241030045232-36fbb2cddc00 diff --git a/go.sum b/go.sum index ee49257ccb..94ba57e042 100644 --- a/go.sum +++ b/go.sum @@ -267,8 +267,8 @@ github.com/aws/aws-sdk-go v1.44.224/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f h1:Y/kLwnoGpQV6S++JCEi91d/yvFNgRsRy2ClmWaDUR34= github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f/go.mod h1:swzHMI2C9wU0c5WPyPS/ihryqQmvHukx0/RWS6u8WAY= -github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030054415-ad69ee001cc8 h1:mvaoU7Js0SeE3vjx1qWbvfPf0F8MjCzBYENscUxppQI= -github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030054415-ad69ee001cc8/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng= +github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17 h1:JHnbr52bO0MlDMgdZS/J53d1VPAUYllWscCfzXn1a/I= +github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng= github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241030095706-9a094eafbb87 h1:VVrRHM7NoGQ1/lGmM/c/rv0adf1uFayPu7VbFW0HcuY= github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241030095706-9a094eafbb87/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= github.com/b-harvest/go-ethereum v0.0.0-20241030045232-36fbb2cddc00 h1:7s2WNRLlFqLkgeOv7QI78MqpOapk5GVQTN2QgOOPr3s= From 07bf75583a5a883f20bf2a380ca8288013c6ec35 Mon Sep 17 00:00:00 2001 From: dudong2 Date: Thu, 31 Oct 2024 01:21:44 +0900 Subject: [PATCH 04/10] chore: Expose NewEhtAnteHandler --- app/ante/handler_options.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/ante/handler_options.go b/app/ante/handler_options.go index ccf446a88a..84665bf931 100644 --- a/app/ante/handler_options.go +++ b/app/ante/handler_options.go @@ -76,6 +76,10 @@ func (options HandlerOptions) validate() error { return nil } +func NewEthAnteHandler(options HandlerOptions) sdk.AnteHandler { + return newEthAnteHandler(options) +} + func newEthAnteHandler(options HandlerOptions) sdk.AnteHandler { return func(ctx sdk.Context, tx sdk.Tx, simulate bool) (sdk.Context, error) { blockCfg, err := options.EvmKeeper.EVMBlockConfig(ctx, options.EvmKeeper.ChainID()) From 808f0a887a3bd545f5056b0e82f5e9c7833684f3 Mon Sep 17 00:00:00 2001 From: dudong2 Date: Thu, 31 Oct 2024 20:34:01 +0900 Subject: [PATCH 05/10] chore: Revert toolchain comment --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f422aa3452..cb5d1c4a1b 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/evmos/ethermint go 1.22.2 -// toolchain go1.22.3 +toolchain go1.22.3 require ( cosmossdk.io/api v0.7.6 From 8fc109a741b5091bf14447a73c777039b5da4330 Mon Sep 17 00:00:00 2001 From: dudong2 Date: Mon, 4 Nov 2024 04:11:08 +0900 Subject: [PATCH 06/10] test: Add tx execute counter for stm tx executor --- app/executor.go | 14 ++++++++++++++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/executor.go b/app/executor.go index 1cff225d61..1241dbe567 100644 --- a/app/executor.go +++ b/app/executor.go @@ -24,6 +24,12 @@ import ( const MinimalParallelPreEstimate = 16 +var ( + TESTMODE = false + + TxExecuteCounter []atomic.Int32 +) + func DefaultTxExecutor(_ context.Context, txs [][]byte, ms storetypes.MultiStore, @@ -86,6 +92,10 @@ func STMTxExecutor( memTxs, estimates = preEstimates(txs, workers, authStore, bankStore, evmDenom, txDecoder) } + if TESTMODE { + TxExecuteCounter = make([]atomic.Int32, blockSize) + } + if err := blockstm.ExecuteBlockWithEstimates( ctx, blockSize, @@ -96,6 +106,10 @@ func STMTxExecutor( func(txn blockstm.TxnIndex, ms blockstm.MultiStore) { var cache map[string]any + if TESTMODE { + TxExecuteCounter[txn].Add(1) + } + // only one of the concurrent incarnations gets the cache if there are any, otherwise execute without // cache, concurrent incarnations should be rare. v := incarnationCache[txn].Swap(nil) diff --git a/go.mod b/go.mod index cb5d1c4a1b..3533eccda5 100644 --- a/go.mod +++ b/go.mod @@ -245,7 +245,7 @@ require ( replace ( cosmossdk.io/store => github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17 - cosmossdk.io/x/tx => github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241030095706-9a094eafbb87 + cosmossdk.io/x/tx => github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241103053257-79f3f75686a0 github.com/cosmos/cosmos-sdk => github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f github.com/ethereum/go-ethereum => github.com/b-harvest/go-ethereum v0.0.0-20241030045232-36fbb2cddc00 ) diff --git a/go.sum b/go.sum index 94ba57e042..e9f97c661f 100644 --- a/go.sum +++ b/go.sum @@ -269,8 +269,8 @@ github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f h1:Y/kLwnoGpQ github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f/go.mod h1:swzHMI2C9wU0c5WPyPS/ihryqQmvHukx0/RWS6u8WAY= github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17 h1:JHnbr52bO0MlDMgdZS/J53d1VPAUYllWscCfzXn1a/I= github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng= -github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241030095706-9a094eafbb87 h1:VVrRHM7NoGQ1/lGmM/c/rv0adf1uFayPu7VbFW0HcuY= -github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241030095706-9a094eafbb87/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= +github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241103053257-79f3f75686a0 h1:rv/Dq2G2+l+66SLaqZH+fFtx41Om2/qd7Jusie/9xIY= +github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241103053257-79f3f75686a0/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= github.com/b-harvest/go-ethereum v0.0.0-20241030045232-36fbb2cddc00 h1:7s2WNRLlFqLkgeOv7QI78MqpOapk5GVQTN2QgOOPr3s= github.com/b-harvest/go-ethereum v0.0.0-20241030045232-36fbb2cddc00/go.mod h1:uGFqiVeidhYHnAoU1koPGoWI5bVKbVeYH7WjbkIC+Mo= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= From 278a39c892630f1fb0ea4bcb6fafd146aaab04e5 Mon Sep 17 00:00:00 2001 From: dudong2 Date: Mon, 4 Nov 2024 18:42:41 +0900 Subject: [PATCH 07/10] chore: Update go.mod --- go.mod | 2 +- go.sum | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3533eccda5..f09845e3d0 100644 --- a/go.mod +++ b/go.mod @@ -247,7 +247,7 @@ replace ( cosmossdk.io/store => github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17 cosmossdk.io/x/tx => github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241103053257-79f3f75686a0 github.com/cosmos/cosmos-sdk => github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f - github.com/ethereum/go-ethereum => github.com/b-harvest/go-ethereum v0.0.0-20241030045232-36fbb2cddc00 + github.com/ethereum/go-ethereum => github.com/b-harvest/go-ethereum v0.0.0-20241104093914-e1cd35fc61f1 ) replace ( diff --git a/go.sum b/go.sum index e9f97c661f..f4e82054bf 100644 --- a/go.sum +++ b/go.sum @@ -271,8 +271,8 @@ github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17 h1:JHnb github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng= github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241103053257-79f3f75686a0 h1:rv/Dq2G2+l+66SLaqZH+fFtx41Om2/qd7Jusie/9xIY= github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241103053257-79f3f75686a0/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= -github.com/b-harvest/go-ethereum v0.0.0-20241030045232-36fbb2cddc00 h1:7s2WNRLlFqLkgeOv7QI78MqpOapk5GVQTN2QgOOPr3s= -github.com/b-harvest/go-ethereum v0.0.0-20241030045232-36fbb2cddc00/go.mod h1:uGFqiVeidhYHnAoU1koPGoWI5bVKbVeYH7WjbkIC+Mo= +github.com/b-harvest/go-ethereum v0.0.0-20241104093914-e1cd35fc61f1 h1:MMaegKRY1IjTCJa49+0DfTJrcA/YCB3w5axIBAx+Qoc= +github.com/b-harvest/go-ethereum v0.0.0-20241104093914-e1cd35fc61f1/go.mod h1:A249HEl6XyiV5zSnKM9j9RF3szMghMNONMyNvYuqQIw= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -1769,6 +1769,8 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= From d7510de36a7f7cca3a5db5cb904b3d48493e7255 Mon Sep 17 00:00:00 2001 From: Kyuhyeon Choi Date: Tue, 5 Nov 2024 17:31:20 +0900 Subject: [PATCH 08/10] chore: allow unlimited block gas limit --- types/block.go | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/types/block.go b/types/block.go index 6c5558cbd3..9d3d41794d 100644 --- a/types/block.go +++ b/types/block.go @@ -15,12 +15,23 @@ // along with the Ethermint library. If not, see https://github.com/evmos/ethermint/blob/main/LICENSE package types -import sdk "github.com/cosmos/cosmos-sdk/types" +import ( + math "math" + + sdk "github.com/cosmos/cosmos-sdk/types" +) // BlockGasLimit returns the max gas (limit) defined in the block gas meter. If the meter is not // set, it returns the max gas from the application consensus params. // NOTE: see https://github.com/cosmos/cosmos-sdk/issues/9514 for full reference func BlockGasLimit(ctx sdk.Context) uint64 { + blockGasMeter := ctx.BlockGasMeter() + + // Get the limit from the gas meter only if its not null and not an InfiniteGasMeter + if blockGasMeter != nil && blockGasMeter.Limit() != 0 { + return blockGasMeter.Limit() + } + // Otherwise get from the consensus parameters cp := ctx.ConsensusParams() if cp.Block == nil { @@ -28,6 +39,12 @@ func BlockGasLimit(ctx sdk.Context) uint64 { } maxGas := cp.Block.MaxGas + + // Setting maxGas to -1 means that block gas is unlimited + if maxGas == -1 { + return math.MaxUint64 + } + if maxGas > 0 { return uint64(maxGas) } From 627fd4e21a730d7e1bd2012b593e6c684c256bf4 Mon Sep 17 00:00:00 2001 From: dudong2 Date: Wed, 6 Nov 2024 13:57:13 +0900 Subject: [PATCH 09/10] chore: Update go.mod for custom go-ethereum --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f09845e3d0..f739440c2c 100644 --- a/go.mod +++ b/go.mod @@ -247,7 +247,7 @@ replace ( cosmossdk.io/store => github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17 cosmossdk.io/x/tx => github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241103053257-79f3f75686a0 github.com/cosmos/cosmos-sdk => github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f - github.com/ethereum/go-ethereum => github.com/b-harvest/go-ethereum v0.0.0-20241104093914-e1cd35fc61f1 + github.com/ethereum/go-ethereum => github.com/b-harvest/go-ethereum v0.0.0-20241106045451-23c79ab53226 ) replace ( diff --git a/go.sum b/go.sum index f4e82054bf..076bd02158 100644 --- a/go.sum +++ b/go.sum @@ -271,8 +271,8 @@ github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17 h1:JHnb github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng= github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241103053257-79f3f75686a0 h1:rv/Dq2G2+l+66SLaqZH+fFtx41Om2/qd7Jusie/9xIY= github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241103053257-79f3f75686a0/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= -github.com/b-harvest/go-ethereum v0.0.0-20241104093914-e1cd35fc61f1 h1:MMaegKRY1IjTCJa49+0DfTJrcA/YCB3w5axIBAx+Qoc= -github.com/b-harvest/go-ethereum v0.0.0-20241104093914-e1cd35fc61f1/go.mod h1:A249HEl6XyiV5zSnKM9j9RF3szMghMNONMyNvYuqQIw= +github.com/b-harvest/go-ethereum v0.0.0-20241106045451-23c79ab53226 h1:TUw0xOKTEKSqWPmCcFO8Gci49mvxHKWJ8NwERwD1o5I= +github.com/b-harvest/go-ethereum v0.0.0-20241106045451-23c79ab53226/go.mod h1:A249HEl6XyiV5zSnKM9j9RF3szMghMNONMyNvYuqQIw= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= From f691cfe5e56154d26f207d41595a9939b8a761cb Mon Sep 17 00:00:00 2001 From: dudong2 Date: Wed, 6 Nov 2024 17:28:06 +0900 Subject: [PATCH 10/10] chore: Update go.mod for custom cosmos-sdk --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index f739440c2c..eb9f849993 100644 --- a/go.mod +++ b/go.mod @@ -244,9 +244,9 @@ require ( ) replace ( - cosmossdk.io/store => github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17 - cosmossdk.io/x/tx => github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241103053257-79f3f75686a0 - github.com/cosmos/cosmos-sdk => github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f + cosmossdk.io/store => github.com/b-harvest/cosmos-sdk/store v0.0.0-20241106072527-a25eb3a65854 + cosmossdk.io/x/tx => github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241106072513-3f9b5f9442bd + github.com/cosmos/cosmos-sdk => github.com/b-harvest/cosmos-sdk v0.0.0-20241106082343-55e55e63db3a github.com/ethereum/go-ethereum => github.com/b-harvest/go-ethereum v0.0.0-20241106045451-23c79ab53226 ) diff --git a/go.sum b/go.sum index 076bd02158..b129f21a61 100644 --- a/go.sum +++ b/go.sum @@ -265,12 +265,12 @@ github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX github.com/aws/aws-sdk-go v1.44.224 h1:09CiaaF35nRmxrzWZ2uRq5v6Ghg/d2RiPjZnSgtt+RQ= github.com/aws/aws-sdk-go v1.44.224/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f h1:Y/kLwnoGpQV6S++JCEi91d/yvFNgRsRy2ClmWaDUR34= -github.com/b-harvest/cosmos-sdk v0.0.0-20241030055507-b84851e4379f/go.mod h1:swzHMI2C9wU0c5WPyPS/ihryqQmvHukx0/RWS6u8WAY= -github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17 h1:JHnbr52bO0MlDMgdZS/J53d1VPAUYllWscCfzXn1a/I= -github.com/b-harvest/cosmos-sdk/store v0.0.0-20241030161953-9e8e56b00f17/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng= -github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241103053257-79f3f75686a0 h1:rv/Dq2G2+l+66SLaqZH+fFtx41Om2/qd7Jusie/9xIY= -github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241103053257-79f3f75686a0/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= +github.com/b-harvest/cosmos-sdk v0.0.0-20241106082343-55e55e63db3a h1:9TcRQHfsXFGcjSJNHt/458YdC+H7FFwJ7Ak80OO21ck= +github.com/b-harvest/cosmos-sdk v0.0.0-20241106082343-55e55e63db3a/go.mod h1:D3Z0eQDB3wcIeRVPD2e7xGPbS5Cx+GGcKLh3w/BvI3I= +github.com/b-harvest/cosmos-sdk/store v0.0.0-20241106072527-a25eb3a65854 h1:KcAh4n5qOx36uh9hN8nQDdLKHT+Uz8dT6nWN5AW7yi8= +github.com/b-harvest/cosmos-sdk/store v0.0.0-20241106072527-a25eb3a65854/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng= +github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241106072513-3f9b5f9442bd h1:yshPrVv7tqs/KREIbcfG6xAp9yp3eTpDkzXz/Rt8cJ8= +github.com/b-harvest/cosmos-sdk/x/tx v0.0.0-20241106072513-3f9b5f9442bd/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= github.com/b-harvest/go-ethereum v0.0.0-20241106045451-23c79ab53226 h1:TUw0xOKTEKSqWPmCcFO8Gci49mvxHKWJ8NwERwD1o5I= github.com/b-harvest/go-ethereum v0.0.0-20241106045451-23c79ab53226/go.mod h1:A249HEl6XyiV5zSnKM9j9RF3szMghMNONMyNvYuqQIw= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=