From 6939df80daaca6f355c6ff70555db7cf263e7637 Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Tue, 30 Jul 2024 10:00:12 +0530 Subject: [PATCH 1/6] replaced 4337 with PIP-15 --- core/txpool/legacypool/list_test.go | 2 +- core/types/block.go | 8 ++++---- core/types/block_test.go | 12 ++++++------ core/types/transaction.go | 16 ++++++++-------- core/types/transaction_conditional.go | 2 +- eth/protocols/eth/broadcast.go | 4 ++-- internal/ethapi/bor_api.go | 6 +++--- miner/test_backend.go | 4 ++-- miner/worker.go | 4 ++-- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/core/txpool/legacypool/list_test.go b/core/txpool/legacypool/list_test.go index 86bd9e1957..15db484699 100644 --- a/core/txpool/legacypool/list_test.go +++ b/core/txpool/legacypool/list_test.go @@ -109,7 +109,7 @@ func TestFilterTxConditional(t *testing.T) { // and add to the list. tx2 := transaction(1, 1000, key) - var options types.OptionsAA4337 + var options types.OptionsPIP15 options.KnownAccounts = types.KnownAccounts{ common.Address{19: 1}: &types.Value{ diff --git a/core/types/block.go b/core/types/block.go index 9ae0e6f453..0f0a60d03d 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -189,8 +189,8 @@ func (h *Header) EmptyReceipts() bool { return h.ReceiptHash == EmptyReceiptsHash } -// ValidateBlockNumberOptions4337 validates the block range passed as in the options parameter in the conditional transaction (EIP-4337) -func (h *Header) ValidateBlockNumberOptions4337(minBlockNumber *big.Int, maxBlockNumber *big.Int) error { +// ValidateBlockNumberOptionsPIP15 validates the block range passed as in the options parameter in the conditional transaction (PIP-15) +func (h *Header) ValidateBlockNumberOptionsPIP15(minBlockNumber *big.Int, maxBlockNumber *big.Int) error { currentBlockNumber := h.Number if minBlockNumber != nil { @@ -208,8 +208,8 @@ func (h *Header) ValidateBlockNumberOptions4337(minBlockNumber *big.Int, maxBloc return nil } -// ValidateBlockNumberOptions4337 validates the timestamp range passed as in the options parameter in the conditional transaction (EIP-4337) -func (h *Header) ValidateTimestampOptions4337(minTimestamp *uint64, maxTimestamp *uint64) error { +// ValidateBlockNumberOptionsPIP15 validates the timestamp range passed as in the options parameter in the conditional transaction (PIP-15) +func (h *Header) ValidateTimestampOptionsPIP15(minTimestamp *uint64, maxTimestamp *uint64) error { currentBlockTime := h.Time if minTimestamp != nil { diff --git a/core/types/block_test.go b/core/types/block_test.go index a42d578f33..5446f18c67 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -435,7 +435,7 @@ func TestRlpDecodeParentHash(t *testing.T) { } } -func TestValidateBlockNumberOptions4337(t *testing.T) { +func TestValidateBlockNumberOptionsPIP15(t *testing.T) { t.Parallel() testsPass := []struct { @@ -503,19 +503,19 @@ func TestValidateBlockNumberOptions4337(t *testing.T) { } for _, test := range testsPass { - if err := test.header.ValidateBlockNumberOptions4337(test.minBlockNumber, test.maxBlockNumber); err != nil { + if err := test.header.ValidateBlockNumberOptionsPIP15(test.minBlockNumber, test.maxBlockNumber); err != nil { t.Fatalf("test number %v should not have failed. err: %v", test.number, err) } } for _, test := range testsFail { - if err := test.header.ValidateBlockNumberOptions4337(test.minBlockNumber, test.maxBlockNumber); err == nil { + if err := test.header.ValidateBlockNumberOptionsPIP15(test.minBlockNumber, test.maxBlockNumber); err == nil { t.Fatalf("test number %v should have failed. err is nil", test.number) } } } -func TestValidateTimestampOptions4337(t *testing.T) { +func TestValidateTimestampOptionsPIP15(t *testing.T) { t.Parallel() u64Ptr := func(n uint64) *uint64 { @@ -587,13 +587,13 @@ func TestValidateTimestampOptions4337(t *testing.T) { } for _, test := range testsPass { - if err := test.header.ValidateTimestampOptions4337(test.minTimestamp, test.maxTimestamp); err != nil { + if err := test.header.ValidateTimestampOptionsPIP15(test.minTimestamp, test.maxTimestamp); err != nil { t.Fatalf("test number %v should not have failed. err: %v", test.number, err) } } for _, test := range testsFail { - if err := test.header.ValidateTimestampOptions4337(test.minTimestamp, test.maxTimestamp); err == nil { + if err := test.header.ValidateTimestampOptionsPIP15(test.minTimestamp, test.maxTimestamp); err == nil { t.Fatalf("test number %v should have failed. err is nil", test.number) } } diff --git a/core/types/transaction.go b/core/types/transaction.go index da09dcf5a5..db032043ad 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -57,8 +57,8 @@ type Transaction struct { time time.Time // Time first seen locally (spam avoidance) // BOR specific - DO NOT REMOVE - // knownAccounts (EIP-4337) - optionsAA4337 *OptionsAA4337 + // knownAccounts (PIP-15) + optionsPIP15 *OptionsPIP15 // caches hash atomic.Value @@ -106,14 +106,14 @@ type TxData interface { decode([]byte) error } -// PutOptions stores the optionsAA4337 field of the conditional transaction (EIP-4337) -func (tx *Transaction) PutOptions(options *OptionsAA4337) { - tx.optionsAA4337 = options +// PutOptions stores the optionsPIP15 field of the conditional transaction (PIP-15) +func (tx *Transaction) PutOptions(options *OptionsPIP15) { + tx.optionsPIP15 = options } -// GetOptions returns the optionsAA4337 field of the conditional transaction (EIP-4337) -func (tx *Transaction) GetOptions() *OptionsAA4337 { - return tx.optionsAA4337 +// GetOptions returns the optionsPIP15 field of the conditional transaction (PIP-15) +func (tx *Transaction) GetOptions() *OptionsPIP15 { + return tx.optionsPIP15 } // EncodeRLP implements rlp.Encoder diff --git a/core/types/transaction_conditional.go b/core/types/transaction_conditional.go index 358303a0b5..94b9b5fef7 100644 --- a/core/types/transaction_conditional.go +++ b/core/types/transaction_conditional.go @@ -112,7 +112,7 @@ func InsertKnownAccounts[T common.Hash | map[common.Hash]common.Hash](accounts K } } -type OptionsAA4337 struct { +type OptionsPIP15 struct { KnownAccounts KnownAccounts `json:"knownAccounts"` BlockNumberMin *big.Int `json:"blockNumberMin"` BlockNumberMax *big.Int `json:"blockNumberMax"` diff --git a/eth/protocols/eth/broadcast.go b/eth/protocols/eth/broadcast.go index e53854a6f1..f3826497e0 100644 --- a/eth/protocols/eth/broadcast.go +++ b/eth/protocols/eth/broadcast.go @@ -83,7 +83,7 @@ func (p *Peer) broadcastTransactions() { tx := p.txpool.Get(queue[i]) // BOR specific - DO NOT REMOVE - // Skip EIP-4337 bundled transactions + // Skip PIP-15 bundled transactions if tx != nil && tx.GetOptions() == nil { txs = append(txs, tx) size += common.StorageSize(tx.Size()) @@ -156,7 +156,7 @@ func (p *Peer) announceTransactions() { for count = 0; count < len(queue) && size < maxTxPacketSize; count++ { tx := p.txpool.Get(queue[count]) // BOR specific - DO NOT REMOVE - // Skip EIP-4337 bundled transactions + // Skip PIP-15 bundled transactions if tx != nil && tx.GetOptions() == nil { pending = append(pending, queue[count]) pendingTypes = append(pendingTypes, tx.Type()) diff --git a/internal/ethapi/bor_api.go b/internal/ethapi/bor_api.go index 80ed986166..7443b1f19b 100644 --- a/internal/ethapi/bor_api.go +++ b/internal/ethapi/bor_api.go @@ -67,7 +67,7 @@ func NewBorAPI(b Backend) *BorAPI { // SendRawTransactionConditional will add the signed transaction to the transaction pool. // The sender/bundler is responsible for signing the transaction -func (api *BorAPI) SendRawTransactionConditional(ctx context.Context, input hexutil.Bytes, options types.OptionsAA4337) (common.Hash, error) { +func (api *BorAPI) SendRawTransactionConditional(ctx context.Context, input hexutil.Bytes, options types.OptionsPIP15) (common.Hash, error) { tx := new(types.Transaction) if err := tx.UnmarshalBinary(input); err != nil { return common.Hash{}, err @@ -81,12 +81,12 @@ func (api *BorAPI) SendRawTransactionConditional(ctx context.Context, input hexu } // check block number range - if err := currentHeader.ValidateBlockNumberOptions4337(options.BlockNumberMin, options.BlockNumberMax); err != nil { + if err := currentHeader.ValidateBlockNumberOptionsPIP15(options.BlockNumberMin, options.BlockNumberMax); err != nil { return common.Hash{}, &rpc.OptionsValidateError{Message: "out of block range. err: " + err.Error()} } // check timestamp range - if err := currentHeader.ValidateTimestampOptions4337(options.TimestampMin, options.TimestampMax); err != nil { + if err := currentHeader.ValidateTimestampOptionsPIP15(options.TimestampMin, options.TimestampMax); err != nil { return common.Hash{}, &rpc.OptionsValidateError{Message: "out of time range. err: " + err.Error()} } diff --git a/miner/test_backend.go b/miner/test_backend.go index 2611a26673..bd1face4eb 100644 --- a/miner/test_backend.go +++ b/miner/test_backend.go @@ -601,14 +601,14 @@ mainloop: // not prioritising conditional transaction, yet. //nolint:nestif if options := tx.GetOptions(); options != nil { - if err := env.header.ValidateBlockNumberOptions4337(options.BlockNumberMin, options.BlockNumberMax); err != nil { + if err := env.header.ValidateBlockNumberOptionsPIP15(options.BlockNumberMin, options.BlockNumberMax); err != nil { log.Trace("Dropping conditional transaction", "from", from, "hash", tx.Hash(), "reason", err) txs.Pop() continue } - if err := env.header.ValidateTimestampOptions4337(options.TimestampMin, options.TimestampMax); err != nil { + if err := env.header.ValidateTimestampOptionsPIP15(options.TimestampMin, options.TimestampMax); err != nil { log.Trace("Dropping conditional transaction", "from", from, "hash", tx.Hash(), "reason", err) txs.Pop() diff --git a/miner/worker.go b/miner/worker.go index 31f41d9a44..8e7adefa5f 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -1023,14 +1023,14 @@ mainloop: // not prioritising conditional transaction, yet. //nolint:nestif if options := tx.GetOptions(); options != nil { - if err := env.header.ValidateBlockNumberOptions4337(options.BlockNumberMin, options.BlockNumberMax); err != nil { + if err := env.header.ValidateBlockNumberOptionsPIP15(options.BlockNumberMin, options.BlockNumberMax); err != nil { log.Trace("Dropping conditional transaction", "from", from, "hash", tx.Hash(), "reason", err) txs.Pop() continue } - if err := env.header.ValidateTimestampOptions4337(options.TimestampMin, options.TimestampMax); err != nil { + if err := env.header.ValidateTimestampOptionsPIP15(options.TimestampMin, options.TimestampMax); err != nil { log.Trace("Dropping conditional transaction", "from", from, "hash", tx.Hash(), "reason", err) txs.Pop() From 369a59e2202d9e8d8ba662d99a5d934988e1a6ff Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Tue, 30 Jul 2024 10:01:08 +0530 Subject: [PATCH 2/6] version bump to 1.3.5-beta --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- .../templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index da6b7bbfad..8654c72544 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 1.3.4 +Version: 1.3.5-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index d818fd23b6..be990bf493 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 1.3.4 +Version: 1.3.5-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index accd2ff65c..e03d656cd9 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.4 +Version: 1.3.5-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index 1974de5ee0..021238a4ce 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.4 +Version: 1.3.5-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index 3b71d548e0..babb6b6dcc 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.4 +Version: 1.3.5-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index 3bb238d801..6d25375986 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.4 +Version: 1.3.5-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index 6dbc3b6cf2..0e9974725f 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 3 // Minor version component of the current release - VersionPatch = 4 // Patch version component of the current release - VersionMeta = "" // Version metadata to append to the version string + VersionMajor = 1 // Major version component of the current release + VersionMinor = 3 // Minor version component of the current release + VersionPatch = 5 // Patch version component of the current release + VersionMeta = "beta" // Version metadata to append to the version string ) var GitCommit string From 557ab43365a7bd771d69d4981a630e403e69a62f Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Wed, 7 Aug 2024 18:53:01 +0530 Subject: [PATCH 3/6] core/state: bug fix block stm --- core/state/statedb.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/state/statedb.go b/core/state/statedb.go index e74107ba17..34230f6d06 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -1084,7 +1084,7 @@ func (s *StateDB) createObject(addr common.Address) (newobj, prev *stateObject) prevAccount, ok := s.accountsOrigin[prev.address] s.journal.append(resetObjectChange{ account: &addr, - prev: prev, + prev: prev.deepCopy(s), prevdestruct: prevdestruct, prevAccount: s.accounts[prev.addrHash], prevStorage: s.storages[prev.addrHash], From d2e45831add075684cefa127797f199a81741e39 Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Wed, 7 Aug 2024 18:53:41 +0530 Subject: [PATCH 4/6] version bump v1.3.6 --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- packaging/templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index da6b7bbfad..e88964690e 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 1.3.4 +Version: 1.3.6 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index d818fd23b6..0702d76715 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 1.3.4 +Version: 1.3.6 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index accd2ff65c..520a536eec 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.4 +Version: 1.3.6 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index 1974de5ee0..2bb3af0482 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.4 +Version: 1.3.6 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index 3b71d548e0..3ade26aa8d 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.4 +Version: 1.3.6 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index 3bb238d801..dc189c8593 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.4 +Version: 1.3.6 Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index 6dbc3b6cf2..1391e5f783 100644 --- a/params/version.go +++ b/params/version.go @@ -23,7 +23,7 @@ import ( const ( VersionMajor = 1 // Major version component of the current release VersionMinor = 3 // Minor version component of the current release - VersionPatch = 4 // Patch version component of the current release + VersionPatch = 6 // Patch version component of the current release VersionMeta = "" // Version metadata to append to the version string ) From 7646fb573e7ce0c0bd77c630c50057925fb561ef Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Mon, 12 Aug 2024 10:06:36 +0530 Subject: [PATCH 5/6] version bump 1.3.7 --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- .../templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index 8654c72544..de2116d4f7 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 1.3.5-beta +Version: 1.3.7 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index be990bf493..dc19273911 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 1.3.5-beta +Version: 1.3.7 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index e03d656cd9..f5b9b2d8e2 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.5-beta +Version: 1.3.7 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index 021238a4ce..f264453125 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.5-beta +Version: 1.3.7 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index babb6b6dcc..cbbdcc9695 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.5-beta +Version: 1.3.7 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index 6d25375986..77cb076cd8 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.5-beta +Version: 1.3.7 Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index 0e9974725f..8f7e9c3c11 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 3 // Minor version component of the current release - VersionPatch = 5 // Patch version component of the current release - VersionMeta = "beta" // Version metadata to append to the version string + VersionMajor = 1 // Major version component of the current release + VersionMinor = 3 // Minor version component of the current release + VersionPatch = 7 // Patch version component of the current release + VersionMeta = "" // Version metadata to append to the version string ) var GitCommit string From aa54ff55a89b59c0ad425a9d293aa950c25355db Mon Sep 17 00:00:00 2001 From: Marcello Ardizzone Date: Fri, 16 Aug 2024 10:50:00 +0200 Subject: [PATCH 6/6] internal/debug: remove memsize to fix docker (#1308) * chg: remove memsize * chg: fix lint --- cmd/geth/main.go | 2 -- consensus/bor/heimdallgrpc/client.go | 2 +- go.mod | 1 - go.sum | 1 - internal/cli/command.go | 2 +- internal/debug/flags.go | 4 ---- 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index dc9fe67742..41856804c0 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -379,8 +379,6 @@ func geth(ctx *cli.Context) error { // it unlocks any requested accounts, and starts the RPC/IPC interfaces and the // miner. func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend, isConsole bool) { - debug.Memsize.Add("node", stack) - // Start up the node itself utils.StartNode(ctx, stack, isConsole) diff --git a/consensus/bor/heimdallgrpc/client.go b/consensus/bor/heimdallgrpc/client.go index 7687b7f1c7..2f002b9b82 100644 --- a/consensus/bor/heimdallgrpc/client.go +++ b/consensus/bor/heimdallgrpc/client.go @@ -29,7 +29,7 @@ func NewHeimdallGRPCClient(address string) *HeimdallGRPCClient { grpc_retry.WithCodes(codes.Internal, codes.Unavailable, codes.Aborted, codes.NotFound), } - conn, err := grpc.Dial(address, + conn, err := grpc.NewClient(address, grpc.WithStreamInterceptor(grpc_retry.StreamClientInterceptor(opts...)), grpc.WithUnaryInterceptor(grpc_retry.UnaryClientInterceptor(opts...)), grpc.WithTransportCredentials(insecure.NewCredentials()), diff --git a/go.mod b/go.mod index e627477b00..19db60724b 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,6 @@ require ( github.com/ethereum/c-kzg-4844 v0.4.3 github.com/fatih/color v1.17.0 github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e - github.com/fjl/memsize v0.0.2 github.com/fsnotify/fsnotify v1.7.0 github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 diff --git a/go.sum b/go.sum index 8bc6164fa1..dc37d6848e 100644 --- a/go.sum +++ b/go.sum @@ -1146,7 +1146,6 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e h1:bBLctRc7kr01YGvaDfgLbTwjFNW5jdp5y5rj8XXBHfY= github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY= -github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA= github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= diff --git a/internal/cli/command.go b/internal/cli/command.go index 66ad650d9f..8c3bf02f0f 100644 --- a/internal/cli/command.go +++ b/internal/cli/command.go @@ -233,7 +233,7 @@ func (m *Meta2) NewFlagSet(n string) *flagset.Flagset { } func (m *Meta2) Conn() (*grpc.ClientConn, error) { - conn, err := grpc.Dial(m.addr, grpc.WithTransportCredentials(insecure.NewCredentials())) + conn, err := grpc.NewClient(m.addr, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { return nil, fmt.Errorf("failed to connect to server: %v", err) } diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 23e4745e8c..90801b444b 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -30,7 +30,6 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/metrics/exp" - "github.com/fjl/memsize/memsizeui" "github.com/mattn/go-colorable" "github.com/mattn/go-isatty" "github.com/urfave/cli/v2" @@ -38,8 +37,6 @@ import ( "gopkg.in/natefinch/lumberjack.v2" ) -var Memsize memsizeui.Handler - var ( verbosityFlag = &cli.IntFlag{ Name: "verbosity", @@ -323,7 +320,6 @@ func StartPProf(address string, withMetrics bool) { if withMetrics { exp.Exp(metrics.DefaultRegistry) } - http.Handle("/memsize/", http.StripPrefix("/memsize", &Memsize)) log.Info("Starting pprof server", "addr", fmt.Sprintf("http://%s/debug/pprof", address)) go func() { if err := http.ListenAndServe(address, nil); err != nil {