bridge: rename to node to keep in sync with dev.v2

Internal change to keep package/directory names the same. No changes
to the CLI or Makefile like we did on v2.

Change-Id: Ibe19dcc4bfae630050c0433e64372e35c1ebd955

DEVELOP.md

@@ -63,8 +63,8 @@ Generate test Solana -> Ethereum transfers:
 
 Run end-to-end tests:
 
-    cd bridge
-    go test github.com/certusone/wormhole/bridge/e2e
+    cd node
+    go test github.com/certusone/wormhole/node/e2e
 
 Adjust number of nodes in running cluster: (this is only useful if you want to test scenarios where the number
 of nodes diverges from the guardian set - otherwise, `tilt down --delete-namespaces` and restart the cluster)

Makefile

@@ -29,9 +29,9 @@ bridge: $(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
 
 .PHONY: agent
 agent: $(BIN)/guardiand-solana-agent

README.md

@@ -45,21 +45,21 @@ certainly shouldn't put your life savings into a Wormhole contract (or any other
 
 ### Repo overview
 
-- **[bridge/](bridge/)** — The guardian node which connects to both chains, observes lockups and submits VAAs.
+- **[node/](node/)** — The guardian node which connects to both chains, observes lockups and submits VAAs.
   Written in pure Go.
   
-  - [cmd/](bridge/cmd/) - CLI entry point, deals with the mechanics of parsing command line flags and loading keys.
-  - **[pkg/processor](bridge/pkg/processor)** — Most of the business logic for cross-chain communication
+  - [cmd/](node/cmd/) - CLI entry point, deals with the mechanics of parsing command line flags and loading keys.
+  - **[pkg/processor](node/pkg/processor)** — Most of the business logic for cross-chain communication
     lives here. Talks to multiple loosely coupled services communicating via Go channels.
-  - [pkg/p2p](bridge/pkg/p2p) — libp2p-based gossip network.
-  - [pkg/devnet](bridge/pkg/devnet) — Constants and helper functions for the deterministic local devnet.
-  - [pkg/ethereum](bridge/pkg/ethereum) — Ethereum chain interface with auto-generated contract ABI.
+  - [pkg/p2p](node/pkg/p2p) — libp2p-based gossip network.
+  - [pkg/devnet](node/pkg/devnet) — Constants and helper functions for the deterministic local devnet.
+  - [pkg/ethereum](node/pkg/ethereum) — Ethereum chain interface with auto-generated contract ABI.
     Uses go-ethereum to directly connect to an Eth node.
-  - [pkg/solana](bridge/pkg/ethereum) — Solana chain interface. Light gRPC wrapper around a Rust agent (see below)
+  - [pkg/solana](node/pkg/ethereum) — Solana chain interface. Light gRPC wrapper around a Rust agent (see below)
     which actually talks to Solana.  
-  - [pkg/supervisor](bridge/pkg/supervisor) — Erlang-inspired process supervision tree imported from Certus One's
-    internal code base. We use this everywhere in the bridge code for fault tolerance and fast convergence.
-  - [pkg/vaa](bridge/pkg/vaa) — Go implementation of our VAA structure, including serialization code.
+  - [pkg/supervisor](node/pkg/supervisor) — Erlang-inspired process supervision tree imported from Certus One's
+    internal code base. We use this everywhere in the node code for fault tolerance and fast convergence.
+  - [pkg/vaa](node/pkg/vaa) — Go implementation of our VAA structure, including serialization code.
   
 - **[ethereum/](ethereum/)** — Ethereum wormhole contract, tests and fixtures.
 
@@ -74,7 +74,7 @@ certainly shouldn't put your life savings into a Wormhole contract (or any other
   - **[agent/](solana/agent/)** — Rust agent sidecar deployed alongside each Guardian node. It serves
     a local gRPC API to interface with the Solana blockchain. This is far easier to maintain than a
     pure-Go Solana client.
-  - **[bridge/](solana/bridge/)** — Solana Wormhole smart contract code. 
+  - **[node/](solana/node/)** — Solana Wormhole smart contract code. 
   - [cli/](solana/cli/) — Wormhole user CLI tool for interaction with the smart contract. 
   - [devnet_setup.sh](solana/devnet_setup.sh) — Devnet initialization and lockup generator
     (the Solana equivalent to the Ganache migration + send-lockups.js). Runs as a sidecar alongside the Solana devnet. 

Tiltfile

@@ -19,7 +19,7 @@
 #                                                        +--|-----> |  solana-devnet  |
 #      golang:1.*                                           +-----> | [setup]         |
 #       +                                                      |    +-----------------+
-#       +-> bridge/Dockerfile   +->  guardiand-image +---------+
+#       +-> node/Dockerfile     +->  guardiand-image +---------+
 #
 #
 #      node:lts-alpine
@@ -65,18 +65,18 @@ local_resource(
     cmd = "./generate-protos.sh",
 )
 
-# bridge
+# node
 
 docker_build(
     ref = "guardiand-image",
-    context = "bridge",
-    dockerfile = "bridge/Dockerfile",
+    context = "node",
+    dockerfile = "node/Dockerfile",
 )
 
-def build_bridge_yaml():
-    bridge_yaml = read_yaml_stream("devnet/bridge.yaml")
+def build_node_yaml():
+    node_yaml = read_yaml_stream("devnet/node.yaml")
 
-    for obj in bridge_yaml:
+    for obj in node_yaml:
         if obj["kind"] == "StatefulSet" and obj["metadata"]["name"] == "guardian":
             obj["spec"]["replicas"] = num_guardians
             container = obj["spec"]["template"]["spec"]["containers"][0]
@@ -84,15 +84,15 @@ def build_bridge_yaml():
                 fail("container 0 is not guardiand")
             container["command"] += ["--devNumGuardians", str(num_guardians)]
 
-    return encode_yaml_stream(bridge_yaml)
+    return encode_yaml_stream(node_yaml)
 
-k8s_yaml_with_ns(build_bridge_yaml())
+k8s_yaml_with_ns(build_node_yaml())
 
 k8s_resource("guardian", resource_deps = ["proto-gen", "solana-devnet"], port_forwards = [
     port_forward(6060, name = "Debug/Status Server [:6060]"),
 ])
 
-# solana agent and cli (runs alongside bridge)
+# solana agent and cli (runs alongside node)
 
 docker_build(
     ref = "solana-agent",

bridge/main.go

@@ -1,7 +0,0 @@
-package main
-
-import "github.com/certusone/wormhole/bridge/cmd"
-
-func main() {
-	cmd.Execute()
-}

dev-install.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 #
 # This script downloads and installs development dependencies required for
-# bridge development on Linux.
+# node development on Linux.
 #
 # Tested on amd64 with CentOS 8, Debian 10 and Ubuntu 20.04. Likely works on other distros as well.
 #

generate-abi.sh

@@ -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

generate-protos.sh

@@ -16,10 +16,10 @@ tools/bin/buf protoc \
   -Iproto \
   -Ithird_party/googleapis \
   --plugin tools/bin/protoc-gen-go \
-  --go_out=bridge/pkg/ proto/**/**/**
+  --go_out=node/pkg/ proto/**/**/**
 
 tools/bin/buf protoc \
   -Iproto \
   -Ithird_party/googleapis \
   --plugin tools/bin/protoc-gen-go-grpc \
-  --go-grpc_out=bridge/pkg/ proto/**/**/**
+  --go-grpc_out=node/pkg/ proto/**/**/**

bridge/Dockerfile → 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

bridge/cmd/debug/resubmit.go → node/cmd/debug/resubmit.go

@@ -6,8 +6,8 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	agentv1 "github.com/certusone/wormhole/bridge/pkg/proto/agent/v1"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	agentv1 "github.com/certusone/wormhole/node/pkg/proto/agent/v1"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"

bridge/cmd/debug/solana.go → node/cmd/debug/solana.go

@@ -3,9 +3,9 @@ package debug
 import (
 	"context"
 	"encoding/hex"
-	"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/solana"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 	"log"

bridge/cmd/debug/vaa.go → 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"

bridge/cmd/guardiand/adminclient.go → node/cmd/guardiand/adminclient.go

@@ -12,7 +12,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 clientSocketPath *string

bridge/cmd/guardiand/adminserver.go → node/cmd/guardiand/adminserver.go

@@ -15,10 +15,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 {

bridge/cmd/guardiand/admintemplate.go → 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

bridge/cmd/guardiand/adminverify.go → 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{

bridge/cmd/guardiand/bridge.go → node/cmd/guardiand/bridge.go

@@ -20,18 +20,18 @@ 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"
-	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/bridge/pkg/terra"
+	"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"
+	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/node/pkg/terra"
 
 	ipfslog "github.com/ipfs/go-log/v2"
 )

bridge/cmd/guardiand/bridgekey.go → 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

bridge/cmd/root.go → 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

bridge/cmd/vaa-test-terra/main.go → node/cmd/vaa-test-terra/main.go

@@ -12,8 +12,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 
-	"github.com/certusone/wormhole/bridge/pkg/ethereum"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/ethereum"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 type signerInfo struct {

bridge/cmd/vaa-test/main.go → node/cmd/vaa-test/main.go

@@ -12,9 +12,9 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 
-	"github.com/certusone/wormhole/bridge/pkg/devnet"
-	"github.com/certusone/wormhole/bridge/pkg/ethereum"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/devnet"
+	"github.com/certusone/wormhole/node/pkg/ethereum"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 type signerInfo struct {

bridge/e2e/e2e_test.go → node/e2e/e2e_test.go

@@ -9,9 +9,9 @@ import (
 	"github.com/mr-tron/base58"
 	"k8s.io/client-go/kubernetes"
 
-	"github.com/certusone/wormhole/bridge/pkg/devnet"
-	"github.com/certusone/wormhole/bridge/pkg/ethereum"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/devnet"
+	"github.com/certusone/wormhole/node/pkg/ethereum"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 	"github.com/ethereum/go-ethereum/ethclient"
 )
 

bridge/e2e/eth.go → node/e2e/eth.go

@@ -15,11 +15,11 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 
-	"github.com/certusone/wormhole/bridge/pkg/devnet"
-	"github.com/certusone/wormhole/bridge/pkg/ethereum"
-	"github.com/certusone/wormhole/bridge/pkg/ethereum/abi"
-	"github.com/certusone/wormhole/bridge/pkg/ethereum/erc20"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/devnet"
+	"github.com/certusone/wormhole/node/pkg/ethereum"
+	"github.com/certusone/wormhole/node/pkg/ethereum/abi"
+	"github.com/certusone/wormhole/node/pkg/ethereum/erc20"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 // waitEthBalance waits for target account before to increase.

bridge/e2e/solana.go → node/e2e/solana.go

@@ -17,9 +17,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 
-	"github.com/certusone/wormhole/bridge/pkg/devnet"
-	"github.com/certusone/wormhole/bridge/pkg/ethereum/erc20"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/devnet"
+	"github.com/certusone/wormhole/node/pkg/ethereum/erc20"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 func getSPLBalance(ctx context.Context, c *kubernetes.Clientset, hexAddr string) (*big.Int, error) {

bridge/e2e/terra.go → node/e2e/terra.go

@@ -13,10 +13,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/certusone/wormhole/bridge/pkg/devnet"
-	"github.com/certusone/wormhole/bridge/pkg/ethereum"
-	"github.com/certusone/wormhole/bridge/pkg/ethereum/erc20"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/devnet"
+	"github.com/certusone/wormhole/node/pkg/ethereum"
+	"github.com/certusone/wormhole/node/pkg/ethereum/erc20"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/tendermint/tendermint/libs/rand"

bridge/go.mod → node/go.mod

@@ -1,4 +1,4 @@
-module github.com/certusone/wormhole/bridge
+module github.com/certusone/wormhole/node
 
 go 1.17
 

node/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "github.com/certusone/wormhole/node/cmd"
+
+func main() {
+	cmd.Execute()
+}

bridge/pkg/common/chainlock.go → node/pkg/common/chainlock.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 type ChainLock struct {

bridge/pkg/common/readiness.go → 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"

bridge/pkg/devnet/constants.go → 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 (

bridge/pkg/devnet/guardianset_vaa.go → 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.

bridge/pkg/ethereum/utils.go → 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"
 )
 

bridge/pkg/ethereum/watcher.go → 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"
 	"math/big"
 	"sync"
 	"time"
@@ -17,11 +17,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 (

bridge/pkg/p2p/p2p.go → node/pkg/p2p/p2p.go

@@ -3,7 +3,7 @@ package p2p
 import (
 	"context"
 	"fmt"
-	"github.com/certusone/wormhole/bridge/pkg/version"
+	"github.com/certusone/wormhole/node/pkg/version"
 	"github.com/prometheus/client_golang/prometheus"
 	"strings"
 	"time"
@@ -24,8 +24,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 (

bridge/pkg/p2p/registry.go → 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"
 )
 

bridge/pkg/processor/broadcast.go → node/pkg/processor/broadcast.go

@@ -9,8 +9,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 (

bridge/pkg/processor/cleanup.go → 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"
 	"time"
 

bridge/pkg/processor/injection.go → node/pkg/processor/injection.go

@@ -8,8 +8,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 (

bridge/pkg/processor/lockup.go → node/pkg/processor/lockup.go

@@ -8,9 +8,9 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"go.uber.org/zap"
 
-	"github.com/certusone/wormhole/bridge/pkg/common"
-	"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/supervisor"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 var (

bridge/pkg/processor/observation.go → node/pkg/processor/observation.go

@@ -4,20 +4,20 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
-	bridge_common "github.com/certusone/wormhole/bridge/pkg/common"
+	bridge_common "github.com/certusone/wormhole/node/pkg/common"
 	"github.com/prometheus/client_golang/prometheus"
 	"strings"
 	"time"
 
-	"github.com/certusone/wormhole/bridge/pkg/terra"
+	"github.com/certusone/wormhole/node/pkg/terra"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"go.uber.org/zap"
 
-	"github.com/certusone/wormhole/bridge/pkg/devnet"
-	gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/devnet"
+	gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 var (

bridge/pkg/processor/processor.go → node/pkg/processor/processor.go

@@ -10,12 +10,12 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"go.uber.org/zap"
 
-	"github.com/certusone/wormhole/bridge/pkg/common"
-	"github.com/certusone/wormhole/bridge/pkg/devnet"
-	gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1"
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
-	"github.com/certusone/wormhole/bridge/pkg/terra"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/common"
+	"github.com/certusone/wormhole/node/pkg/devnet"
+	gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/terra"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 type (

bridge/pkg/solana/client.go → node/pkg/solana/client.go

@@ -5,11 +5,11 @@ import (
 	"context"
 	"encoding/binary"
 	"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/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/supervisor"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 	"github.com/dfuse-io/solana-go"
 	"github.com/dfuse-io/solana-go/rpc"
 	eth_common "github.com/ethereum/go-ethereum/common"

bridge/pkg/solana/submitter.go → node/pkg/solana/submitter.go

@@ -14,12 +14,12 @@ import (
 
 	"go.uber.org/zap"
 
-	agentv1 "github.com/certusone/wormhole/bridge/pkg/proto/agent/v1"
-	"github.com/certusone/wormhole/bridge/pkg/readiness"
+	agentv1 "github.com/certusone/wormhole/node/pkg/proto/agent/v1"
+	"github.com/certusone/wormhole/node/pkg/readiness"
 
-	"github.com/certusone/wormhole/bridge/pkg/common"
-	"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/supervisor"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 var (

bridge/pkg/terra/sender.go → node/pkg/terra/sender.go

@@ -6,9 +6,9 @@ import (
 	"io/ioutil"
 	"time"
 
-	"github.com/certusone/wormhole/bridge/pkg/devnet"
+	"github.com/certusone/wormhole/node/pkg/devnet"
 
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 	"github.com/terra-project/terra.go/client"
 	"github.com/terra-project/terra.go/key"
 	"github.com/terra-project/terra.go/msg"

bridge/pkg/terra/watcher.go → 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"
 	"io/ioutil"
 	"math/big"
 	"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"

bridge/tools/go.mod → 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
 

tools/go.mod

@@ -1,4 +1,4 @@
-module github.com/certusone/wormhole/bridge/tools
+module github.com/certusone/wormhole/node/tools
 
 go 1.14