node: rename bridge/ to node/

Calling guardiand a bridge dates back to v1 and no longer makes sense.

Change-Id: I27d24a5d7a64c3e37d6a5ce9c402c6248ad9c59e

Makefile

@@ -24,11 +24,11 @@ install:
 generate: dirs
 	./generate-protos.sh
 
-.PHONY: bridge
+.PHONY: node
-bridge: $(BIN)/guardiand
+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

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",
+    context = "node",
-    dockerfile = "bridge/Dockerfile",
+    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",

bridge/main.go

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

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

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

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/node/pkg/ethereum/abi"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"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"

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.

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

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

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

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"

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 (

node/cmd/guardiand/adminnodes.go

@@ -3,8 +3,8 @@ 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/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 	"github.com/spf13/cobra"
 	"log"
 	"os"

node/cmd/guardiand/adminserver.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/certusone/wormhole/bridge/pkg/db"
+	"github.com/certusone/wormhole/node/pkg/db"
-	publicrpcv1 "github.com/certusone/wormhole/bridge/pkg/proto/publicrpc/v1"
+	publicrpcv1 "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1"
-	"github.com/certusone/wormhole/bridge/pkg/publicrpc"
+	"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"
+	"github.com/certusone/wormhole/node/pkg/common"
-	nodev1 "github.com/certusone/wormhole/bridge/pkg/proto/node/v1"
+	nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1"
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 type nodePrivilegedService struct {

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"
+	"github.com/certusone/wormhole/node/pkg/devnet"
-	nodev1 "github.com/certusone/wormhole/bridge/pkg/proto/node/v1"
+	nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1"
 )
 
 var setUpdateNumGuardians *int

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{

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/node/pkg/common"
-	"github.com/certusone/wormhole/bridge/pkg/devnet"
+	"github.com/certusone/wormhole/node/pkg/devnet"
-	"github.com/certusone/wormhole/bridge/pkg/ethereum"
+	"github.com/certusone/wormhole/node/pkg/ethereum"
-	"github.com/certusone/wormhole/bridge/pkg/p2p"
+	"github.com/certusone/wormhole/node/pkg/p2p"
-	"github.com/certusone/wormhole/bridge/pkg/processor"
+	"github.com/certusone/wormhole/node/pkg/processor"
-	gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1"
+	gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
-	"github.com/certusone/wormhole/bridge/pkg/readiness"
+	"github.com/certusone/wormhole/node/pkg/readiness"
-	"github.com/certusone/wormhole/bridge/pkg/reporter"
+	"github.com/certusone/wormhole/node/pkg/reporter"
-	solana "github.com/certusone/wormhole/bridge/pkg/solana"
+	solana "github.com/certusone/wormhole/node/pkg/solana"
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"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"
 )

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"
+	"github.com/certusone/wormhole/node/pkg/devnet"
-	nodev1 "github.com/certusone/wormhole/bridge/pkg/proto/node/v1"
+	nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1"
 )
 
 var keyDescription *string

node/cmd/guardiand/publicrpc.go

@@ -2,11 +2,11 @@ package guardiand
 
 import (
 	"fmt"
-	"github.com/certusone/wormhole/bridge/pkg/common"
+	"github.com/certusone/wormhole/node/pkg/common"
-	"github.com/certusone/wormhole/bridge/pkg/db"
+	"github.com/certusone/wormhole/node/pkg/db"
-	publicrpcv1 "github.com/certusone/wormhole/bridge/pkg/proto/publicrpc/v1"
+	publicrpcv1 "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1"
-	"github.com/certusone/wormhole/bridge/pkg/publicrpc"
+	"github.com/certusone/wormhole/node/pkg/publicrpc"
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"net"

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/node/pkg/proto/publicrpc/v1"
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
+	"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"

node/cmd/root.go

@@ -2,8 +2,8 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/certusone/wormhole/bridge/cmd/debug"
+	"github.com/certusone/wormhole/node/cmd/debug"
-	"github.com/certusone/wormhole/bridge/pkg/version"
+	"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

node/go.mod

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

node/main.go

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

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"

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"

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"

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"
 )
 

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 (

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/node/pkg/ethereum/abi"
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 // DevnetGuardianSetVSS returns a VAA signed by guardian-0 that adds all n validators.

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"
 )
 

node/pkg/ethereum/watcher.go

@@ -3,8 +3,8 @@ package ethereum
 import (
 	"context"
 	"fmt"
-	"github.com/certusone/wormhole/bridge/pkg/p2p"
+	"github.com/certusone/wormhole/node/pkg/p2p"
-	gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1"
+	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/node/pkg/common"
-	"github.com/certusone/wormhole/bridge/pkg/ethereum/abi"
+	"github.com/certusone/wormhole/node/pkg/ethereum/abi"
-	"github.com/certusone/wormhole/bridge/pkg/readiness"
+	"github.com/certusone/wormhole/node/pkg/readiness"
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 var (

node/pkg/p2p/netmetrics.go

@@ -1,8 +1,8 @@
 package p2p
 
 import (
-	gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1"
+	gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"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"

node/pkg/p2p/p2p.go

@@ -5,9 +5,9 @@ import (
 	"crypto/ecdsa"
 	"errors"
 	"fmt"
-	bridge_common "github.com/certusone/wormhole/bridge/pkg/common"
+	bridge_common "github.com/certusone/wormhole/node/pkg/common"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
-	"github.com/certusone/wormhole/bridge/pkg/version"
+	"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"
+	gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
 )
 
 var (

node/pkg/p2p/registry.go

@@ -1,8 +1,8 @@
 package p2p
 
 import (
-	gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1"
+	gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 	"sync"
 )
 

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"
+	gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 var (

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"

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/node/pkg/supervisor"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 var (

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/node/pkg/common"
-	"github.com/certusone/wormhole/bridge/pkg/reporter"
+	"github.com/certusone/wormhole/node/pkg/reporter"
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 var (

node/pkg/processor/observation.go

@@ -4,8 +4,8 @@ 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/certusone/wormhole/bridge/pkg/reporter"
+	"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"
+	gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 var (

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"
+	"github.com/certusone/wormhole/node/pkg/common"
-	gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1"
+	gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
-	"github.com/certusone/wormhole/bridge/pkg/reporter"
+	"github.com/certusone/wormhole/node/pkg/reporter"
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 )
 
 type (

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/node/pkg/common"
-	"github.com/certusone/wormhole/bridge/pkg/db"
+	"github.com/certusone/wormhole/node/pkg/db"
-	publicrpcv1 "github.com/certusone/wormhole/bridge/pkg/proto/publicrpc/v1"
+	publicrpcv1 "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

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"
 )

node/pkg/reporter/bigtablewriter.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 	"go.uber.org/zap"
 	"google.golang.org/api/option"
 

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/node/pkg/common"
-	"github.com/certusone/wormhole/bridge/pkg/p2p"
+	"github.com/certusone/wormhole/node/pkg/p2p"
-	gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1"
+	gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
-	"github.com/certusone/wormhole/bridge/pkg/readiness"
+	"github.com/certusone/wormhole/node/pkg/readiness"
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"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"

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 {

node/pkg/terra/watcher.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
-	"github.com/certusone/wormhole/bridge/pkg/p2p"
+	"github.com/certusone/wormhole/node/pkg/p2p"
-	gossipv1 "github.com/certusone/wormhole/bridge/pkg/proto/gossip/v1"
+	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/node/pkg/common"
-	"github.com/certusone/wormhole/bridge/pkg/readiness"
+	"github.com/certusone/wormhole/node/pkg/readiness"
-	"github.com/certusone/wormhole/bridge/pkg/supervisor"
+	"github.com/certusone/wormhole/node/pkg/supervisor"
-	"github.com/certusone/wormhole/bridge/pkg/vaa"
+	"github.com/certusone/wormhole/node/pkg/vaa"
 	"github.com/gorilla/websocket"
 	"github.com/tidwall/gjson"
 	"go.uber.org/zap"

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
 

node/tools/tools.go

@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package tools

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 {

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.

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";

tools/go.mod

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