Refactor our CW contract + cleanups (#262)

* Use the cw sdk

* Fix clippy warnings

* Use Addr instead of String

* Format the code (cargo +nightly fmt)

* Depend on wormhole git instead of local dependency

* Add error enum

* refactor

* Refactor errors

* certusone->wormhole-foundation rename

It will fix some compile problems

* Build wormhole contract from their repo

* remove wormhole package

* Remove memmap2 patch

It was not needed anymore with the newer
verison of solana (wormhole removed it too)

* Rename pyth-bridge to pyth-cosmwasm

Author: ali-behjati

.github/workflows/pyth-cosmwasm-contract.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./cosmwasm/contracts/pyth-bridge
+        working-directory: ./cosmwasm/contracts/pyth
     steps:
     - uses: actions/checkout@v2
     - name: Build

CONTRIBUTING.md

@@ -28,7 +28,7 @@ and code reviews are our most important tools to accomplish that.
   well-defined changes.
 
 Documentation for the in-the-wild deployments lives in the
-[wormhole-networks](https://github.com/certusone/wormhole-networks) repository.
+[wormhole-networks](https://github.com/wormhole-foundation/wormhole-networks) repository.
 
 See [DEVELOP.md](./DEVELOP.md) for more information on how to run the development environment.
 

Dockerfile.client

@@ -25,5 +25,5 @@ RUN --mount=type=cache,target=/root/.cache \
     --mount=type=cache,target=/usr/local/cargo/registry,id=cargo_registry \
     --mount=type=cache,target=target,id=cargo_registry \
 	set -xe && \
-    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
+    cargo install bridge_client --git https://github.com/wormhole-foundation/wormhole --tag $WORMHOLE_TAG --locked --root /usr/local && \
+    cargo install token_bridge_client --git https://github.com/wormhole-foundation/wormhole --tag $WORMHOLE_TAG --locked --root /usr/local

Dockerfile.cosmwasm

@@ -1,12 +1,27 @@
-# This is a multi-stage docker file, first stage builds contracts
-# And the second one creates node.js environment to deploy them
-FROM cosmwasm/workspace-optimizer:0.12.6@sha256:e6565a5e87c830ef3e8775a9035006b38ad0aaf0a96319158c802457b1dd1d08 AS builder
+# This is a multi-stage docker file, first and second stage builds contracts
+# And the third one creates node.js environment to deploy them
+
+FROM cosmwasm/workspace-optimizer:0.12.6@sha256:e6565a5e87c830ef3e8775a9035006b38ad0aaf0a96319158c802457b1dd1d08 AS wormhole_builder
+
+WORKDIR /tmp/wormhole-repo
+
+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}/cosmwasm/Cargo.lock /code/
+RUN mv wormhole-${WORMHOLE_REV}/cosmwasm/Cargo.toml /code/
+RUN mv wormhole-${WORMHOLE_REV}/cosmwasm/contracts /code/contracts
+
+WORKDIR /code
+RUN --mount=type=cache,target=/code/target,id=cosmwasm_wormhole_target --mount=type=cache,target=/usr/local/cargo/registry optimize_workspace.sh
+
+FROM cosmwasm/workspace-optimizer:0.12.6@sha256:e6565a5e87c830ef3e8775a9035006b38ad0aaf0a96319158c802457b1dd1d08 AS pyth_builder
 
 COPY cosmwasm/Cargo.lock /code/
 COPY cosmwasm/Cargo.toml /code/
 COPY cosmwasm/contracts /code/contracts
 COPY third_party/pyth/p2w-sdk/rust /third_party/pyth/p2w-sdk/rust 
-RUN --mount=type=cache,target=/code/target,id=cosmwasm_target --mount=type=cache,target=/usr/local/cargo/registry optimize_workspace.sh
+RUN --mount=type=cache,target=/code/target,id=cosmwasm_pyth_target --mount=type=cache,target=/usr/local/cargo/registry optimize_workspace.sh
 
 # Contract deployment stage
 FROM node:16-buster-slim@sha256:93c9fc3550f5f7d159f282027228e90e3a7f8bf38544758024f005e82607f546
@@ -15,7 +30,8 @@ RUN apt update && apt install netcat curl jq -y
 
 WORKDIR /app/tools
 
-COPY --from=builder /code/artifacts /app/artifacts
+COPY --from=wormhole_builder /code/artifacts/wormhole.wasm /app/artifacts/wormhole.wasm
+COPY --from=pyth_builder /code/artifacts/pyth_cosmwasm.wasm /app/artifacts/pyth_cosmwasm.wasm
 
 COPY ./cosmwasm/tools/package.json ./cosmwasm/tools/package-lock.json /app/tools/
 RUN --mount=type=cache,uid=1000,gid=1000,target=/home/node/.npm \

Dockerfile.solana

@@ -29,7 +29,7 @@ RUN cargo init --lib /tmp/decoy-crate && \
 WORKDIR /usr/src/bridge
 
 ARG WORMHOLE_REV=2.8.9
-ADD https://github.com/certusone/wormhole/archive/refs/tags/v${WORMHOLE_REV}.tar.gz .
+ADD https://github.com/wormhole-foundation/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

README.md

@@ -6,7 +6,7 @@ Pyth2Wormhole. The base repository is a fork from Certus One's reference
 for building projects based on Wormhole's various SDKs. Much of the existing
 documentation from there will also apply to this repository.
 
-[Wormhole]: https://github.com/certusone/wormhole
+[Wormhole]: https://github.com/wormhole-foundation/wormhole
 
 Within this monorepo you will find the following subprojects: