Add quic-v1 support in testnet (#927)
Co-authored-by: walker-16 <agpazos85@gmail.com>
This commit is contained in:
parent
c23909348a
commit
076338f63c
|
@ -1,5 +1,4 @@
|
|||
# syntax=docker.io/docker/dockerfile:1.3@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2
|
||||
FROM --platform=linux/amd64 docker.io/golang:1.19.2@sha256:0467d7d12d170ed8d998a2dae4a09aa13d0aa56e6d23c4ec2b1e4faacf86a813 AS build
|
||||
FROM --platform=linux/amd64 docker.io/golang:1.20.7-bullseye@sha256:74b09b3b6fa5aa542df8ef974cb745eb477be72f6fcf821517fb410aff532b00 AS build
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ const (
|
|||
|
||||
// testnet p2p config.
|
||||
TestNetP2ppNetworkID = "/wormhole/testnet/2/1"
|
||||
TestNetP2pBootstrap = "/dns4/wormhole-testnet-v2-bootstrap.certus.one/udp/8999/quic/p2p/12D3KooWAkB9ynDur1Jtoa97LBUp8RXdhzS5uHgAfdTquJbrbN7i,/dns4/t-guardian-01.nodes.stable.io/udp/8999/quic/p2p/12D3KooWCW3LGUtkCVkHZmVSZHzL3C4WRKWfqAiJPz1NR7dT9Bxh,/dns4/t-guardian-02.nodes.stable.io/udp/8999/quic/p2p/12D3KooWJXA6goBCiWM8ucjzc4jVUBSqL9Rri6UpjHbkMPErz5zK"
|
||||
TestNetP2pBootstrap = "/dns4/wormhole-testnet-v2-bootstrap.certus.one/udp/8999/quic-v1/p2p/12D3KooWAkB9ynDur1Jtoa97LBUp8RXdhzS5uHgAfdTquJbrbN7i,/dns4/t-guardian-01.nodes.stable.io/udp/8999/quic-v1/p2p/12D3KooWCW3LGUtkCVkHZmVSZHzL3C4WRKWfqAiJPz1NR7dT9Bxh,/dns4/t-guardian-02.nodes.stable.io/udp/8999/quic-v1/p2p/12D3KooWJXA6goBCiWM8ucjzc4jVUBSqL9Rri6UpjHbkMPErz5zK"
|
||||
TestNetP2pPort uint = 8999
|
||||
|
||||
// devnet p2p config.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
module github.com/wormhole-foundation/wormhole-explorer/fly
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/ansrivas/fiberprometheus/v2 v2.6.0
|
||||
|
@ -8,14 +8,13 @@ require (
|
|||
github.com/aws/aws-sdk-go-v2/config v1.1.1
|
||||
github.com/aws/aws-sdk-go-v2/credentials v1.1.1
|
||||
github.com/aws/aws-sdk-go-v2/service/sqs v1.20.2
|
||||
github.com/certusone/wormhole/node v0.0.0-20230822170224-a9a0912f96cf
|
||||
github.com/certusone/wormhole/node v0.0.0-20231106145634-0c6dc189757d
|
||||
github.com/dgraph-io/ristretto v0.1.1
|
||||
github.com/eko/gocache/v3 v3.1.2
|
||||
github.com/ethereum/go-ethereum v1.10.21
|
||||
github.com/go-redis/redis/v8 v8.11.5
|
||||
github.com/gofiber/fiber/v2 v2.47.0
|
||||
github.com/joho/godotenv v1.4.0
|
||||
github.com/libp2p/go-libp2p-core v0.20.1
|
||||
github.com/patrickmn/go-cache v2.1.0+incompatible
|
||||
github.com/sethvargo/go-envconfig v0.9.0
|
||||
github.com/stretchr/testify v1.8.4
|
||||
|
@ -167,7 +166,7 @@ require (
|
|||
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
|
||||
github.com/libp2p/go-cidranger v1.1.0 // indirect
|
||||
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
|
||||
github.com/libp2p/go-libp2p v0.29.2 // indirect
|
||||
github.com/libp2p/go-libp2p v0.29.2
|
||||
github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
|
||||
github.com/libp2p/go-libp2p-kad-dht v0.23.0 // indirect
|
||||
github.com/libp2p/go-libp2p-kbucket v0.5.0 // indirect
|
||||
|
|
|
@ -142,8 +142,8 @@ github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInq
|
|||
github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
|
||||
github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
github.com/certusone/wormhole/node v0.0.0-20230822170224-a9a0912f96cf h1:YtbGlv19JuZctztesiRfOj+t3QDrhPsUi9tLrTBHqxc=
|
||||
github.com/certusone/wormhole/node v0.0.0-20230822170224-a9a0912f96cf/go.mod h1:TxmvMNGn+O9IvaAjQx5DpeUdxUOUWRCbP8kua9xBSrw=
|
||||
github.com/certusone/wormhole/node v0.0.0-20231106145634-0c6dc189757d h1:lhYsE4Q5oUEUqUpQ0sh/vuZy/2BxqSVuUaMhGkFoyXE=
|
||||
github.com/certusone/wormhole/node v0.0.0-20231106145634-0c6dc189757d/go.mod h1:Wnv48pOXu4Ia/s/yXIYmbl0eHibHu24JpfyvcrsIYog=
|
||||
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
|
||||
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
|
@ -558,8 +558,6 @@ github.com/libp2p/go-libp2p v0.29.2 h1:uPw/c8hOxoLP/KhFnzlc5Ejqf+OmAL1dwIsqE31WB
|
|||
github.com/libp2p/go-libp2p v0.29.2/go.mod h1:OU7nSq0aEZMsV2wY8nXn1+XNNt9q2UiR8LjW3Kmp2UE=
|
||||
github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s=
|
||||
github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
|
||||
github.com/libp2p/go-libp2p-core v0.20.1 h1:fQz4BJyIFmSZAiTbKV8qoYhEH5Dtv/cVhZbG3Ib/+Cw=
|
||||
github.com/libp2p/go-libp2p-core v0.20.1/go.mod h1:6zR8H7CvQWgYLsbG4on6oLNSGcyKaYFSEYyDt51+bIY=
|
||||
github.com/libp2p/go-libp2p-kad-dht v0.23.0 h1:sxE6LxLopp79eLeV695n7+c77V/Vn4AMF28AdM/XFqM=
|
||||
github.com/libp2p/go-libp2p-kad-dht v0.23.0/go.mod h1:oO5N308VT2msnQI6qi5M61wzPmJYg7Tr9e16m5n7uDU=
|
||||
github.com/libp2p/go-libp2p-kbucket v0.5.0 h1:g/7tVm8ACHDxH29BGrpsQlnNeu+6OF1A9bno/4/U1oA=
|
||||
|
|
41
fly/main.go
41
fly/main.go
|
@ -41,7 +41,8 @@ import (
|
|||
"github.com/dgraph-io/ristretto"
|
||||
"github.com/eko/gocache/v3/cache"
|
||||
"github.com/eko/gocache/v3/store"
|
||||
"github.com/libp2p/go-libp2p-core/crypto"
|
||||
crypto2 "github.com/ethereum/go-ethereum/crypto"
|
||||
"github.com/libp2p/go-libp2p/core/crypto"
|
||||
"github.com/wormhole-foundation/wormhole/sdk/vaa"
|
||||
"go.uber.org/zap"
|
||||
|
||||
|
@ -508,13 +509,49 @@ func main() {
|
|||
if err != nil {
|
||||
logger.Fatal("Failed to load node key", zap.Error(err))
|
||||
}
|
||||
keyBytes, err := priv.Raw()
|
||||
if err != nil {
|
||||
logger.Fatal("failed to deserialize raw private key", zap.Error(err))
|
||||
}
|
||||
|
||||
gk, err := crypto2.ToECDSA(keyBytes[:32])
|
||||
if err != nil {
|
||||
logger.Fatal("failed to deserialize raw key data", zap.Error(err))
|
||||
}
|
||||
|
||||
// Run supervisor.
|
||||
supervisor.New(rootCtx, logger, func(ctx context.Context) error {
|
||||
components := p2p.DefaultComponents()
|
||||
components.Port = cfg.P2pPort
|
||||
if err := supervisor.Run(ctx, "p2p",
|
||||
p2p.Run(obsvC, obsvReqC, nil, sendC, signedInC, priv, nil, gst, p2pNetworkConfig.P2pNetworkID, p2pNetworkConfig.P2pBootstrap, "", false, rootCtxCancel, nil, nil, govConfigC, govStatusC, components, nil, false)); err != nil {
|
||||
p2p.Run(
|
||||
obsvC,
|
||||
obsvReqC,
|
||||
nil,
|
||||
sendC,
|
||||
signedInC,
|
||||
priv,
|
||||
gk,
|
||||
gst,
|
||||
p2pNetworkConfig.P2pNetworkID,
|
||||
p2pNetworkConfig.P2pBootstrap,
|
||||
"",
|
||||
false,
|
||||
rootCtxCancel,
|
||||
nil,
|
||||
nil,
|
||||
govConfigC,
|
||||
govStatusC,
|
||||
components,
|
||||
nil, // ibc feature string
|
||||
false, // gateway relayer enabled
|
||||
false, // ccqEnabled
|
||||
nil, // query requests
|
||||
nil, // query responses
|
||||
"", // query bootstrap peers
|
||||
0, // query port
|
||||
"", // query allow list
|
||||
)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue