From 63bbca8e076842344a10c8ae2e1a2b58e0378b53 Mon Sep 17 00:00:00 2001 From: pcw109550 Date: Wed, 14 Jun 2023 15:22:19 +0900 Subject: [PATCH 01/10] Add disable tx gossip flag --- cmd/rpcdaemon/cli/config.go | 1 + cmd/rpcdaemon/cli/httpcfg/http_cfg.go | 1 + cmd/utils/flags.go | 9 +++++++-- eth/ethconfig/config.go | 1 + turbo/cli/default_flags.go | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cmd/rpcdaemon/cli/config.go b/cmd/rpcdaemon/cli/config.go index f33b8f1b629..4e857b00e1a 100644 --- a/cmd/rpcdaemon/cli/config.go +++ b/cmd/rpcdaemon/cli/config.go @@ -124,6 +124,7 @@ func RootCommand() (*cobra.Command, *httpcfg.HttpCfg) { rootCmd.PersistentFlags().StringVar(&cfg.RollupSequencerHTTP, utils.RollupSequencerHTTPFlag.Name, "", "HTTP endpoint for the sequencer mempool") rootCmd.PersistentFlags().StringVar(&cfg.RollupHistoricalRPC, utils.RollupHistoricalRPCFlag.Name, "", "RPC endpoint for historical data") rootCmd.PersistentFlags().DurationVar(&cfg.RollupHistoricalRPCTimeout, utils.RollupHistoricalRPCTimeoutFlag.Name, rpccfg.DefaultHistoricalRPCTimeout, "Timeout for historical RPC requests") + rootCmd.PersistentFlags().BoolVar(&cfg.RollupDisableTxPoolGossip, utils.RollupDisableTxPoolGossipFlag.Name, false, "Disables transaction pool gossip") if err := rootCmd.MarkPersistentFlagFilename("rpc.accessList", "json"); err != nil { panic(err) diff --git a/cmd/rpcdaemon/cli/httpcfg/http_cfg.go b/cmd/rpcdaemon/cli/httpcfg/http_cfg.go index 9c8733ee7b7..818e9f33fa4 100644 --- a/cmd/rpcdaemon/cli/httpcfg/http_cfg.go +++ b/cmd/rpcdaemon/cli/httpcfg/http_cfg.go @@ -69,4 +69,5 @@ type HttpCfg struct { RollupSequencerHTTP string RollupHistoricalRPC string RollupHistoricalRPCTimeout time.Duration + RollupDisableTxPoolGossip bool } diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index cde9eb89d50..4788f3abb19 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -602,17 +602,19 @@ var ( Name: "rollup.sequencerhttp", Usage: "HTTP endpoint for the sequencer mempool", } - RollupHistoricalRPCFlag = cli.StringFlag{ Name: "rollup.historicalrpc", Usage: "RPC endpoint for historical data.", } - RollupHistoricalRPCTimeoutFlag = cli.StringFlag{ Name: "rollup.historicalrpctimeout", Usage: "Timeout for historical RPC requests.", Value: "5s", } + RollupDisableTxPoolGossipFlag = cli.StringFlag{ + Name: "rollup.disabletxpoolgossip", + Usage: "Disables transaction pool gossip.", + } // Metrics flags MetricsEnabledFlag = cli.BoolFlag{ @@ -1602,6 +1604,9 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C if ctx.IsSet(RollupHistoricalRPCTimeoutFlag.Name) { cfg.RollupHistoricalRPCTimeout = ctx.Duration(RollupHistoricalRPCTimeoutFlag.Name) } + if ctx.IsSet(RollupDisableTxPoolGossipFlag.Name) { + cfg.RollupDisableTxPoolGossip = ctx.Bool(RollupDisableTxPoolGossipFlag.Name) + } // Override any default configs for hard coded networks. chain := ctx.String(ChainFlag.Name) diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index d3f37aeddc5..5a0c2a13cd6 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -255,6 +255,7 @@ type Config struct { RollupSequencerHTTP string RollupHistoricalRPC string RollupHistoricalRPCTimeout time.Duration + RollupDisableTxPoolGossip bool } type Sync struct { diff --git a/turbo/cli/default_flags.go b/turbo/cli/default_flags.go index 405d3de16b1..ec592fbd94c 100644 --- a/turbo/cli/default_flags.go +++ b/turbo/cli/default_flags.go @@ -153,6 +153,7 @@ var DefaultFlags = []cli.Flag{ &utils.RollupSequencerHTTPFlag, &utils.RollupHistoricalRPCFlag, &utils.RollupHistoricalRPCTimeoutFlag, + &utils.RollupDisableTxPoolGossipFlag, &utils.ConfigFlag, &logging.LogConsoleVerbosityFlag, From 05aa9dda055ab90f54b5df910e4e2e3d9b61dbd4 Mon Sep 17 00:00:00 2001 From: pcw109550 Date: Thu, 15 Jun 2023 18:37:27 +0900 Subject: [PATCH 02/10] Update erigon-lib version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9a64564e377..642a68649ff 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/ledgerwatch/erigon go 1.19 //fork with minor protobuf file changes and txpool support -replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => github.com/testinprod-io/erigon-lib v0.0.0-20230510042408-cab68978c512 +replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => github.com/testinprod-io/erigon-lib v0.0.0-20230615091823-7f530eb1d385 //for local dev: //replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => ../erigon-lib diff --git a/go.sum b/go.sum index ef9af2cb543..8e6c410494c 100644 --- a/go.sum +++ b/go.sum @@ -777,8 +777,8 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/supranational/blst v0.3.10 h1:CMciDZ/h4pXDDXQASe8ZGTNKUiVNxVVA5hpci2Uuhuk= github.com/supranational/blst v0.3.10/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= -github.com/testinprod-io/erigon-lib v0.0.0-20230510042408-cab68978c512 h1:W4E/VTA0MZuvM/M9Bu4EUxKuvR/Lg3S7Ae2PUbC2xZM= -github.com/testinprod-io/erigon-lib v0.0.0-20230510042408-cab68978c512/go.mod h1:Riqyql8ODsUgb2bXD7RYC4p7Osbq4019/lPin3/eESA= +github.com/testinprod-io/erigon-lib v0.0.0-20230615091823-7f530eb1d385 h1:XUIGcJsbVF3luQO+iytgQpCt6o/FG/vzF5tNhCPFysU= +github.com/testinprod-io/erigon-lib v0.0.0-20230615091823-7f530eb1d385/go.mod h1:Riqyql8ODsUgb2bXD7RYC4p7Osbq4019/lPin3/eESA= github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e h1:cR8/SYRgyQCt5cNCMniB/ZScMkhI9nk8U5C7SbISXjo= github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e/go.mod h1:Tu4lItkATkonrYuvtVjG0/rhy15qrNGNTjPdaphtZ/8= github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= From 1278a06e6a26cc9d4420c55eff005b541f57bb6b Mon Sep 17 00:00:00 2001 From: pcw109550 Date: Thu, 15 Jun 2023 18:52:00 +0900 Subject: [PATCH 03/10] Add disable tx gossip flag --- turbo/cli/flags.go | 1 + 1 file changed, 1 insertion(+) diff --git a/turbo/cli/flags.go b/turbo/cli/flags.go index 305fb2d7204..9142b175c78 100644 --- a/turbo/cli/flags.go +++ b/turbo/cli/flags.go @@ -404,6 +404,7 @@ func setEmbeddedRpcDaemon(ctx *cli.Context, cfg *nodecfg.Config) { RollupSequencerHTTP: ctx.String(utils.RollupSequencerHTTPFlag.Name), RollupHistoricalRPC: ctx.String(utils.RollupHistoricalRPCFlag.Name), RollupHistoricalRPCTimeout: ctx.Duration(utils.RollupHistoricalRPCTimeoutFlag.Name), + RollupDisableTxPoolGossip: ctx.Bool(utils.RollupDisableTxPoolGossipFlag.Name), } if ctx.IsSet(utils.HttpCompressionFlag.Name) { c.HttpCompression = ctx.Bool(utils.HttpCompressionFlag.Name) From 02f56143e02aa85ea3bab600cf00eb1f495855c5 Mon Sep 17 00:00:00 2001 From: pcw109550 Date: Thu, 15 Jun 2023 19:07:14 +0900 Subject: [PATCH 04/10] Pass disable tx gossip flag to txpool config --- cmd/erigon-el/backend/backend.go | 1 + eth/backend.go | 1 + 2 files changed, 2 insertions(+) diff --git a/cmd/erigon-el/backend/backend.go b/cmd/erigon-el/backend/backend.go index 4cf6bbd6619..cb492329443 100644 --- a/cmd/erigon-el/backend/backend.go +++ b/cmd/erigon-el/backend/backend.go @@ -463,6 +463,7 @@ func NewBackend(stack *node.Node, config *ethconfig.Config, logger log.Logger) ( } backend.historicalRPCService = client } + config.TxPool.NoTxGossip = config.RollupDisableTxPoolGossip var miningRPC txpool_proto.MiningServer stateDiffClient := direct.NewStateDiffClientDirect(kvRPC) diff --git a/eth/backend.go b/eth/backend.go index 0edf2aae640..d008749bb8a 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -489,6 +489,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) { } backend.historicalRPCService = client } + config.TxPool.NoTxGossip = config.RollupDisableTxPoolGossip var miningRPC txpool_proto.MiningServer stateDiffClient := direct.NewStateDiffClientDirect(kvRPC) From 701b1c7f48cd7c6163fc1a5e12a7656eb6577c6b Mon Sep 17 00:00:00 2001 From: pcw109550 Date: Fri, 16 Jun 2023 15:18:52 +0900 Subject: [PATCH 05/10] Update erigon-lib version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 642a68649ff..725e536b033 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/ledgerwatch/erigon go 1.19 //fork with minor protobuf file changes and txpool support -replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => github.com/testinprod-io/erigon-lib v0.0.0-20230615091823-7f530eb1d385 +replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => github.com/testinprod-io/erigon-lib v0.0.0-20230616053951-ae06f5d5c536 //for local dev: //replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => ../erigon-lib diff --git a/go.sum b/go.sum index 8e6c410494c..9a9892a8be7 100644 --- a/go.sum +++ b/go.sum @@ -777,8 +777,8 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/supranational/blst v0.3.10 h1:CMciDZ/h4pXDDXQASe8ZGTNKUiVNxVVA5hpci2Uuhuk= github.com/supranational/blst v0.3.10/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= -github.com/testinprod-io/erigon-lib v0.0.0-20230615091823-7f530eb1d385 h1:XUIGcJsbVF3luQO+iytgQpCt6o/FG/vzF5tNhCPFysU= -github.com/testinprod-io/erigon-lib v0.0.0-20230615091823-7f530eb1d385/go.mod h1:Riqyql8ODsUgb2bXD7RYC4p7Osbq4019/lPin3/eESA= +github.com/testinprod-io/erigon-lib v0.0.0-20230616053951-ae06f5d5c536 h1:xootH/fjZSJ0VNE3v0cGU1PleXRsqaseAyvjUWUDh8U= +github.com/testinprod-io/erigon-lib v0.0.0-20230616053951-ae06f5d5c536/go.mod h1:6SIBkeREz7fob8A0EBsTCVzTqJIc+BBiuPAsb5sUYk0= github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e h1:cR8/SYRgyQCt5cNCMniB/ZScMkhI9nk8U5C7SbISXjo= github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e/go.mod h1:Tu4lItkATkonrYuvtVjG0/rhy15qrNGNTjPdaphtZ/8= github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= From 5f6e5dc76301f858d62f46baccd61e4838a7224d Mon Sep 17 00:00:00 2001 From: pcw109550 Date: Fri, 16 Jun 2023 16:43:06 +0900 Subject: [PATCH 06/10] Update erigon-lib version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 725e536b033..648eb5cd40b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/ledgerwatch/erigon go 1.19 //fork with minor protobuf file changes and txpool support -replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => github.com/testinprod-io/erigon-lib v0.0.0-20230616053951-ae06f5d5c536 +replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => github.com/testinprod-io/erigon-lib v0.0.0-20230616062622-16981b32f2f9 //for local dev: //replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => ../erigon-lib diff --git a/go.sum b/go.sum index 9a9892a8be7..595e3663f10 100644 --- a/go.sum +++ b/go.sum @@ -777,8 +777,8 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/supranational/blst v0.3.10 h1:CMciDZ/h4pXDDXQASe8ZGTNKUiVNxVVA5hpci2Uuhuk= github.com/supranational/blst v0.3.10/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= -github.com/testinprod-io/erigon-lib v0.0.0-20230616053951-ae06f5d5c536 h1:xootH/fjZSJ0VNE3v0cGU1PleXRsqaseAyvjUWUDh8U= -github.com/testinprod-io/erigon-lib v0.0.0-20230616053951-ae06f5d5c536/go.mod h1:6SIBkeREz7fob8A0EBsTCVzTqJIc+BBiuPAsb5sUYk0= +github.com/testinprod-io/erigon-lib v0.0.0-20230616062622-16981b32f2f9 h1:OCamWzi5kgUZrlha0oQGRVeRTqLTRLUpyI0MgFUnEf4= +github.com/testinprod-io/erigon-lib v0.0.0-20230616062622-16981b32f2f9/go.mod h1:6SIBkeREz7fob8A0EBsTCVzTqJIc+BBiuPAsb5sUYk0= github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e h1:cR8/SYRgyQCt5cNCMniB/ZScMkhI9nk8U5C7SbISXjo= github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e/go.mod h1:Tu4lItkATkonrYuvtVjG0/rhy15qrNGNTjPdaphtZ/8= github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= From cb6f39ff1f8a2a117a89a9ad227e64e9912a3f60 Mon Sep 17 00:00:00 2001 From: pcw109550 Date: Wed, 21 Jun 2023 14:01:40 +0900 Subject: [PATCH 07/10] Update README for disabletxpoolgossip flag --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index a4f26fd7d82..d8c75943dae 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,10 @@ The historical RPC endpoint. op-erigon queries historical execution data that op For more information about legacy geth, refer the [Optimism's node operator guide](https://community.optimism.io/docs/developers/bedrock/node-operator-guide/#legacy-geth). +### `--rollup.disabletxpoolgossip` +**[New flag / Optional]** +Disables transaction pool gossiping. Though this is not required, it's useful to set this to true since transaction pool gossip is currently unsupported in the Optimism protocol. If not provided, default value is set to `false`. + ### `--maxpeers=0`, `--nodiscover` **[Optional]** Disable P2P. Execution-layer peering is currently not supported in the Optimism protocol. Though this is not required, it saves resources since TX pool gossip is currently not available. @@ -120,6 +124,7 @@ $ ./build/bin/erigon \ --authrpc.jwtsecret=$JWT_SECRET_FILE \ --rollup.sequencerhttp="https://mainnet-sequencer.optimism.io" \ --rollup.historicalrpc="https://mainnet.optimism.io" \ + --rollup.disabletxpoolgossip=true \ --chain=optimism-mainnet \ --nodiscover ``` From 02d617b279c91488dd3cb42ee16bd1b477bedf69 Mon Sep 17 00:00:00 2001 From: pcw109550 Date: Wed, 21 Jun 2023 16:27:38 +0900 Subject: [PATCH 08/10] Remove unused tx gossip disable flag --- cmd/rpcdaemon/cli/config.go | 1 - turbo/cli/flags.go | 1 - 2 files changed, 2 deletions(-) diff --git a/cmd/rpcdaemon/cli/config.go b/cmd/rpcdaemon/cli/config.go index 4e857b00e1a..f33b8f1b629 100644 --- a/cmd/rpcdaemon/cli/config.go +++ b/cmd/rpcdaemon/cli/config.go @@ -124,7 +124,6 @@ func RootCommand() (*cobra.Command, *httpcfg.HttpCfg) { rootCmd.PersistentFlags().StringVar(&cfg.RollupSequencerHTTP, utils.RollupSequencerHTTPFlag.Name, "", "HTTP endpoint for the sequencer mempool") rootCmd.PersistentFlags().StringVar(&cfg.RollupHistoricalRPC, utils.RollupHistoricalRPCFlag.Name, "", "RPC endpoint for historical data") rootCmd.PersistentFlags().DurationVar(&cfg.RollupHistoricalRPCTimeout, utils.RollupHistoricalRPCTimeoutFlag.Name, rpccfg.DefaultHistoricalRPCTimeout, "Timeout for historical RPC requests") - rootCmd.PersistentFlags().BoolVar(&cfg.RollupDisableTxPoolGossip, utils.RollupDisableTxPoolGossipFlag.Name, false, "Disables transaction pool gossip") if err := rootCmd.MarkPersistentFlagFilename("rpc.accessList", "json"); err != nil { panic(err) diff --git a/turbo/cli/flags.go b/turbo/cli/flags.go index 9142b175c78..305fb2d7204 100644 --- a/turbo/cli/flags.go +++ b/turbo/cli/flags.go @@ -404,7 +404,6 @@ func setEmbeddedRpcDaemon(ctx *cli.Context, cfg *nodecfg.Config) { RollupSequencerHTTP: ctx.String(utils.RollupSequencerHTTPFlag.Name), RollupHistoricalRPC: ctx.String(utils.RollupHistoricalRPCFlag.Name), RollupHistoricalRPCTimeout: ctx.Duration(utils.RollupHistoricalRPCTimeoutFlag.Name), - RollupDisableTxPoolGossip: ctx.Bool(utils.RollupDisableTxPoolGossipFlag.Name), } if ctx.IsSet(utils.HttpCompressionFlag.Name) { c.HttpCompression = ctx.Bool(utils.HttpCompressionFlag.Name) From 2ce47e3d9745a40aeec9fa8e00e9fefd829292ac Mon Sep 17 00:00:00 2001 From: pcw109550 Date: Wed, 21 Jun 2023 16:37:28 +0900 Subject: [PATCH 09/10] Add disable tx gossip flag for txpool standalone --- cmd/txpool/main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/txpool/main.go b/cmd/txpool/main.go index a12796d66a1..60d55e3f9e3 100644 --- a/cmd/txpool/main.go +++ b/cmd/txpool/main.go @@ -53,7 +53,8 @@ var ( accountSlots uint64 priceBump uint64 - optimism bool + optimism bool + noTxGossip bool commitEvery time.Duration ) @@ -79,6 +80,7 @@ func init() { rootCmd.PersistentFlags().Uint64Var(&priceBump, "txpool.pricebump", txpoolcfg.DefaultConfig.PriceBump, "Price bump percentage to replace an already existing transaction") rootCmd.PersistentFlags().DurationVar(&commitEvery, utils.TxPoolCommitEveryFlag.Name, utils.TxPoolCommitEveryFlag.Value, utils.TxPoolCommitEveryFlag.Usage) rootCmd.PersistentFlags().BoolVar(&optimism, "txpool.optimism", txpoolcfg.DefaultConfig.Optimism, "Enable Optimism Bedrock to make txpool account for L1 cost of transactions") + rootCmd.PersistentFlags().BoolVar(&noTxGossip, "txpool.disabletxpoolgossip", txpoolcfg.DefaultConfig.NoTxGossip, "Disable transaction pool gossip") rootCmd.Flags().StringSliceVar(&traceSenders, utils.TxPoolTraceSendersFlag.Name, []string{}, utils.TxPoolTraceSendersFlag.Usage) } @@ -147,6 +149,8 @@ func doTxpool(ctx context.Context) error { cfg.MinFeeCap = priceLimit cfg.AccountSlots = accountSlots cfg.PriceBump = priceBump + cfg.Optimism = optimism + cfg.NoTxGossip = noTxGossip cacheConfig := kvcache.DefaultCoherentConfig cacheConfig.MetricsLabel = "txpool" From 066f9d44defbc1e371f23ec0b47d78b0ccd377df Mon Sep 17 00:00:00 2001 From: pcw109550 Date: Tue, 27 Jun 2023 11:26:33 +0900 Subject: [PATCH 10/10] Update erigon-lib version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 648eb5cd40b..a1d08b5d644 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/ledgerwatch/erigon go 1.19 //fork with minor protobuf file changes and txpool support -replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => github.com/testinprod-io/erigon-lib v0.0.0-20230616062622-16981b32f2f9 +replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => github.com/testinprod-io/erigon-lib v0.0.0-20230627022131-a6b80ff472f7 //for local dev: //replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => ../erigon-lib diff --git a/go.sum b/go.sum index 595e3663f10..bcec40cd005 100644 --- a/go.sum +++ b/go.sum @@ -777,8 +777,8 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/supranational/blst v0.3.10 h1:CMciDZ/h4pXDDXQASe8ZGTNKUiVNxVVA5hpci2Uuhuk= github.com/supranational/blst v0.3.10/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= -github.com/testinprod-io/erigon-lib v0.0.0-20230616062622-16981b32f2f9 h1:OCamWzi5kgUZrlha0oQGRVeRTqLTRLUpyI0MgFUnEf4= -github.com/testinprod-io/erigon-lib v0.0.0-20230616062622-16981b32f2f9/go.mod h1:6SIBkeREz7fob8A0EBsTCVzTqJIc+BBiuPAsb5sUYk0= +github.com/testinprod-io/erigon-lib v0.0.0-20230627022131-a6b80ff472f7 h1:cFFBTMygHPJ4uGhXqdI0bS1/LQ8t8Q4sl6buk3NiXnQ= +github.com/testinprod-io/erigon-lib v0.0.0-20230627022131-a6b80ff472f7/go.mod h1:6SIBkeREz7fob8A0EBsTCVzTqJIc+BBiuPAsb5sUYk0= github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e h1:cR8/SYRgyQCt5cNCMniB/ZScMkhI9nk8U5C7SbISXjo= github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e/go.mod h1:Tu4lItkATkonrYuvtVjG0/rhy15qrNGNTjPdaphtZ/8= github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg=