fly: Updated p2p package for cutover support

wormhole-foundation · Jan 16, 2024 · bfd5c9c · bfd5c9c
1 parent f0e4caf
commit bfd5c9c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/fly/cmd/heartbeats/main.go b/fly/cmd/heartbeats/main.go
@@ -125,7 +125,7 @@ func main() {
 	initObsvTableData(true)
 	// TODO: pass in config instead of hard-coding it
 	p2pNetworkID = "/wormhole/mainnet/2"
-	p2pBootstrap = "/dns4/wormhole-mainnet-v2-bootstrap.certus.one/udp/8999/quic/p2p/12D3KooWQp644DK27fd3d4Km3jr7gHiuJJ5ZGmy8hH4py7fP4FP7,/dns4/wormhole-v2-mainnet-bootstrap.xlabs.xyz/udp/8999/quic/p2p/12D3KooWNQ9tVrcb64tw6bNs2CaNrUGPM7yRrKvBBheQ5yCyPHKC"
+	p2pBootstrap = "/dns4/wormhole-v2-mainnet-bootstrap.xlabs.xyz/udp/8999/quic/p2p/12D3KooWNQ9tVrcb64tw6bNs2CaNrUGPM7yRrKvBBheQ5yCyPHKC,/dns4/wormhole.mcf.rocks/udp/8999/quic/p2p/12D3KooWDZVv7BhZ8yFLkarNdaSWaB43D6UbQwExJ8nnGAEmfHcU,/dns4/wormhole-v2-mainnet-bootstrap.staking.fund/udp/8999/quic/p2p/12D3KooWG8obDX9DNi1KUwZNu9xkGwfKqTp2GFwuuHpWZ3nQruS1"
 	p2pPort = 8999
 	nodeKeyPath = "/tmp/node.key"
 	logLevel = "warn"

diff --git a/fly/cmd/observation_stats/main.go b/fly/cmd/observation_stats/main.go
@@ -35,7 +35,7 @@ var (
 func main() {
 	// TODO: pass in config instead of hard-coding it
 	p2pNetworkID = "/wormhole/mainnet/2"
-	p2pBootstrap = "/dns4/wormhole-mainnet-v2-bootstrap.certus.one/udp/8999/quic/p2p/12D3KooWQp644DK27fd3d4Km3jr7gHiuJJ5ZGmy8hH4py7fP4FP7,/dns4/wormhole-v2-mainnet-bootstrap.xlabs.xyz/udp/8999/quic/p2p/12D3KooWNQ9tVrcb64tw6bNs2CaNrUGPM7yRrKvBBheQ5yCyPHKC"
+	p2pBootstrap = "/dns4/wormhole-v2-mainnet-bootstrap.xlabs.xyz/udp/8999/quic/p2p/12D3KooWNQ9tVrcb64tw6bNs2CaNrUGPM7yRrKvBBheQ5yCyPHKC,/dns4/wormhole.mcf.rocks/udp/8999/quic/p2p/12D3KooWDZVv7BhZ8yFLkarNdaSWaB43D6UbQwExJ8nnGAEmfHcU,/dns4/wormhole-v2-mainnet-bootstrap.staking.fund/udp/8999/quic/p2p/12D3KooWG8obDX9DNi1KUwZNu9xkGwfKqTp2GFwuuHpWZ3nQruS1"
 	p2pPort = 8999
 	nodeKeyPath = "/tmp/node.key"
 	logLevel = "info"

diff --git a/fly/cmd/track_gossip/main.go b/fly/cmd/track_gossip/main.go
@@ -40,7 +40,7 @@ func main() {
 	// TODO: pass in config instead of hard-coding it
 	// main
 	p2pNetworkID = "/wormhole/mainnet/2"
-	p2pBootstrap = "/dns4/wormhole-mainnet-v2-bootstrap.certus.one/udp/8999/quic/p2p/12D3KooWQp644DK27fd3d4Km3jr7gHiuJJ5ZGmy8hH4py7fP4FP7"
+	p2pBootstrap = "/dns4/wormhole-v2-mainnet-bootstrap.xlabs.xyz/udp/8999/quic/p2p/12D3KooWNQ9tVrcb64tw6bNs2CaNrUGPM7yRrKvBBheQ5yCyPHKC,/dns4/wormhole.mcf.rocks/udp/8999/quic/p2p/12D3KooWDZVv7BhZ8yFLkarNdaSWaB43D6UbQwExJ8nnGAEmfHcU,/dns4/wormhole-v2-mainnet-bootstrap.staking.fund/udp/8999/quic/p2p/12D3KooWG8obDX9DNi1KUwZNu9xkGwfKqTp2GFwuuHpWZ3nQruS1"
 	// devnet
 	// p2pNetworkID = "/wormhole/dev"
 	// p2pBootstrap = "/dns4/guardian-0.guardian/udp/8999/quic/p2p/12D3KooWL3XJ9EMCyZvmmGXL2LMiVBtrVa2BuESsJiXkSj7333Jw"

diff --git a/fly/cmd/track_pyth/main.go b/fly/cmd/track_pyth/main.go
@@ -83,7 +83,7 @@ func main() {
 	// TODO: pass in config instead of hard-coding it
 	// main
 	p2pNetworkID = "/wormhole/mainnet/2"
-	p2pBootstrap = "/dns4/wormhole-mainnet-v2-bootstrap.certus.one/udp/8999/quic/p2p/12D3KooWQp644DK27fd3d4Km3jr7gHiuJJ5ZGmy8hH4py7fP4FP7"
+	p2pBootstrap = "/dns4/wormhole-v2-mainnet-bootstrap.xlabs.xyz/udp/8999/quic/p2p/12D3KooWNQ9tVrcb64tw6bNs2CaNrUGPM7yRrKvBBheQ5yCyPHKC,/dns4/wormhole.mcf.rocks/udp/8999/quic/p2p/12D3KooWDZVv7BhZ8yFLkarNdaSWaB43D6UbQwExJ8nnGAEmfHcU,/dns4/wormhole-v2-mainnet-bootstrap.staking.fund/udp/8999/quic/p2p/12D3KooWG8obDX9DNi1KUwZNu9xkGwfKqTp2GFwuuHpWZ3nQruS1"
 	// devnet
 	// p2pNetworkID = "/wormhole/dev"
 	// p2pBootstrap = "/dns4/guardian-0.guardian/udp/8999/quic/p2p/12D3KooWL3XJ9EMCyZvmmGXL2LMiVBtrVa2BuESsJiXkSj7333Jw"

diff --git a/fly/go.mod b/fly/go.mod
@@ -8,14 +8,14 @@ require (
 	cloud.google.com/go/pubsub v1.33.0
 	firebase.google.com/go v3.13.0+incompatible
 	github.com/buger/goterm v1.0.4
-	github.com/certusone/wormhole/node v0.0.0-20231116150331-0cf298cabed5
+	github.com/certusone/wormhole/node v0.0.0-20240112223139-a6cc3b1ce571
 	github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203
 	github.com/ethereum/go-ethereum v1.10.26
 	github.com/ipfs/go-log/v2 v2.5.1
 	github.com/jedib0t/go-pretty/v6 v6.4.6
 	github.com/libp2p/go-libp2p v0.29.2
 	github.com/mr-tron/base58 v1.2.0
-	github.com/wormhole-foundation/wormhole/sdk v0.0.0-20231114204301-fcd41cf8837b
+	github.com/wormhole-foundation/wormhole/sdk v0.0.0-20240112223139-a6cc3b1ce571
 	go.uber.org/zap v1.25.0
 	google.golang.org/api v0.126.0
 	google.golang.org/protobuf v1.31.0

diff --git a/fly/go.sum b/fly/go.sum
@@ -158,6 +158,8 @@ github.com/certusone/wormhole/node v0.0.0-20231114230026-dfbdc9afb434 h1:nPMCcuo
 github.com/certusone/wormhole/node v0.0.0-20231114230026-dfbdc9afb434/go.mod h1:Wnv48pOXu4Ia/s/yXIYmbl0eHibHu24JpfyvcrsIYog=
 github.com/certusone/wormhole/node v0.0.0-20231116150331-0cf298cabed5 h1:z/yIxzwh1Tx1wrnPEBum6b52pc3crJwaxFIK+P5gcJ8=
 github.com/certusone/wormhole/node v0.0.0-20231116150331-0cf298cabed5/go.mod h1:Wnv48pOXu4Ia/s/yXIYmbl0eHibHu24JpfyvcrsIYog=
+github.com/certusone/wormhole/node v0.0.0-20240112223139-a6cc3b1ce571 h1:mEeF8r/6dYc8JjJmem6DXvxnK1Vt+wZfHmnCCv53m8g=
+github.com/certusone/wormhole/node v0.0.0-20240112223139-a6cc3b1ce571/go.mod h1:wlhF32xzJsQ79Jx34Eqk+7gkMiZgLryMXEInVP+shKQ=
 github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -977,6 +979,8 @@ github.com/wormhole-foundation/wormhole/sdk v0.0.0-20220926172624-4b38dc650bb0 h
 github.com/wormhole-foundation/wormhole/sdk v0.0.0-20220926172624-4b38dc650bb0/go.mod h1:Vg7Cbb370S+JihB+of1rWm9Aaxzf0GPPvKszPeSb7AE=
 github.com/wormhole-foundation/wormhole/sdk v0.0.0-20231114204301-fcd41cf8837b h1:jmuueiDkZiVpwMFgQzvTuChjDmdzV0xfosh3owjbM88=
 github.com/wormhole-foundation/wormhole/sdk v0.0.0-20231114204301-fcd41cf8837b/go.mod h1:pE/jYet19kY4P3V6mE2+01zvEfxdyBqv6L6HsnSa5uc=
+github.com/wormhole-foundation/wormhole/sdk v0.0.0-20240112223139-a6cc3b1ce571 h1:7wBOv/UEJGCo9KRoU8coahV86D+sntTPz7Inry74prQ=
+github.com/wormhole-foundation/wormhole/sdk v0.0.0-20240112223139-a6cc3b1ce571/go.mod h1:pE/jYet19kY4P3V6mE2+01zvEfxdyBqv6L6HsnSa5uc=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk=