From a4955545c89c8d039843916b77badeae6b802d45 Mon Sep 17 00:00:00 2001 From: Felipe Madero Date: Fri, 6 Dec 2024 11:21:26 -0300 Subject: [PATCH 1/7] allow private peers param --- go.mod | 2 +- go.sum | 2 ++ peers/app_request_network.go | 13 ++++++++++++- relayer/config/config.go | 1 + relayer/main/main.go | 1 + signature-aggregator/config/config.go | 1 + signature-aggregator/main/main.go | 1 + 7 files changed, 19 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index b6e6202f..0653e7f9 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.10 require ( github.com/alexliesenfeld/health v0.8.0 - github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241122192639-7c3ad181c928 + github.com/ava-labs/avalanchego v1.12.1-0.20241203223023-13e07a1b3a1e github.com/ava-labs/coreth v0.13.9-rc.1 github.com/ava-labs/subnet-evm v0.6.12 github.com/ava-labs/teleporter v1.0.8-0.20241122194201-a6e92843c3b1 diff --git a/go.sum b/go.sum index 855dfc4d..6d5e3630 100644 --- a/go.sum +++ b/go.sum @@ -62,6 +62,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241122192639-7c3ad181c928 h1:th+K+wWgAYL/NsrFJyO+/sThLRdEDE0+I4vgbPLoWQQ= github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241122192639-7c3ad181c928/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= +github.com/ava-labs/avalanchego v1.12.1-0.20241203223023-13e07a1b3a1e h1:pJJYryEedoOobUPuRNUYBwQgsaQXMqBkeMq28lRDpSo= +github.com/ava-labs/avalanchego v1.12.1-0.20241203223023-13e07a1b3a1e/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= github.com/ava-labs/awm-relayer v1.4.1-0.20241122193929-3dae643932ee h1:Op1rpuqFo28RnurIfQRCgMmjpRzCcXmbRoCC0I3+NOo= github.com/ava-labs/awm-relayer v1.4.1-0.20241122193929-3dae643932ee/go.mod h1:2/GCie3ccW/rVJfOJmJyiGDjtZILWujpB/r/KcVV8/s= github.com/ava-labs/coreth v0.13.9-rc.1 h1:qIICpC/OZGYUP37QnLgIqqwGmxnLwLpZaUlqJNI85vU= diff --git a/peers/app_request_network.go b/peers/app_request_network.go index bd984c64..60d658b0 100644 --- a/peers/app_request_network.go +++ b/peers/app_request_network.go @@ -81,6 +81,7 @@ func NewNetwork( trackedSubnets set.Set[ids.ID], manuallyTrackedPeers []info.Peer, cfg Config, + allowPrivateIPs bool, ) (AppRequestNetwork, error) { logger := logging.NewLogger( "p2p-network", @@ -127,7 +128,17 @@ func NewNetwork( validatorClient := validators.NewCanonicalValidatorClient(logger, cfg.GetPChainAPI()) manager := snowVdrs.NewManager() - testNetwork, err := network.NewTestNetwork(logger, networkID, manager, trackedSubnets, handler) + testNetworkConfig, err := network.NewTestNetworkConfig(registerer, networkID, manager, trackedSubnets) + if err != nil { + logger.Error( + "Failed to create test network config", + zap.Error(err), + ) + return nil, err + } + testNetworkConfig.AllowPrivateIPs = allowPrivateIPs + + testNetwork, err := network.NewTestNetwork(logger, registerer, testNetworkConfig, handler) if err != nil { logger.Error( "Failed to create test network", diff --git a/relayer/config/config.go b/relayer/config/config.go index db299d7b..a64601b7 100644 --- a/relayer/config/config.go +++ b/relayer/config/config.go @@ -65,6 +65,7 @@ type Config struct { DeciderURL string `mapstructure:"decider-url" json:"decider-url"` SignatureCacheSize uint64 `mapstructure:"signature-cache-size" json:"signature-cache-size"` ManuallyTrackedPeers []*basecfg.PeerConfig `mapstructure:"manually-tracked-peers" json:"manually-tracked-peers"` + AllowPrivateIPs bool `mapstructure:"allow-private-ips" json:"allow-private-ips"` // mapstructure doesn't handle time.Time out of the box so handle it manually EtnaTime time.Time `json:"etna-time"` diff --git a/relayer/main/main.go b/relayer/main/main.go index 693da6b4..620f33b0 100644 --- a/relayer/main/main.go +++ b/relayer/main/main.go @@ -168,6 +168,7 @@ func main() { nil, manuallyTrackedPeers, &cfg, + cfg.AllowPrivateIPs, ) if err != nil { logger.Fatal("Failed to create app request network", zap.Error(err)) diff --git a/signature-aggregator/config/config.go b/signature-aggregator/config/config.go index 9dd8525a..154e9cfd 100644 --- a/signature-aggregator/config/config.go +++ b/signature-aggregator/config/config.go @@ -35,6 +35,7 @@ type Config struct { APIPort uint16 `mapstructure:"api-port" json:"api-port"` MetricsPort uint16 `mapstructure:"metrics-port" json:"metrics-port"` SignatureCacheSize uint64 `mapstructure:"signature-cache-size" json:"signature-cache-size"` + AllowPrivateIPs bool `mapstructure:"allow-private-ips" json:"allow-private-ips"` // mapstructure doesn't support time.Time out of the box so handle it manually EtnaTime time.Time `json:"etna-time"` diff --git a/signature-aggregator/main/main.go b/signature-aggregator/main/main.go index 0c3ba8d9..3f343336 100644 --- a/signature-aggregator/main/main.go +++ b/signature-aggregator/main/main.go @@ -104,6 +104,7 @@ func main() { nil, nil, &cfg, + cfg.AllowPrivateIPs, ) if err != nil { logger.Fatal("Failed to create app request network", zap.Error(err)) From be351e56eea071ff9791eead34167787e05e4479 Mon Sep 17 00:00:00 2001 From: Felipe Madero Date: Fri, 6 Dec 2024 12:02:58 -0300 Subject: [PATCH 2/7] avoid prometheus conflict --- peers/app_request_network.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/peers/app_request_network.go b/peers/app_request_network.go index 60d658b0..cb48d893 100644 --- a/peers/app_request_network.go +++ b/peers/app_request_network.go @@ -128,7 +128,9 @@ func NewNetwork( validatorClient := validators.NewCanonicalValidatorClient(logger, cfg.GetPChainAPI()) manager := snowVdrs.NewManager() - testNetworkConfig, err := network.NewTestNetworkConfig(registerer, networkID, manager, trackedSubnets) + testNetworkRegisterer := prometheus.NewRegistry() + + testNetworkConfig, err := network.NewTestNetworkConfig(testNetworkRegisterer, networkID, manager, trackedSubnets) if err != nil { logger.Error( "Failed to create test network config", @@ -138,7 +140,7 @@ func NewNetwork( } testNetworkConfig.AllowPrivateIPs = allowPrivateIPs - testNetwork, err := network.NewTestNetwork(logger, registerer, testNetworkConfig, handler) + testNetwork, err := network.NewTestNetwork(logger, testNetworkRegisterer, testNetworkConfig, handler) if err != nil { logger.Error( "Failed to create test network", From b24e36e18d69fe4de422ef10394ce6c647cb640d Mon Sep 17 00:00:00 2001 From: Felipe Madero Date: Mon, 9 Dec 2024 15:15:31 -0300 Subject: [PATCH 3/7] address PR comments --- go.mod | 2 +- go.sum | 2 ++ peers/app_request_network.go | 3 +-- peers/config.go | 1 + relayer/config/config.go | 4 ++++ relayer/main/main.go | 1 - signature-aggregator/config/config.go | 4 ++++ signature-aggregator/main/main.go | 1 - 8 files changed, 13 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 0653e7f9..029d496a 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.10 require ( github.com/alexliesenfeld/health v0.8.0 - github.com/ava-labs/avalanchego v1.12.1-0.20241203223023-13e07a1b3a1e + github.com/ava-labs/avalanchego v1.12.1-0.20241209145704-f9d5d20b11ef github.com/ava-labs/coreth v0.13.9-rc.1 github.com/ava-labs/subnet-evm v0.6.12 github.com/ava-labs/teleporter v1.0.8-0.20241122194201-a6e92843c3b1 diff --git a/go.sum b/go.sum index 6d5e3630..86507d32 100644 --- a/go.sum +++ b/go.sum @@ -64,6 +64,8 @@ github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241122192639-7c3ad181c github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241122192639-7c3ad181c928/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= github.com/ava-labs/avalanchego v1.12.1-0.20241203223023-13e07a1b3a1e h1:pJJYryEedoOobUPuRNUYBwQgsaQXMqBkeMq28lRDpSo= github.com/ava-labs/avalanchego v1.12.1-0.20241203223023-13e07a1b3a1e/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= +github.com/ava-labs/avalanchego v1.12.1-0.20241209145704-f9d5d20b11ef h1:FXg34yrX4Dla8fUZVFWgLO/N7fF5Dn88ora4b/Kn1TY= +github.com/ava-labs/avalanchego v1.12.1-0.20241209145704-f9d5d20b11ef/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= github.com/ava-labs/awm-relayer v1.4.1-0.20241122193929-3dae643932ee h1:Op1rpuqFo28RnurIfQRCgMmjpRzCcXmbRoCC0I3+NOo= github.com/ava-labs/awm-relayer v1.4.1-0.20241122193929-3dae643932ee/go.mod h1:2/GCie3ccW/rVJfOJmJyiGDjtZILWujpB/r/KcVV8/s= github.com/ava-labs/coreth v0.13.9-rc.1 h1:qIICpC/OZGYUP37QnLgIqqwGmxnLwLpZaUlqJNI85vU= diff --git a/peers/app_request_network.go b/peers/app_request_network.go index cb48d893..23494e96 100644 --- a/peers/app_request_network.go +++ b/peers/app_request_network.go @@ -81,7 +81,6 @@ func NewNetwork( trackedSubnets set.Set[ids.ID], manuallyTrackedPeers []info.Peer, cfg Config, - allowPrivateIPs bool, ) (AppRequestNetwork, error) { logger := logging.NewLogger( "p2p-network", @@ -138,7 +137,7 @@ func NewNetwork( ) return nil, err } - testNetworkConfig.AllowPrivateIPs = allowPrivateIPs + testNetworkConfig.AllowPrivateIPs = cfg.GetAllowPrivateIPs() testNetwork, err := network.NewTestNetwork(logger, testNetworkRegisterer, testNetworkConfig, handler) if err != nil { diff --git a/peers/config.go b/peers/config.go index f997b3fa..d9dc0103 100644 --- a/peers/config.go +++ b/peers/config.go @@ -9,4 +9,5 @@ import "github.com/ava-labs/icm-services/config" type Config interface { GetInfoAPI() *config.APIConfig GetPChainAPI() *config.APIConfig + GetAllowPrivateIPs() bool } diff --git a/relayer/config/config.go b/relayer/config/config.go index a64601b7..1e88d761 100644 --- a/relayer/config/config.go +++ b/relayer/config/config.go @@ -256,3 +256,7 @@ func (c *Config) GetPChainAPI() *basecfg.APIConfig { func (c *Config) GetInfoAPI() *basecfg.APIConfig { return c.InfoAPI } + +func (c *Config) GetAllowPrivateIPs() bool { + return c.AllowPrivateIPs +} diff --git a/relayer/main/main.go b/relayer/main/main.go index 620f33b0..693da6b4 100644 --- a/relayer/main/main.go +++ b/relayer/main/main.go @@ -168,7 +168,6 @@ func main() { nil, manuallyTrackedPeers, &cfg, - cfg.AllowPrivateIPs, ) if err != nil { logger.Fatal("Failed to create app request network", zap.Error(err)) diff --git a/signature-aggregator/config/config.go b/signature-aggregator/config/config.go index 154e9cfd..ebf2413f 100644 --- a/signature-aggregator/config/config.go +++ b/signature-aggregator/config/config.go @@ -68,3 +68,7 @@ func (c *Config) GetPChainAPI() *basecfg.APIConfig { func (c *Config) GetInfoAPI() *basecfg.APIConfig { return c.InfoAPI } + +func (c *Config) GetAllowPrivateIPs() bool { + return c.AllowPrivateIPs +} diff --git a/signature-aggregator/main/main.go b/signature-aggregator/main/main.go index 3f343336..0c3ba8d9 100644 --- a/signature-aggregator/main/main.go +++ b/signature-aggregator/main/main.go @@ -104,7 +104,6 @@ func main() { nil, nil, &cfg, - cfg.AllowPrivateIPs, ) if err != nil { logger.Fatal("Failed to create app request network", zap.Error(err)) From df70a3ac5b7c29c3ecad811670a9e0d9cc705438 Mon Sep 17 00:00:00 2001 From: Felipe Madero Date: Mon, 9 Dec 2024 15:18:40 -0300 Subject: [PATCH 4/7] tidy --- go.sum | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go.sum b/go.sum index 86507d32..ec8cccb1 100644 --- a/go.sum +++ b/go.sum @@ -60,10 +60,6 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241122192639-7c3ad181c928 h1:th+K+wWgAYL/NsrFJyO+/sThLRdEDE0+I4vgbPLoWQQ= -github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241122192639-7c3ad181c928/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= -github.com/ava-labs/avalanchego v1.12.1-0.20241203223023-13e07a1b3a1e h1:pJJYryEedoOobUPuRNUYBwQgsaQXMqBkeMq28lRDpSo= -github.com/ava-labs/avalanchego v1.12.1-0.20241203223023-13e07a1b3a1e/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= github.com/ava-labs/avalanchego v1.12.1-0.20241209145704-f9d5d20b11ef h1:FXg34yrX4Dla8fUZVFWgLO/N7fF5Dn88ora4b/Kn1TY= github.com/ava-labs/avalanchego v1.12.1-0.20241209145704-f9d5d20b11ef/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= github.com/ava-labs/awm-relayer v1.4.1-0.20241122193929-3dae643932ee h1:Op1rpuqFo28RnurIfQRCgMmjpRzCcXmbRoCC0I3+NOo= From ff20b7edce739b602266b252336432054c448430 Mon Sep 17 00:00:00 2001 From: Felipe Madero Date: Tue, 10 Dec 2024 14:31:43 -0300 Subject: [PATCH 5/7] fix avago commit --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 23c98450..9fc458b0 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.10 require ( github.com/alexliesenfeld/health v0.8.0 - github.com/ava-labs/avalanchego v1.12.1-0.20241210035517-714dfa0c3942 + github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88 github.com/ava-labs/coreth v0.13.9-rc.1 github.com/ava-labs/icm-contracts v1.0.9-0.20241210131047-74f89f0f9331 github.com/ava-labs/subnet-evm v0.6.13-0.20241205165027-6c98da796f35 diff --git a/go.sum b/go.sum index 9911d6e1..24860048 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,8 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/ava-labs/avalanchego v1.12.1-0.20241210035517-714dfa0c3942 h1:eDSWDIaaMHNEAorxQqnA88S39zlgmQ26OKgWn5AaDJ0= -github.com/ava-labs/avalanchego v1.12.1-0.20241210035517-714dfa0c3942/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= +github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88 h1:tZdtOPFNblKZx+FmJOhqEfxUUscvPhcLHKGZO3BtQ6A= +github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= github.com/ava-labs/coreth v0.13.9-rc.1 h1:qIICpC/OZGYUP37QnLgIqqwGmxnLwLpZaUlqJNI85vU= github.com/ava-labs/coreth v0.13.9-rc.1/go.mod h1:7aMsRIo/3GBE44qWZMjnfqdqfcfZ5yShTTm2LObLaYo= github.com/ava-labs/icm-contracts v1.0.9-0.20241210131047-74f89f0f9331 h1:Mcml40d0O2ebfVgd7wFN6X3YIAOw3j5TrR7onHP1EpY= From 25d5c7f6c877067c998b49bdb8b40f1efa2445de Mon Sep 17 00:00:00 2001 From: Felipe Madero Date: Tue, 10 Dec 2024 15:02:48 -0300 Subject: [PATCH 6/7] allow private IPs on default test config generators --- tests/utils/utils.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/utils/utils.go b/tests/utils/utils.go index c37a8feb..9f438695 100644 --- a/tests/utils/utils.go +++ b/tests/utils/utils.go @@ -208,6 +208,7 @@ func CreateDefaultRelayerConfig( APIPort: 8080, DeciderURL: "localhost:50051", SignatureCacheSize: (1024 * 1024), + AllowPrivateIPs: true, } } @@ -238,6 +239,7 @@ func CreateDefaultSignatureAggregatorConfig( APIPort: 8080, MetricsPort: 8081, SignatureCacheSize: (1024 * 1024), + AllowPrivateIPs: true, } } From 5159047257fc90ebba274a49d27d2c2baa5af08b Mon Sep 17 00:00:00 2001 From: Felipe Madero Date: Tue, 10 Dec 2024 15:27:58 -0300 Subject: [PATCH 7/7] fix contracts dep --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9fc458b0..98160ed4 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/alexliesenfeld/health v0.8.0 github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88 github.com/ava-labs/coreth v0.13.9-rc.1 - github.com/ava-labs/icm-contracts v1.0.9-0.20241210131047-74f89f0f9331 + github.com/ava-labs/icm-contracts v1.0.9-0.20241210181701-a4bd5c92b056 github.com/ava-labs/subnet-evm v0.6.13-0.20241205165027-6c98da796f35 github.com/aws/aws-sdk-go-v2 v1.32.6 github.com/aws/aws-sdk-go-v2/config v1.28.6 diff --git a/go.sum b/go.sum index 24860048..292d076c 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88 h1:tZdtOPF github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= github.com/ava-labs/coreth v0.13.9-rc.1 h1:qIICpC/OZGYUP37QnLgIqqwGmxnLwLpZaUlqJNI85vU= github.com/ava-labs/coreth v0.13.9-rc.1/go.mod h1:7aMsRIo/3GBE44qWZMjnfqdqfcfZ5yShTTm2LObLaYo= -github.com/ava-labs/icm-contracts v1.0.9-0.20241210131047-74f89f0f9331 h1:Mcml40d0O2ebfVgd7wFN6X3YIAOw3j5TrR7onHP1EpY= -github.com/ava-labs/icm-contracts v1.0.9-0.20241210131047-74f89f0f9331/go.mod h1:qYbpPBuMoWW8btWiuFPFS1uZtc2wRcUOP42DKT4M/oQ= +github.com/ava-labs/icm-contracts v1.0.9-0.20241210181701-a4bd5c92b056 h1:VJDtg5UW4SWBeEMtv6qdWgEohdZxEp3jGDAllH6f8eI= +github.com/ava-labs/icm-contracts v1.0.9-0.20241210181701-a4bd5c92b056/go.mod h1:b6Hr01e5LWPua+nuZrSjjCyqfEhgFFdjBmKoJMoWTZo= github.com/ava-labs/subnet-evm v0.6.13-0.20241205165027-6c98da796f35 h1:CbXWon0fwGDEDCCiChx2VeIIwO3UML9+8OUTyNwPsxA= github.com/ava-labs/subnet-evm v0.6.13-0.20241205165027-6c98da796f35/go.mod h1:SfAF4jjYPkezKWShPY/T31WQdD/UHrDyqy0kxA0LE0w= github.com/aws/aws-sdk-go-v2 v1.32.6 h1:7BokKRgRPuGmKkFMhEg/jSul+tB9VvXhcViILtfG8b4=