From d19ff9f7284392048dc9600d7b00ae0385ad7d91 Mon Sep 17 00:00:00 2001 From: Ceyhun Onur Date: Thu, 11 Jan 2024 17:29:50 +0300 Subject: [PATCH] bump latest avago rc --- go.mod | 4 ++-- go.sum | 8 ++++---- internal/ethapi/api.go | 4 ++-- plugin/evm/gossip.go | 4 ++-- plugin/evm/vm.go | 2 +- scripts/versions.sh | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 76d15f98ec..6f029156d4 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/VictoriaMetrics/fastcache v1.10.0 github.com/ava-labs/avalanche-network-runner v1.7.4-0.20231127162258-2f3ceed8ae4b - github.com/ava-labs/avalanchego v1.10.18-rc.5.0.20240106000936-790b8a522a5c + github.com/ava-labs/avalanchego v1.10.18-rc.17 github.com/cespare/cp v0.1.0 github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 github.com/davecgh/go-spew v1.1.1 @@ -57,7 +57,7 @@ require ( github.com/DataDog/zstd v1.5.2 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect - github.com/ava-labs/coreth v0.12.9-rc.9.0.20240106001443-afa748159ba2 // indirect + github.com/ava-labs/coreth v0.12.9-rc.9.0.20240110070856-c8809cc3c436 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.7.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect diff --git a/go.sum b/go.sum index fc15ae6ba3..451a49676f 100644 --- a/go.sum +++ b/go.sum @@ -61,10 +61,10 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/ava-labs/avalanche-network-runner v1.7.4-0.20231127162258-2f3ceed8ae4b h1:iH6q+S7dmBOYCXrZx+nNlS1HBp72L2msiVCLs39Ls5A= github.com/ava-labs/avalanche-network-runner v1.7.4-0.20231127162258-2f3ceed8ae4b/go.mod h1:aeAm8dgJ1xucQKlYoRDMgYjA0UWGwmaICG9wL0WvseU= -github.com/ava-labs/avalanchego v1.10.18-rc.5.0.20240106000936-790b8a522a5c h1:7UJ7w1SJ9dWYJwZhVXHqo0ZuOe2B6VkRwgDyLpaxyT8= -github.com/ava-labs/avalanchego v1.10.18-rc.5.0.20240106000936-790b8a522a5c/go.mod h1:MFhaH6W7YO/KvvSvyC4yt7p7/jfQwmygAM/stIupl5k= -github.com/ava-labs/coreth v0.12.9-rc.9.0.20240106001443-afa748159ba2 h1:Cnz0ekUR9GG2BI/oJPxO6qy1GM7QU59N82rCv3Q5WWU= -github.com/ava-labs/coreth v0.12.9-rc.9.0.20240106001443-afa748159ba2/go.mod h1:YHkiBsAxZKgChyWdoeY5uMAhw+eqAfiT+m0oMwHPHuY= +github.com/ava-labs/avalanchego v1.10.18-rc.17 h1:ZZxjDy54NDBwMW3b6LtBoDTe5jaJJipCQcq4iUXRskE= +github.com/ava-labs/avalanchego v1.10.18-rc.17/go.mod h1:7+Ao/l/f7PCMeVyYAn7xF0Xy8iX/MMLEr95pyoeURJM= +github.com/ava-labs/coreth v0.12.9-rc.9.0.20240110070856-c8809cc3c436 h1:s2LATNf3948KEIkgpUONktGKUhaU3rb6/o2b4KA1bcQ= +github.com/ava-labs/coreth v0.12.9-rc.9.0.20240110070856-c8809cc3c436/go.mod h1:fHAYNaRtIA+rkrHzy8i2HhXyj6dqC64C5ZfiXymZlQM= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 4e62090f5b..bae448634d 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -1861,9 +1861,9 @@ func SubmitTransaction(ctx context.Context, b Backend, tx *types.Transaction) (c if tx.To() == nil { addr := crypto.CreateAddress(from, tx.Nonce()) - log.Debug("Submitted contract creation", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "contract", addr.Hex(), "value", tx.Value(), "type", tx.Type(), "gasFeeCap", tx.GasFeeCap(), "gasTipCap", tx.GasTipCap(), "gasPrice", tx.GasPrice()) + log.Info("Submitted contract creation", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "contract", addr.Hex(), "value", tx.Value(), "type", tx.Type(), "gasFeeCap", tx.GasFeeCap(), "gasTipCap", tx.GasTipCap(), "gasPrice", tx.GasPrice()) } else { - log.Debug("Submitted transaction", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "recipient", tx.To(), "value", tx.Value(), "type", tx.Type(), "gasFeeCap", tx.GasFeeCap(), "gasTipCap", tx.GasTipCap(), "gasPrice", tx.GasPrice()) + log.Info("Submitted transaction", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "recipient", tx.To(), "value", tx.Value(), "type", tx.Type(), "gasFeeCap", tx.GasFeeCap(), "gasTipCap", tx.GasTipCap(), "gasPrice", tx.GasPrice()) } return tx.Hash(), nil } diff --git a/plugin/evm/gossip.go b/plugin/evm/gossip.go index 72dee3985a..29f7df317b 100644 --- a/plugin/evm/gossip.go +++ b/plugin/evm/gossip.go @@ -126,7 +126,7 @@ func (g *GossipEthTxPool) Subscribe(ctx context.Context) { } if reset { - log.Info("resetting bloom filter", "reason", "reached max filled ratio", "optimal elements", optimalElements) + log.Debug("resetting bloom filter", "reason", "reached max filled ratio") g.mempool.IteratePending(func(tx *types.Transaction) bool { g.bloom.Add(&GossipEthTx{Tx: pendingTx}) @@ -151,7 +151,7 @@ func (g *GossipEthTxPool) Iterate(f func(tx *GossipEthTx) bool) { }) } -func (g *GossipEthTxPool) GetFilter() ([]byte, []byte, error) { +func (g *GossipEthTxPool) GetFilter() ([]byte, []byte) { g.lock.RLock() defer g.lock.RUnlock() diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go index 16e25a898d..8c60da40a9 100644 --- a/plugin/evm/vm.go +++ b/plugin/evm/vm.go @@ -106,7 +106,7 @@ const ( ethTxGossipProtocol = 0x0 // gossip constants - txGossipBloomMinTargetElements = 1024 + txGossipBloomMinTargetElements = 8 * 1024 txGossipBloomTargetFalsePositiveRate = 0.01 txGossipBloomResetFalsePositiveRate = 0.05 txGossipBloomChurnMultiplier = 3 diff --git a/scripts/versions.sh b/scripts/versions.sh index 6025f753cf..b2cb007c06 100644 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Don't export them as they're used in the context of other calls -AVALANCHE_VERSION=${AVALANCHE_VERSION:-'790b8a522a5c9068631272ef2df0e3a6e383db6d'} +AVALANCHE_VERSION=${AVALANCHE_VERSION:-'v1.10.18-rc.17'} GINKGO_VERSION=${GINKGO_VERSION:-'v2.2.0'} # This won't be used, but it's here to make code syncs easier