From e98463cfe333f20e2fa58be8ac7c0a02a1c26717 Mon Sep 17 00:00:00 2001 From: Leo Date: Thu, 26 Aug 2021 10:35:09 +0200 Subject: [PATCH] node: rename bridge/ to node/ Calling guardiand a bridge dates back to v1 and no longer makes sense. Change-Id: I27d24a5d7a64c3e37d6a5ce9c402c6248ad9c59e --- Makefile | 8 +++--- Tiltfile | 7 +++-- bridge/main.go | 7 ----- buf.gen.yaml | 6 ++--- clients/eth/go.mod | 4 +-- clients/eth/main.go | 4 +-- docs/operations.md | 4 +-- generate-abi.sh | 4 +-- generate-protos.sh | 4 +-- {bridge => node}/Dockerfile | 2 +- {bridge => node}/cmd/debug/debug.go | 0 {bridge => node}/cmd/debug/vaa.go | 2 +- {bridge => node}/cmd/guardiand/adminclient.go | 4 +-- {bridge => node}/cmd/guardiand/adminnodes.go | 4 +-- {bridge => node}/cmd/guardiand/adminserver.go | 14 +++++----- .../cmd/guardiand/admintemplate.go | 4 +-- {bridge => node}/cmd/guardiand/adminverify.go | 4 +-- {bridge => node}/cmd/guardiand/bridge.go | 26 +++++++++---------- {bridge => node}/cmd/guardiand/bridgekey.go | 4 +-- {bridge => node}/cmd/guardiand/nodekey.go | 0 {bridge => node}/cmd/guardiand/publicrpc.go | 10 +++---- {bridge => node}/cmd/guardiand/publicweb.go | 4 +-- {bridge => node}/cmd/guardiand/systemd.go | 0 {bridge => node}/cmd/root.go | 6 ++--- {bridge => node}/go.mod | 2 +- {bridge => node}/go.sum | 0 node/main.go | 7 +++++ {bridge => node}/pkg/.gitignore | 0 {bridge => node}/pkg/common/bridgewatcher.go | 0 {bridge => node}/pkg/common/chainlock.go | 2 +- {bridge => node}/pkg/common/guardianset.go | 2 +- {bridge => node}/pkg/common/readiness.go | 2 +- {bridge => node}/pkg/db/db.go | 2 +- {bridge => node}/pkg/devnet/constants.go | 2 +- .../pkg/devnet/deterministic_bridge_key.go | 0 .../pkg/devnet/deterministic_p2p_key.go | 0 .../pkg/devnet/guardianset_vaa.go | 6 ++--- {bridge => node}/pkg/devnet/hostname.go | 0 {bridge => node}/pkg/ethereum/abi/abi.go | 0 {bridge => node}/pkg/ethereum/erc20/abi.go | 0 {bridge => node}/pkg/ethereum/utils.go | 2 +- {bridge => node}/pkg/ethereum/watcher.go | 14 +++++----- {bridge => node}/pkg/p2p/netmetrics.go | 4 +-- {bridge => node}/pkg/p2p/p2p.go | 10 +++---- {bridge => node}/pkg/p2p/registry.go | 4 +-- {bridge => node}/pkg/processor/broadcast.go | 4 +-- {bridge => node}/pkg/processor/cleanup.go | 2 +- {bridge => node}/pkg/processor/injection.go | 4 +-- {bridge => node}/pkg/processor/message.go | 8 +++--- {bridge => node}/pkg/processor/observation.go | 8 +++--- {bridge => node}/pkg/processor/processor.go | 12 ++++----- {bridge => node}/pkg/processor/quorum.go | 0 {bridge => node}/pkg/processor/quorum_test.go | 0 .../pkg/publicrpc/publicrpcserver.go | 8 +++--- {bridge => node}/pkg/readiness/health.go | 0 .../pkg/reporter/attestation_events.go | 2 +- .../pkg/reporter/bigtablewriter.go | 4 +-- {bridge => node}/pkg/solana/client.go | 12 ++++----- {bridge => node}/pkg/solana/client_test.go | 0 {bridge => node}/pkg/supervisor/supervisor.go | 0 .../pkg/supervisor/supervisor_node.go | 0 .../pkg/supervisor/supervisor_processor.go | 0 .../pkg/supervisor/supervisor_support.go | 0 .../pkg/supervisor/supervisor_test.go | 0 .../pkg/supervisor/supervisor_testhelpers.go | 0 {bridge => node}/pkg/terra/sender.go | 2 +- {bridge => node}/pkg/terra/watcher.go | 12 ++++----- {bridge => node}/pkg/vaa/payloads.go | 0 {bridge => node}/pkg/vaa/structs.go | 0 {bridge => node}/pkg/vaa/types_test.go | 0 {bridge => node}/pkg/version/version.go | 0 {bridge => node}/tools/go.mod | 2 +- {bridge => node}/tools/go.sum | 0 {bridge => node}/tools/tools.go | 1 + proto/gossip/v1/gossip.proto | 2 +- proto/node/v1/node.proto | 2 +- proto/publicrpc/v1/publicrpc.proto | 2 +- tools/go.mod | 2 +- 78 files changed, 140 insertions(+), 140 deletions(-) delete mode 100644 bridge/main.go rename {bridge => node}/Dockerfile (93%) rename {bridge => node}/cmd/debug/debug.go (100%) rename {bridge => node}/cmd/debug/vaa.go (91%) rename {bridge => node}/cmd/guardiand/adminclient.go (95%) rename {bridge => node}/cmd/guardiand/adminnodes.go (96%) rename {bridge => node}/cmd/guardiand/adminserver.go (93%) rename {bridge => node}/cmd/guardiand/admintemplate.go (96%) rename {bridge => node}/cmd/guardiand/adminverify.go (91%) rename {bridge => node}/cmd/guardiand/bridge.go (96%) rename {bridge => node}/cmd/guardiand/bridgekey.go (96%) rename {bridge => node}/cmd/guardiand/nodekey.go (100%) rename {bridge => node}/cmd/guardiand/publicrpc.go (71%) rename {bridge => node}/cmd/guardiand/publicweb.go (97%) rename {bridge => node}/cmd/guardiand/systemd.go (100%) rename {bridge => node}/cmd/root.go (92%) rename {bridge => node}/go.mod (98%) rename {bridge => node}/go.sum (100%) create mode 100644 node/main.go rename {bridge => node}/pkg/.gitignore (100%) rename {bridge => node}/pkg/common/bridgewatcher.go (100%) rename {bridge => node}/pkg/common/chainlock.go (89%) rename {bridge => node}/pkg/common/guardianset.go (98%) rename {bridge => node}/pkg/common/readiness.go (81%) rename {bridge => node}/pkg/db/db.go (97%) rename {bridge => node}/pkg/devnet/constants.go (98%) rename {bridge => node}/pkg/devnet/deterministic_bridge_key.go (100%) rename {bridge => node}/pkg/devnet/deterministic_p2p_key.go (100%) rename {bridge => node}/pkg/devnet/guardianset_vaa.go (93%) rename {bridge => node}/pkg/devnet/hostname.go (100%) rename {bridge => node}/pkg/ethereum/abi/abi.go (100%) rename {bridge => node}/pkg/ethereum/erc20/abi.go (100%) rename {bridge => node}/pkg/ethereum/utils.go (88%) rename {bridge => node}/pkg/ethereum/watcher.go (96%) rename {bridge => node}/pkg/p2p/netmetrics.go (91%) rename {bridge => node}/pkg/p2p/p2p.go (97%) rename {bridge => node}/pkg/p2p/registry.go (93%) rename {bridge => node}/pkg/processor/broadcast.go (93%) rename {bridge => node}/pkg/processor/cleanup.go (98%) rename {bridge => node}/pkg/processor/injection.go (92%) rename {bridge => node}/pkg/processor/message.go (92%) rename {bridge => node}/pkg/processor/observation.go (97%) rename {bridge => node}/pkg/processor/processor.go (93%) rename {bridge => node}/pkg/processor/quorum.go (100%) rename {bridge => node}/pkg/processor/quorum_test.go (100%) rename {bridge => node}/pkg/publicrpc/publicrpcserver.go (93%) rename {bridge => node}/pkg/readiness/health.go (100%) rename {bridge => node}/pkg/reporter/attestation_events.go (98%) rename {bridge => node}/pkg/reporter/bigtablewriter.go (98%) rename {bridge => node}/pkg/solana/client.go (97%) rename {bridge => node}/pkg/solana/client_test.go (100%) rename {bridge => node}/pkg/supervisor/supervisor.go (100%) rename {bridge => node}/pkg/supervisor/supervisor_node.go (100%) rename {bridge => node}/pkg/supervisor/supervisor_processor.go (100%) rename {bridge => node}/pkg/supervisor/supervisor_support.go (100%) rename {bridge => node}/pkg/supervisor/supervisor_test.go (100%) rename {bridge => node}/pkg/supervisor/supervisor_testhelpers.go (100%) rename {bridge => node}/pkg/terra/sender.go (97%) rename {bridge => node}/pkg/terra/watcher.go (96%) rename {bridge => node}/pkg/vaa/payloads.go (100%) rename {bridge => node}/pkg/vaa/structs.go (100%) rename {bridge => node}/pkg/vaa/types_test.go (100%) rename {bridge => node}/pkg/version/version.go (100%) rename {bridge => node}/tools/go.mod (50%) rename {bridge => node}/tools/go.sum (100%) rename {bridge => node}/tools/tools.go (82%) diff --git a/Makefile b/Makefile index 6298dc020..8c2795047 100755 --- a/Makefile +++ b/Makefile @@ -24,11 +24,11 @@ install: generate: dirs ./generate-protos.sh -.PHONY: bridge -bridge: $(BIN)/guardiand +.PHONY: node +node: $(BIN)/guardiand .PHONY: $(BIN)/guardiand $(BIN)/guardiand: dirs generate - cd bridge && go build -ldflags "-X github.com/certusone/wormhole/bridge/pkg/version.version=${VERSION}" \ + cd node && go build -ldflags "-X github.com/certusone/wormhole/node/pkg/version.version=${VERSION}" \ -mod=readonly -o ../$(BIN)/guardiand \ - github.com/certusone/wormhole/bridge + github.com/certusone/wormhole/node diff --git a/Tiltfile b/Tiltfile index 60fafd92f..7ad2f33cd 100644 --- a/Tiltfile +++ b/Tiltfile @@ -24,7 +24,6 @@ config.define_string("num", False, "Number of guardian nodes to run") # config.define_string("namespace", False, "Kubernetes namespace to use") - # These arguments will enable writing Guardian events to a cloud BigTable instance. # Writing to a cloud BigTable is optional. These arguments are not required to run the devnet. config.define_string("gcpProject", False, "GCP project ID for BigTable persistence") @@ -73,8 +72,8 @@ k8s_yaml_with_ns( docker_build( ref = "guardiand-image", - context = "bridge", - dockerfile = "bridge/Dockerfile", + context = "node", + dockerfile = "node/Dockerfile", ) def build_bridge_yaml(): @@ -214,7 +213,7 @@ build_cloud_function( k8s_yaml_with_ns("devnet/bigtable.yaml") k8s_resource("bigtable-emulator", port_forwards = [ - port_forward(8086, name = "BigTable clients [:8086]") + port_forward(8086, name = "BigTable clients [:8086]"), ]) k8s_resource( "bigtable-readrow", diff --git a/bridge/main.go b/bridge/main.go deleted file mode 100644 index ef11142aa..000000000 --- a/bridge/main.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "github.com/certusone/wormhole/bridge/cmd" - -func main() { - cmd.Execute() -} diff --git a/buf.gen.yaml b/buf.gen.yaml index 7122aca03..9d64ea33f 100644 --- a/buf.gen.yaml +++ b/buf.gen.yaml @@ -1,17 +1,17 @@ version: v1beta1 plugins: - name: go - out: bridge/pkg/proto + out: node/pkg/proto path: tools/bin/protoc-gen-go opt: - paths=source_relative - name: go-grpc - out: bridge/pkg/proto + out: node/pkg/proto path: tools/bin/protoc-gen-go-grpc opt: - paths=source_relative - name: grpc-gateway - out: bridge/pkg/proto + out: node/pkg/proto path: tools/bin/protoc-gen-grpc-gateway opt: - paths=source_relative diff --git a/clients/eth/go.mod b/clients/eth/go.mod index 12b5ea8b6..a2be96b94 100644 --- a/clients/eth/go.mod +++ b/clients/eth/go.mod @@ -3,9 +3,9 @@ module github.com/certusone/wormhole/clients/eth go 1.16 require ( - github.com/certusone/wormhole/bridge v0.0.0-20210722131135-a191017d22d0 + github.com/certusone/wormhole/node v0.0.0-20210722131135-a191017d22d0 github.com/ethereum/go-ethereum v1.10.6 github.com/spf13/cobra v1.1.1 ) -replace github.com/certusone/wormhole/bridge => ../../bridge +replace github.com/certusone/wormhole/node => ../../bridge diff --git a/clients/eth/main.go b/clients/eth/main.go index 3fc1ec840..f6950dfd9 100644 --- a/clients/eth/main.go +++ b/clients/eth/main.go @@ -3,8 +3,8 @@ package main import ( "context" "fmt" - "github.com/certusone/wormhole/bridge/pkg/ethereum/abi" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/ethereum/abi" + "github.com/certusone/wormhole/node/pkg/vaa" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" diff --git a/docs/operations.md b/docs/operations.md index 0c50652d5..ac73e2157 100644 --- a/docs/operations.md +++ b/docs/operations.md @@ -108,7 +108,7 @@ git checkout v2.0.x Then, compile the release binary as an unprivileged build user: ```bash -make bridge +make node ``` You'll end up with a `guardiand` binary in `build/`. @@ -128,7 +128,7 @@ to disk. Please create a GitHub issue if this extra capability represents an ope To generate a guardian key, install guardiand first. If you generate the key on a separate machine, you may want to compile guardiand only without installing it: - make bridge + make node sudo setcap cap_ipc_lock=+ep ./build/bin/guardiand Otherwise, use the same guardiand binary that you compiled using the regular instructions above. diff --git a/generate-abi.sh b/generate-abi.sh index 1a0bf5931..6f971da77 100755 --- a/generate-abi.sh +++ b/generate-abi.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Regenerate bridge/pkg/ethereum/abi using a running eth-devnet's state. +# Regenerate node/pkg/ethereum/abi using a running eth-devnet's state. set -euo pipefail ( @@ -15,7 +15,7 @@ function gen() { kubectl exec -c tests eth-devnet-0 -- cat abigenBindings/abi/${name}.abi | \ docker run --rm -i localhost/certusone/wormhole-abigen:latest /bin/abigen --abi - --pkg ${pkg} > \ - bridge/pkg/ethereum/${pkg}/abi.go + node/pkg/ethereum/${pkg}/abi.go } gen Wormhole abi diff --git a/generate-protos.sh b/generate-protos.sh index c44e0087f..54cc30485 100755 --- a/generate-protos.sh +++ b/generate-protos.sh @@ -7,9 +7,9 @@ set -euo pipefail ) # TODO(leo): remove after a while -rm -rf third_party/googleapis +rm -rf bridge -rm -rf bridge/pkg/proto +rm -rf node/pkg/proto tools/bin/buf lint tools/bin/buf generate diff --git a/bridge/Dockerfile b/node/Dockerfile similarity index 93% rename from bridge/Dockerfile rename to node/Dockerfile index ce5110b61..c8d3428d5 100644 --- a/bridge/Dockerfile +++ b/node/Dockerfile @@ -11,6 +11,6 @@ RUN --mount=type=cache,target=/root/.cache --mount=type=cache,target=/go \ ADD . . RUN --mount=type=cache,target=/root/.cache --mount=type=cache,target=/go \ - go build -race -gcflags="all=-N -l" -mod=readonly -o /guardiand github.com/certusone/wormhole/bridge + go build -race -gcflags="all=-N -l" -mod=readonly -o /guardiand github.com/certusone/wormhole/node ENTRYPOINT /guardiand diff --git a/bridge/cmd/debug/debug.go b/node/cmd/debug/debug.go similarity index 100% rename from bridge/cmd/debug/debug.go rename to node/cmd/debug/debug.go diff --git a/bridge/cmd/debug/vaa.go b/node/cmd/debug/vaa.go similarity index 91% rename from bridge/cmd/debug/vaa.go rename to node/cmd/debug/vaa.go index b96ebff0f..e1e9ffd20 100644 --- a/bridge/cmd/debug/vaa.go +++ b/node/cmd/debug/vaa.go @@ -2,7 +2,7 @@ package debug import ( "encoding/hex" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/vaa" "github.com/davecgh/go-spew/spew" "github.com/spf13/cobra" "log" diff --git a/bridge/cmd/guardiand/adminclient.go b/node/cmd/guardiand/adminclient.go similarity index 95% rename from bridge/cmd/guardiand/adminclient.go rename to node/cmd/guardiand/adminclient.go index 7dc69f968..0734a7857 100644 --- a/bridge/cmd/guardiand/adminclient.go +++ b/node/cmd/guardiand/adminclient.go @@ -3,7 +3,7 @@ package guardiand import ( "context" "fmt" - publicrpcv1 "github.com/certusone/wormhole/bridge/pkg/proto/publicrpc/v1" + publicrpcv1 "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1" "github.com/spf13/pflag" "io/ioutil" "log" @@ -14,7 +14,7 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/encoding/prototext" - nodev1 "github.com/certusone/wormhole/bridge/pkg/proto/node/v1" + nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1" ) var ( diff --git a/bridge/cmd/guardiand/adminnodes.go b/node/cmd/guardiand/adminnodes.go similarity index 96% rename from bridge/cmd/guardiand/adminnodes.go rename to node/cmd/guardiand/adminnodes.go index c63c140c7..75e7d1c0b 100644 --- a/bridge/cmd/guardiand/adminnodes.go +++ b/node/cmd/guardiand/adminnodes.go @@ -3,8 +3,8 @@ package guardiand import ( "context" "fmt" - publicrpcv1 "github.com/certusone/wormhole/bridge/pkg/proto/publicrpc/v1" - "github.com/certusone/wormhole/bridge/pkg/vaa" + publicrpcv1 "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1" + "github.com/certusone/wormhole/node/pkg/vaa" "github.com/spf13/cobra" "log" "os" diff --git a/bridge/cmd/guardiand/adminserver.go b/node/cmd/guardiand/adminserver.go similarity index 93% rename from bridge/cmd/guardiand/adminserver.go rename to node/cmd/guardiand/adminserver.go index 56fb1dd69..0998c065d 100644 --- a/bridge/cmd/guardiand/adminserver.go +++ b/node/cmd/guardiand/adminserver.go @@ -4,9 +4,9 @@ import ( "context" "errors" "fmt" - "github.com/certusone/wormhole/bridge/pkg/db" - publicrpcv1 "github.com/certusone/wormhole/bridge/pkg/proto/publicrpc/v1" - "github.com/certusone/wormhole/bridge/pkg/publicrpc" + "github.com/certusone/wormhole/node/pkg/db" + publicrpcv1 "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1" + "github.com/certusone/wormhole/node/pkg/publicrpc" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap" grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" @@ -22,10 +22,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/certusone/wormhole/bridge/pkg/common" - nodev1 "github.com/certusone/wormhole/bridge/pkg/proto/node/v1" - "github.com/certusone/wormhole/bridge/pkg/supervisor" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/common" + nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1" + "github.com/certusone/wormhole/node/pkg/supervisor" + "github.com/certusone/wormhole/node/pkg/vaa" ) type nodePrivilegedService struct { diff --git a/bridge/cmd/guardiand/admintemplate.go b/node/cmd/guardiand/admintemplate.go similarity index 96% rename from bridge/cmd/guardiand/admintemplate.go rename to node/cmd/guardiand/admintemplate.go index d7918f833..479dad04a 100644 --- a/bridge/cmd/guardiand/admintemplate.go +++ b/node/cmd/guardiand/admintemplate.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "google.golang.org/protobuf/encoding/prototext" - "github.com/certusone/wormhole/bridge/pkg/devnet" - nodev1 "github.com/certusone/wormhole/bridge/pkg/proto/node/v1" + "github.com/certusone/wormhole/node/pkg/devnet" + nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1" ) var setUpdateNumGuardians *int diff --git a/bridge/cmd/guardiand/adminverify.go b/node/cmd/guardiand/adminverify.go similarity index 91% rename from bridge/cmd/guardiand/adminverify.go rename to node/cmd/guardiand/adminverify.go index 9e2716549..1a727c510 100644 --- a/bridge/cmd/guardiand/adminverify.go +++ b/node/cmd/guardiand/adminverify.go @@ -1,7 +1,7 @@ package guardiand import ( - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/vaa" "io/ioutil" "log" @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "google.golang.org/protobuf/encoding/prototext" - nodev1 "github.com/certusone/wormhole/bridge/pkg/proto/node/v1" + nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1" ) var AdminClientGovernanceVAAVerifyCmd = &cobra.Command{ diff --git a/bridge/cmd/guardiand/bridge.go b/node/cmd/guardiand/bridge.go similarity index 96% rename from bridge/cmd/guardiand/bridge.go rename to node/cmd/guardiand/bridge.go index 26c3a5a10..bb10984ca 100644 --- a/bridge/cmd/guardiand/bridge.go +++ b/node/cmd/guardiand/bridge.go @@ -10,7 +10,7 @@ import ( "path" "syscall" - "github.com/certusone/wormhole/bridge/pkg/db" + "github.com/certusone/wormhole/node/pkg/db" "github.com/gagliardetto/solana-go/rpc" solana_types "github.com/gagliardetto/solana-go" @@ -25,19 +25,19 @@ import ( "go.uber.org/zap" "golang.org/x/sys/unix" - "github.com/certusone/wormhole/bridge/pkg/common" - "github.com/certusone/wormhole/bridge/pkg/devnet" - "github.com/certusone/wormhole/bridge/pkg/ethereum" - "github.com/certusone/wormhole/bridge/pkg/p2p" - "github.com/certusone/wormhole/bridge/pkg/processor" - gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1" - "github.com/certusone/wormhole/bridge/pkg/readiness" - "github.com/certusone/wormhole/bridge/pkg/reporter" - solana "github.com/certusone/wormhole/bridge/pkg/solana" - "github.com/certusone/wormhole/bridge/pkg/supervisor" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/common" + "github.com/certusone/wormhole/node/pkg/devnet" + "github.com/certusone/wormhole/node/pkg/ethereum" + "github.com/certusone/wormhole/node/pkg/p2p" + "github.com/certusone/wormhole/node/pkg/processor" + gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" + "github.com/certusone/wormhole/node/pkg/readiness" + "github.com/certusone/wormhole/node/pkg/reporter" + solana "github.com/certusone/wormhole/node/pkg/solana" + "github.com/certusone/wormhole/node/pkg/supervisor" + "github.com/certusone/wormhole/node/pkg/vaa" - "github.com/certusone/wormhole/bridge/pkg/terra" + "github.com/certusone/wormhole/node/pkg/terra" ipfslog "github.com/ipfs/go-log/v2" ) diff --git a/bridge/cmd/guardiand/bridgekey.go b/node/cmd/guardiand/bridgekey.go similarity index 96% rename from bridge/cmd/guardiand/bridgekey.go rename to node/cmd/guardiand/bridgekey.go index 3db322459..500991d4a 100644 --- a/bridge/cmd/guardiand/bridgekey.go +++ b/node/cmd/guardiand/bridgekey.go @@ -14,8 +14,8 @@ import ( "golang.org/x/crypto/openpgp/armor" "google.golang.org/protobuf/proto" - "github.com/certusone/wormhole/bridge/pkg/devnet" - nodev1 "github.com/certusone/wormhole/bridge/pkg/proto/node/v1" + "github.com/certusone/wormhole/node/pkg/devnet" + nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1" ) var keyDescription *string diff --git a/bridge/cmd/guardiand/nodekey.go b/node/cmd/guardiand/nodekey.go similarity index 100% rename from bridge/cmd/guardiand/nodekey.go rename to node/cmd/guardiand/nodekey.go diff --git a/bridge/cmd/guardiand/publicrpc.go b/node/cmd/guardiand/publicrpc.go similarity index 71% rename from bridge/cmd/guardiand/publicrpc.go rename to node/cmd/guardiand/publicrpc.go index 5e12a87e1..f6f11776d 100644 --- a/bridge/cmd/guardiand/publicrpc.go +++ b/node/cmd/guardiand/publicrpc.go @@ -2,11 +2,11 @@ package guardiand import ( "fmt" - "github.com/certusone/wormhole/bridge/pkg/common" - "github.com/certusone/wormhole/bridge/pkg/db" - publicrpcv1 "github.com/certusone/wormhole/bridge/pkg/proto/publicrpc/v1" - "github.com/certusone/wormhole/bridge/pkg/publicrpc" - "github.com/certusone/wormhole/bridge/pkg/supervisor" + "github.com/certusone/wormhole/node/pkg/common" + "github.com/certusone/wormhole/node/pkg/db" + publicrpcv1 "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1" + "github.com/certusone/wormhole/node/pkg/publicrpc" + "github.com/certusone/wormhole/node/pkg/supervisor" "go.uber.org/zap" "google.golang.org/grpc" "net" diff --git a/bridge/cmd/guardiand/publicweb.go b/node/cmd/guardiand/publicweb.go similarity index 97% rename from bridge/cmd/guardiand/publicweb.go rename to node/cmd/guardiand/publicweb.go index 2c24a2726..53db80f40 100644 --- a/bridge/cmd/guardiand/publicweb.go +++ b/node/cmd/guardiand/publicweb.go @@ -3,8 +3,8 @@ package guardiand import ( "context" "fmt" - "github.com/certusone/wormhole/bridge/pkg/proto/publicrpc/v1" - "github.com/certusone/wormhole/bridge/pkg/supervisor" + "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1" + "github.com/certusone/wormhole/node/pkg/supervisor" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/improbable-eng/grpc-web/go/grpcweb" "go.uber.org/zap" diff --git a/bridge/cmd/guardiand/systemd.go b/node/cmd/guardiand/systemd.go similarity index 100% rename from bridge/cmd/guardiand/systemd.go rename to node/cmd/guardiand/systemd.go diff --git a/bridge/cmd/root.go b/node/cmd/root.go similarity index 92% rename from bridge/cmd/root.go rename to node/cmd/root.go index 39a4b67cf..e4c6369cd 100644 --- a/bridge/cmd/root.go +++ b/node/cmd/root.go @@ -2,8 +2,8 @@ package cmd import ( "fmt" - "github.com/certusone/wormhole/bridge/cmd/debug" - "github.com/certusone/wormhole/bridge/pkg/version" + "github.com/certusone/wormhole/node/cmd/debug" + "github.com/certusone/wormhole/node/pkg/version" "os" "github.com/spf13/cobra" @@ -11,7 +11,7 @@ import ( homedir "github.com/mitchellh/go-homedir" "github.com/spf13/viper" - "github.com/certusone/wormhole/bridge/cmd/guardiand" + "github.com/certusone/wormhole/node/cmd/guardiand" ) var cfgFile string diff --git a/bridge/go.mod b/node/go.mod similarity index 98% rename from bridge/go.mod rename to node/go.mod index 7c99d1cf4..aaef6decc 100644 --- a/bridge/go.mod +++ b/node/go.mod @@ -1,4 +1,4 @@ -module github.com/certusone/wormhole/bridge +module github.com/certusone/wormhole/node go 1.16 diff --git a/bridge/go.sum b/node/go.sum similarity index 100% rename from bridge/go.sum rename to node/go.sum diff --git a/node/main.go b/node/main.go new file mode 100644 index 000000000..08198aae7 --- /dev/null +++ b/node/main.go @@ -0,0 +1,7 @@ +package main + +import "github.com/certusone/wormhole/node/cmd" + +func main() { + cmd.Execute() +} diff --git a/bridge/pkg/.gitignore b/node/pkg/.gitignore similarity index 100% rename from bridge/pkg/.gitignore rename to node/pkg/.gitignore diff --git a/bridge/pkg/common/bridgewatcher.go b/node/pkg/common/bridgewatcher.go similarity index 100% rename from bridge/pkg/common/bridgewatcher.go rename to node/pkg/common/bridgewatcher.go diff --git a/bridge/pkg/common/chainlock.go b/node/pkg/common/chainlock.go similarity index 89% rename from bridge/pkg/common/chainlock.go rename to node/pkg/common/chainlock.go index dd3167067..b7742b026 100644 --- a/bridge/pkg/common/chainlock.go +++ b/node/pkg/common/chainlock.go @@ -1,7 +1,7 @@ package common import ( - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/vaa" "time" "github.com/ethereum/go-ethereum/common" diff --git a/bridge/pkg/common/guardianset.go b/node/pkg/common/guardianset.go similarity index 98% rename from bridge/pkg/common/guardianset.go rename to node/pkg/common/guardianset.go index bcdcb8c19..642880635 100644 --- a/bridge/pkg/common/guardianset.go +++ b/node/pkg/common/guardianset.go @@ -2,7 +2,7 @@ package common import ( "fmt" - gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1" + gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" "github.com/ethereum/go-ethereum/common" "github.com/libp2p/go-libp2p-core/peer" "sync" diff --git a/bridge/pkg/common/readiness.go b/node/pkg/common/readiness.go similarity index 81% rename from bridge/pkg/common/readiness.go rename to node/pkg/common/readiness.go index 77b95ff18..8f3beba04 100644 --- a/bridge/pkg/common/readiness.go +++ b/node/pkg/common/readiness.go @@ -1,6 +1,6 @@ package common -import "github.com/certusone/wormhole/bridge/pkg/readiness" +import "github.com/certusone/wormhole/node/pkg/readiness" const ( ReadinessEthSyncing readiness.Component = "ethSyncing" diff --git a/bridge/pkg/db/db.go b/node/pkg/db/db.go similarity index 97% rename from bridge/pkg/db/db.go rename to node/pkg/db/db.go index 035ca8aa0..5b51d18c9 100644 --- a/bridge/pkg/db/db.go +++ b/node/pkg/db/db.go @@ -3,7 +3,7 @@ package db import ( "errors" "fmt" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/vaa" "github.com/dgraph-io/badger/v3" ) diff --git a/bridge/pkg/devnet/constants.go b/node/pkg/devnet/constants.go similarity index 98% rename from bridge/pkg/devnet/constants.go rename to node/pkg/devnet/constants.go index c1a5f4cd6..debffadb9 100644 --- a/bridge/pkg/devnet/constants.go +++ b/node/pkg/devnet/constants.go @@ -11,7 +11,7 @@ import ( hdwallet "github.com/miguelmota/go-ethereum-hdwallet" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/vaa" ) var ( diff --git a/bridge/pkg/devnet/deterministic_bridge_key.go b/node/pkg/devnet/deterministic_bridge_key.go similarity index 100% rename from bridge/pkg/devnet/deterministic_bridge_key.go rename to node/pkg/devnet/deterministic_bridge_key.go diff --git a/bridge/pkg/devnet/deterministic_p2p_key.go b/node/pkg/devnet/deterministic_p2p_key.go similarity index 100% rename from bridge/pkg/devnet/deterministic_p2p_key.go rename to node/pkg/devnet/deterministic_p2p_key.go diff --git a/bridge/pkg/devnet/guardianset_vaa.go b/node/pkg/devnet/guardianset_vaa.go similarity index 93% rename from bridge/pkg/devnet/guardianset_vaa.go rename to node/pkg/devnet/guardianset_vaa.go index 0160e3a53..6268ed27d 100644 --- a/bridge/pkg/devnet/guardianset_vaa.go +++ b/node/pkg/devnet/guardianset_vaa.go @@ -12,9 +12,9 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "go.uber.org/zap" - "github.com/certusone/wormhole/bridge/pkg/ethereum/abi" - "github.com/certusone/wormhole/bridge/pkg/supervisor" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/ethereum/abi" + "github.com/certusone/wormhole/node/pkg/supervisor" + "github.com/certusone/wormhole/node/pkg/vaa" ) // DevnetGuardianSetVSS returns a VAA signed by guardian-0 that adds all n validators. diff --git a/bridge/pkg/devnet/hostname.go b/node/pkg/devnet/hostname.go similarity index 100% rename from bridge/pkg/devnet/hostname.go rename to node/pkg/devnet/hostname.go diff --git a/bridge/pkg/ethereum/abi/abi.go b/node/pkg/ethereum/abi/abi.go similarity index 100% rename from bridge/pkg/ethereum/abi/abi.go rename to node/pkg/ethereum/abi/abi.go diff --git a/bridge/pkg/ethereum/erc20/abi.go b/node/pkg/ethereum/erc20/abi.go similarity index 100% rename from bridge/pkg/ethereum/erc20/abi.go rename to node/pkg/ethereum/erc20/abi.go diff --git a/bridge/pkg/ethereum/utils.go b/node/pkg/ethereum/utils.go similarity index 88% rename from bridge/pkg/ethereum/utils.go rename to node/pkg/ethereum/utils.go index 8160943ff..7528ef799 100644 --- a/bridge/pkg/ethereum/utils.go +++ b/node/pkg/ethereum/utils.go @@ -1,7 +1,7 @@ package ethereum import ( - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/vaa" "github.com/ethereum/go-ethereum/common" ) diff --git a/bridge/pkg/ethereum/watcher.go b/node/pkg/ethereum/watcher.go similarity index 96% rename from bridge/pkg/ethereum/watcher.go rename to node/pkg/ethereum/watcher.go index aaad7a123..aa8743e02 100644 --- a/bridge/pkg/ethereum/watcher.go +++ b/node/pkg/ethereum/watcher.go @@ -3,8 +3,8 @@ package ethereum import ( "context" "fmt" - "github.com/certusone/wormhole/bridge/pkg/p2p" - gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1" + "github.com/certusone/wormhole/node/pkg/p2p" + gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" "github.com/prometheus/client_golang/prometheus/promauto" "math/big" "sync" @@ -18,11 +18,11 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "go.uber.org/zap" - "github.com/certusone/wormhole/bridge/pkg/common" - "github.com/certusone/wormhole/bridge/pkg/ethereum/abi" - "github.com/certusone/wormhole/bridge/pkg/readiness" - "github.com/certusone/wormhole/bridge/pkg/supervisor" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/common" + "github.com/certusone/wormhole/node/pkg/ethereum/abi" + "github.com/certusone/wormhole/node/pkg/readiness" + "github.com/certusone/wormhole/node/pkg/supervisor" + "github.com/certusone/wormhole/node/pkg/vaa" ) var ( diff --git a/bridge/pkg/p2p/netmetrics.go b/node/pkg/p2p/netmetrics.go similarity index 91% rename from bridge/pkg/p2p/netmetrics.go rename to node/pkg/p2p/netmetrics.go index 3f5a22c6b..7b51f8f05 100644 --- a/bridge/pkg/p2p/netmetrics.go +++ b/node/pkg/p2p/netmetrics.go @@ -1,8 +1,8 @@ package p2p import ( - gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1" - "github.com/certusone/wormhole/bridge/pkg/vaa" + gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" + "github.com/certusone/wormhole/node/pkg/vaa" "github.com/ethereum/go-ethereum/common" "github.com/libp2p/go-libp2p-core/peer" "github.com/prometheus/client_golang/prometheus" diff --git a/bridge/pkg/p2p/p2p.go b/node/pkg/p2p/p2p.go similarity index 97% rename from bridge/pkg/p2p/p2p.go rename to node/pkg/p2p/p2p.go index 868e14727..c022298ba 100644 --- a/bridge/pkg/p2p/p2p.go +++ b/node/pkg/p2p/p2p.go @@ -5,9 +5,9 @@ import ( "crypto/ecdsa" "errors" "fmt" - bridge_common "github.com/certusone/wormhole/bridge/pkg/common" - "github.com/certusone/wormhole/bridge/pkg/vaa" - "github.com/certusone/wormhole/bridge/pkg/version" + bridge_common "github.com/certusone/wormhole/node/pkg/common" + "github.com/certusone/wormhole/node/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/version" "github.com/ethereum/go-ethereum/common" ethcrypto "github.com/ethereum/go-ethereum/crypto" "github.com/prometheus/client_golang/prometheus" @@ -31,8 +31,8 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/proto" - gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1" - "github.com/certusone/wormhole/bridge/pkg/supervisor" + gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" + "github.com/certusone/wormhole/node/pkg/supervisor" ) var ( diff --git a/bridge/pkg/p2p/registry.go b/node/pkg/p2p/registry.go similarity index 93% rename from bridge/pkg/p2p/registry.go rename to node/pkg/p2p/registry.go index b41ccd1cb..3eb4a910d 100644 --- a/bridge/pkg/p2p/registry.go +++ b/node/pkg/p2p/registry.go @@ -1,8 +1,8 @@ package p2p import ( - gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1" - "github.com/certusone/wormhole/bridge/pkg/vaa" + gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" + "github.com/certusone/wormhole/node/pkg/vaa" "sync" ) diff --git a/bridge/pkg/processor/broadcast.go b/node/pkg/processor/broadcast.go similarity index 93% rename from bridge/pkg/processor/broadcast.go rename to node/pkg/processor/broadcast.go index 30e3dad9c..244bccaf6 100644 --- a/bridge/pkg/processor/broadcast.go +++ b/node/pkg/processor/broadcast.go @@ -10,8 +10,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" "google.golang.org/protobuf/proto" - gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1" - "github.com/certusone/wormhole/bridge/pkg/vaa" + gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" + "github.com/certusone/wormhole/node/pkg/vaa" ) var ( diff --git a/bridge/pkg/processor/cleanup.go b/node/pkg/processor/cleanup.go similarity index 98% rename from bridge/pkg/processor/cleanup.go rename to node/pkg/processor/cleanup.go index 1fc4fc5b0..74095f116 100644 --- a/bridge/pkg/processor/cleanup.go +++ b/node/pkg/processor/cleanup.go @@ -2,7 +2,7 @@ package processor import ( "context" - "github.com/certusone/wormhole/bridge/pkg/common" + "github.com/certusone/wormhole/node/pkg/common" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "time" diff --git a/bridge/pkg/processor/injection.go b/node/pkg/processor/injection.go similarity index 92% rename from bridge/pkg/processor/injection.go rename to node/pkg/processor/injection.go index cd0126b17..26d3d593d 100644 --- a/bridge/pkg/processor/injection.go +++ b/node/pkg/processor/injection.go @@ -9,8 +9,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" "go.uber.org/zap" - "github.com/certusone/wormhole/bridge/pkg/supervisor" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/supervisor" + "github.com/certusone/wormhole/node/pkg/vaa" ) var ( diff --git a/bridge/pkg/processor/message.go b/node/pkg/processor/message.go similarity index 92% rename from bridge/pkg/processor/message.go rename to node/pkg/processor/message.go index 7f6174766..4cc7b0521 100644 --- a/bridge/pkg/processor/message.go +++ b/node/pkg/processor/message.go @@ -10,10 +10,10 @@ import ( "github.com/ethereum/go-ethereum/crypto" "go.uber.org/zap" - "github.com/certusone/wormhole/bridge/pkg/common" - "github.com/certusone/wormhole/bridge/pkg/reporter" - "github.com/certusone/wormhole/bridge/pkg/supervisor" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/common" + "github.com/certusone/wormhole/node/pkg/reporter" + "github.com/certusone/wormhole/node/pkg/supervisor" + "github.com/certusone/wormhole/node/pkg/vaa" ) var ( diff --git a/bridge/pkg/processor/observation.go b/node/pkg/processor/observation.go similarity index 97% rename from bridge/pkg/processor/observation.go rename to node/pkg/processor/observation.go index 38e1dfcd9..7e9d2d768 100644 --- a/bridge/pkg/processor/observation.go +++ b/node/pkg/processor/observation.go @@ -4,8 +4,8 @@ import ( "context" "encoding/hex" "fmt" - bridge_common "github.com/certusone/wormhole/bridge/pkg/common" - "github.com/certusone/wormhole/bridge/pkg/reporter" + bridge_common "github.com/certusone/wormhole/node/pkg/common" + "github.com/certusone/wormhole/node/pkg/reporter" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "time" @@ -14,8 +14,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" "go.uber.org/zap" - gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1" - "github.com/certusone/wormhole/bridge/pkg/vaa" + gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" + "github.com/certusone/wormhole/node/pkg/vaa" ) var ( diff --git a/bridge/pkg/processor/processor.go b/node/pkg/processor/processor.go similarity index 93% rename from bridge/pkg/processor/processor.go rename to node/pkg/processor/processor.go index 5626b7bec..d7dcaeeb2 100644 --- a/bridge/pkg/processor/processor.go +++ b/node/pkg/processor/processor.go @@ -5,17 +5,17 @@ import ( "crypto/ecdsa" "time" - "github.com/certusone/wormhole/bridge/pkg/db" + "github.com/certusone/wormhole/node/pkg/db" ethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "go.uber.org/zap" - "github.com/certusone/wormhole/bridge/pkg/common" - gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1" - "github.com/certusone/wormhole/bridge/pkg/reporter" - "github.com/certusone/wormhole/bridge/pkg/supervisor" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/common" + gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" + "github.com/certusone/wormhole/node/pkg/reporter" + "github.com/certusone/wormhole/node/pkg/supervisor" + "github.com/certusone/wormhole/node/pkg/vaa" ) type ( diff --git a/bridge/pkg/processor/quorum.go b/node/pkg/processor/quorum.go similarity index 100% rename from bridge/pkg/processor/quorum.go rename to node/pkg/processor/quorum.go diff --git a/bridge/pkg/processor/quorum_test.go b/node/pkg/processor/quorum_test.go similarity index 100% rename from bridge/pkg/processor/quorum_test.go rename to node/pkg/processor/quorum_test.go diff --git a/bridge/pkg/publicrpc/publicrpcserver.go b/node/pkg/publicrpc/publicrpcserver.go similarity index 93% rename from bridge/pkg/publicrpc/publicrpcserver.go rename to node/pkg/publicrpc/publicrpcserver.go index 6308134e3..73e15022c 100644 --- a/bridge/pkg/publicrpc/publicrpcserver.go +++ b/node/pkg/publicrpc/publicrpcserver.go @@ -4,10 +4,10 @@ import ( "context" "encoding/hex" "fmt" - "github.com/certusone/wormhole/bridge/pkg/common" - "github.com/certusone/wormhole/bridge/pkg/db" - publicrpcv1 "github.com/certusone/wormhole/bridge/pkg/proto/publicrpc/v1" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/common" + "github.com/certusone/wormhole/node/pkg/db" + publicrpcv1 "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1" + "github.com/certusone/wormhole/node/pkg/vaa" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/bridge/pkg/readiness/health.go b/node/pkg/readiness/health.go similarity index 100% rename from bridge/pkg/readiness/health.go rename to node/pkg/readiness/health.go diff --git a/bridge/pkg/reporter/attestation_events.go b/node/pkg/reporter/attestation_events.go similarity index 98% rename from bridge/pkg/reporter/attestation_events.go rename to node/pkg/reporter/attestation_events.go index a99952669..1dba80db7 100644 --- a/bridge/pkg/reporter/attestation_events.go +++ b/node/pkg/reporter/attestation_events.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/vaa" "github.com/ethereum/go-ethereum/common" ) diff --git a/bridge/pkg/reporter/bigtablewriter.go b/node/pkg/reporter/bigtablewriter.go similarity index 98% rename from bridge/pkg/reporter/bigtablewriter.go rename to node/pkg/reporter/bigtablewriter.go index 8625800f4..5eb43e99c 100644 --- a/bridge/pkg/reporter/bigtablewriter.go +++ b/node/pkg/reporter/bigtablewriter.go @@ -7,8 +7,8 @@ import ( "fmt" "os" - "github.com/certusone/wormhole/bridge/pkg/supervisor" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/supervisor" + "github.com/certusone/wormhole/node/pkg/vaa" "go.uber.org/zap" "google.golang.org/api/option" diff --git a/bridge/pkg/solana/client.go b/node/pkg/solana/client.go similarity index 97% rename from bridge/pkg/solana/client.go rename to node/pkg/solana/client.go index 59a2eb97e..ddba17c41 100644 --- a/bridge/pkg/solana/client.go +++ b/node/pkg/solana/client.go @@ -3,12 +3,12 @@ package solana import ( "context" "fmt" - "github.com/certusone/wormhole/bridge/pkg/common" - "github.com/certusone/wormhole/bridge/pkg/p2p" - gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1" - "github.com/certusone/wormhole/bridge/pkg/readiness" - "github.com/certusone/wormhole/bridge/pkg/supervisor" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/common" + "github.com/certusone/wormhole/node/pkg/p2p" + gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" + "github.com/certusone/wormhole/node/pkg/readiness" + "github.com/certusone/wormhole/node/pkg/supervisor" + "github.com/certusone/wormhole/node/pkg/vaa" eth_common "github.com/ethereum/go-ethereum/common" "github.com/gagliardetto/solana-go" "github.com/gagliardetto/solana-go/rpc" diff --git a/bridge/pkg/solana/client_test.go b/node/pkg/solana/client_test.go similarity index 100% rename from bridge/pkg/solana/client_test.go rename to node/pkg/solana/client_test.go diff --git a/bridge/pkg/supervisor/supervisor.go b/node/pkg/supervisor/supervisor.go similarity index 100% rename from bridge/pkg/supervisor/supervisor.go rename to node/pkg/supervisor/supervisor.go diff --git a/bridge/pkg/supervisor/supervisor_node.go b/node/pkg/supervisor/supervisor_node.go similarity index 100% rename from bridge/pkg/supervisor/supervisor_node.go rename to node/pkg/supervisor/supervisor_node.go diff --git a/bridge/pkg/supervisor/supervisor_processor.go b/node/pkg/supervisor/supervisor_processor.go similarity index 100% rename from bridge/pkg/supervisor/supervisor_processor.go rename to node/pkg/supervisor/supervisor_processor.go diff --git a/bridge/pkg/supervisor/supervisor_support.go b/node/pkg/supervisor/supervisor_support.go similarity index 100% rename from bridge/pkg/supervisor/supervisor_support.go rename to node/pkg/supervisor/supervisor_support.go diff --git a/bridge/pkg/supervisor/supervisor_test.go b/node/pkg/supervisor/supervisor_test.go similarity index 100% rename from bridge/pkg/supervisor/supervisor_test.go rename to node/pkg/supervisor/supervisor_test.go diff --git a/bridge/pkg/supervisor/supervisor_testhelpers.go b/node/pkg/supervisor/supervisor_testhelpers.go similarity index 100% rename from bridge/pkg/supervisor/supervisor_testhelpers.go rename to node/pkg/supervisor/supervisor_testhelpers.go diff --git a/bridge/pkg/terra/sender.go b/node/pkg/terra/sender.go similarity index 97% rename from bridge/pkg/terra/sender.go rename to node/pkg/terra/sender.go index 94b62bf90..019ac2e7e 100644 --- a/bridge/pkg/terra/sender.go +++ b/node/pkg/terra/sender.go @@ -11,7 +11,7 @@ import ( "github.com/terra-project/terra.go/msg" "github.com/terra-project/terra.go/tx" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/vaa" ) type submitVAAMsg struct { diff --git a/bridge/pkg/terra/watcher.go b/node/pkg/terra/watcher.go similarity index 96% rename from bridge/pkg/terra/watcher.go rename to node/pkg/terra/watcher.go index d2ffc25ad..4d934a99b 100644 --- a/bridge/pkg/terra/watcher.go +++ b/node/pkg/terra/watcher.go @@ -4,8 +4,8 @@ import ( "context" "encoding/hex" "fmt" - "github.com/certusone/wormhole/bridge/pkg/p2p" - gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1" + "github.com/certusone/wormhole/node/pkg/p2p" + gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" "github.com/prometheus/client_golang/prometheus/promauto" "io/ioutil" "net/http" @@ -15,10 +15,10 @@ import ( eth_common "github.com/ethereum/go-ethereum/common" - "github.com/certusone/wormhole/bridge/pkg/common" - "github.com/certusone/wormhole/bridge/pkg/readiness" - "github.com/certusone/wormhole/bridge/pkg/supervisor" - "github.com/certusone/wormhole/bridge/pkg/vaa" + "github.com/certusone/wormhole/node/pkg/common" + "github.com/certusone/wormhole/node/pkg/readiness" + "github.com/certusone/wormhole/node/pkg/supervisor" + "github.com/certusone/wormhole/node/pkg/vaa" "github.com/gorilla/websocket" "github.com/tidwall/gjson" "go.uber.org/zap" diff --git a/bridge/pkg/vaa/payloads.go b/node/pkg/vaa/payloads.go similarity index 100% rename from bridge/pkg/vaa/payloads.go rename to node/pkg/vaa/payloads.go diff --git a/bridge/pkg/vaa/structs.go b/node/pkg/vaa/structs.go similarity index 100% rename from bridge/pkg/vaa/structs.go rename to node/pkg/vaa/structs.go diff --git a/bridge/pkg/vaa/types_test.go b/node/pkg/vaa/types_test.go similarity index 100% rename from bridge/pkg/vaa/types_test.go rename to node/pkg/vaa/types_test.go diff --git a/bridge/pkg/version/version.go b/node/pkg/version/version.go similarity index 100% rename from bridge/pkg/version/version.go rename to node/pkg/version/version.go diff --git a/bridge/tools/go.mod b/node/tools/go.mod similarity index 50% rename from bridge/tools/go.mod rename to node/tools/go.mod index 49ebb3dbe..36fca68a1 100644 --- a/bridge/tools/go.mod +++ b/node/tools/go.mod @@ -1,4 +1,4 @@ -module github.com/certusone/wormhole/bridge/tools +module github.com/certusone/wormhole/node/tools go 1.15 diff --git a/bridge/tools/go.sum b/node/tools/go.sum similarity index 100% rename from bridge/tools/go.sum rename to node/tools/go.sum diff --git a/bridge/tools/tools.go b/node/tools/tools.go similarity index 82% rename from bridge/tools/tools.go rename to node/tools/tools.go index a52b1625e..3c756a3a1 100644 --- a/bridge/tools/tools.go +++ b/node/tools/tools.go @@ -1,3 +1,4 @@ +//go:build tools // +build tools package tools diff --git a/proto/gossip/v1/gossip.proto b/proto/gossip/v1/gossip.proto index 6ea825f46..0ba9d3926 100644 --- a/proto/gossip/v1/gossip.proto +++ b/proto/gossip/v1/gossip.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package gossip.v1; -option go_package = "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1;gossipv1"; +option go_package = "github.com/certusone/wormhole/node/pkg/proto/gossip/v1;gossipv1"; message GossipMessage { oneof message { diff --git a/proto/node/v1/node.proto b/proto/node/v1/node.proto index cbad77299..ed713d5c8 100644 --- a/proto/node/v1/node.proto +++ b/proto/node/v1/node.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package node.v1; -option go_package = "github.com/certusone/wormhole/bridge/pkg/proto/node/v1;nodev1"; +option go_package = "github.com/certusone/wormhole/node/pkg/proto/node/v1;nodev1"; // NodePrivilegedService exposes an administrative API. It runs on a UNIX socket and is authenticated // using Linux filesystem permissions. diff --git a/proto/publicrpc/v1/publicrpc.proto b/proto/publicrpc/v1/publicrpc.proto index 98435e036..5176609e7 100644 --- a/proto/publicrpc/v1/publicrpc.proto +++ b/proto/publicrpc/v1/publicrpc.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package publicrpc.v1; -option go_package = "github.com/certusone/wormhole/bridge/pkg/proto/publicrpc/v1;publicrpcv1"; +option go_package = "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1;publicrpcv1"; import "gossip/v1/gossip.proto"; import "google/api/annotations.proto"; diff --git a/tools/go.mod b/tools/go.mod index d99948f2c..9347ab89c 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,4 +1,4 @@ -module github.com/certusone/wormhole/bridge/tools +module github.com/certusone/wormhole/node/tools go 1.16