Start depending on the upstream out-of-tree Wormhole (#258)

* Add out-of-tree dependency on wormhole v2.8.9

This lets us outsource all wormhole/solitaire code to the upstream
certusone repo

* Docker.client: Use cargo-install to install binaries from github

* p2w: fix solana-program wasm-bindgen

* pyth2wormhole: Fix code-level errors against newer solitaire

* p2w: Use upstream wormhole rust code, bump guardian to 2.8.9

* guardian: ensure solana is on, spy: bump image to 2.8.9

Co-authored-by: Reisen <[email protected]>

Author: Stanisław Drozd

Dockerfile.client

@@ -1,22 +1,19 @@
 #syntax=docker/dockerfile:1.2@sha256:e2a8561e419ab1ba6b2fe6cbdf49fd92b95912df1cf7d313c3e2230a333fdbcc
-FROM docker.io/library/rust:1.49@sha256:a50165ea96983c21832578afb1c8c028674c965bc1ed43b607871b1f362e06a5
+FROM ghcr.io/certusone/solana:1.10.31@sha256:d31e8db926a1d3fbaa9d9211d9979023692614b7b64912651aba0383e8c01bad AS solana
 
-RUN apt-get update && apt-get install -yq libssl-dev libudev-dev pkg-config zlib1g-dev llvm clang ncat
+ARG WORMHOLE_TAG=v2.8.9
+
+# libudev is needed by spl-token-cli, and ncat is needed by the devnet setup
+# script to be able to signal a health status for tilt
+RUN apt-get update && apt-get install -yq libudev-dev ncat
 RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
-RUN curl -sSfL https://release.solana.com/v1.10.13/install | sh
 
-RUN rustup default nightly-2022-02-01
-RUN rustup component add rustfmt
+COPY solana /usr/src/solana 
+WORKDIR /usr/src/solana
 
 RUN --mount=type=cache,target=/root/.cache \
-    cargo install --version =2.0.12 spl-token-cli
-
-ENV SOLANA_BIN_PATH="/root/.local/share/solana/install/active_release/bin"
-ENV PATH="$SOLANA_BIN_PATH:$PATH"
+    cargo install --version =2.0.12 --locked spl-token-cli
 
-ADD solana /usr/src/solana
-
-WORKDIR /usr/src/solana
 
 RUN solana config set --keypair "/usr/src/solana/keys/solana-devnet.json"
 RUN solana config set --url "http://solana-devnet:8899"
@@ -25,7 +22,7 @@ ENV EMITTER_ADDRESS="11111111111111111111111111111115"
 ENV BRIDGE_ADDRESS="Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o"
 
 RUN --mount=type=cache,target=/root/.cache \
-    --mount=type=cache,target=bridge/target \
+    --mount=type=cache,target=/usr/local/cargo/registry,id=cargo_registry \
 	set -xe && \
-    cargo build --manifest-path ./bridge/Cargo.toml --package client --release --locked && \
-    cp bridge/target/release/client /usr/local/bin
+    cargo install bridge_client --git https://github.com/certusone/wormhole --tag $WORMHOLE_TAG --locked --root /usr/local && \
+    cargo install token_bridge_client --git https://github.com/certusone/wormhole --tag $WORMHOLE_TAG --locked --root /usr/local

Dockerfile.solana

@@ -13,40 +13,46 @@ RUN apt-get update && \
     zlib1g-dev \
     && \
     rm -rf /var/lib/apt/lists/* && \
-    rustup component add rustfmt && \
-    rustup default nightly-2022-01-31
+    rustup component add rustfmt
 
-RUN sh -c "$(curl -sSfL https://release.solana.com/v1.10.13/install)"
+RUN sh -c "$(curl -sSfL https://release.solana.com/v1.10.31/install)"
 
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
 
+
+ADD solana/rust-toolchain /rust-toolchain
 # Solana does a questionable download at the beginning of a *first* build-bpf call. Trigger and layer-cache it explicitly.
 RUN cargo init --lib /tmp/decoy-crate && \
     cd /tmp/decoy-crate && cargo build-bpf && \
     rm -rf /tmp/decoy-crate
 
-# Add bridge contract sources
 WORKDIR /usr/src/bridge
 
+ARG WORMHOLE_REV=2.8.9
+ADD https://github.com/certusone/wormhole/archive/refs/tags/v${WORMHOLE_REV}.tar.gz .
+RUN tar -xvf v${WORMHOLE_REV}.tar.gz
+RUN mv wormhole-${WORMHOLE_REV} wormhole
+# RUN mkdir -p /usr/src/bridge/wormhole/solana/target
+
+
 ADD solana solana
 ADD third_party/pyth/p2w-sdk/rust third_party/pyth/p2w-sdk/rust
 RUN mkdir -p /opt/solana/deps
 
 ENV EMITTER_ADDRESS="11111111111111111111111111111115"
 ENV BRIDGE_ADDRESS="Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o"
 
+WORKDIR /usr/src/bridge/solana
+
 # Build Wormhole Solana programs
-RUN --mount=type=cache,target=solana/bridge/target \
-    --mount=type=cache,target=solana/modules/token_bridge/target \
-    --mount=type=cache,target=solana/modules/nft_bridge/target \
-    --mount=type=cache,target=solana/pyth2wormhole/target \
-    --mount=type=cache,target=solana/migration/target \
-    cargo build-bpf --manifest-path "solana/bridge/program/Cargo.toml" -- --locked && \
-    cargo build-bpf --manifest-path "solana/bridge/cpi_poster/Cargo.toml" -- --locked && \
-    cargo build-bpf --manifest-path "solana/pyth2wormhole/program/Cargo.toml" -- --locked && \
-    cp solana/bridge/target/deploy/bridge.so /opt/solana/deps/bridge.so && \
-    cp solana/bridge/target/deploy/cpi_poster.so /opt/solana/deps/cpi_poster.so && \
-    cp solana/pyth2wormhole/target/deploy/pyth2wormhole.so /opt/solana/deps/pyth2wormhole.so
+RUN --mount=type=cache,target=../wormhole/solana/target \
+    --mount=type=cache,target=pyth2wormhole/target \
+    cargo build-bpf --manifest-path "../wormhole/solana/bridge/program/Cargo.toml" -- --locked && \
+    cargo build-bpf --manifest-path "../wormhole/solana/bridge/cpi_poster/Cargo.toml" -- --locked && \
+    cargo build-bpf --manifest-path "pyth2wormhole/program/Cargo.toml" -- --locked && \
+    cp ../wormhole/solana/target/deploy/bridge.so /opt/solana/deps/bridge.so && \
+    cp ../wormhole/solana/target/deploy/cpi_poster.so /opt/solana/deps/cpi_poster.so && \
+    cp pyth2wormhole/target/deploy/pyth2wormhole.so /opt/solana/deps/pyth2wormhole.so
 
 COPY --from=pyth-oracle-copy /home/pyth/pyth-client/target/oracle.so /opt/solana/deps/pyth_oracle.so
 

Dockerfile.wasm

@@ -5,6 +5,8 @@ RUN apt-get update && \
   apt-get install -y libssl-dev libudev-dev pkg-config zlib1g-dev llvm clang && \
   apt-get clean && rm -rf /var/lib/apt/lists/*
 
+# We default an older nightly since current rust-toolchain makes the
+# wasm-pack build unhappy, we introduce it later for our code
 RUN rustup component add rustfmt && \
   rustup default nightly-2022-01-02