diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c72c24f..6b39286 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: OCTEZ_PROTO=Proxford PACKAGE=evm_kernel TEZOS_REPO=https://gitlab.com/baking-bad/tezos.git - TEZOS_REPO_BRANCH=feat/token-deposits-squashed-v2 + TEZOS_REPO_BRANCH=feat/token-deposits-squashed-v3 CACHEBUST=${{ steps.cachebust.outputs.date }} CI_COMMIT_SHA=dev push: true diff --git a/build/etherlink/Dockerfile b/build/etherlink/Dockerfile index 1a01111..e21b4a4 100644 --- a/build/etherlink/Dockerfile +++ b/build/etherlink/Dockerfile @@ -37,8 +37,9 @@ ARG OCTEZ_PROTO COPY --from=octez /usr/local/bin/octez-smart-rollup-node-${OCTEZ_PROTO} /usr/bin/octez-smart-rollup-node COPY --from=octez /usr/local/bin/octez-client /usr/bin/octez-client COPY --from=octez /usr/local/bin/octez-evm-node /usr/bin/octez-evm-node -COPY --from=octez /usr/local/bin/octez-node /usr/bin/octez-node COPY --from=builder /build/bin/wasm_2_0_0/ /root/wasm_2_0_0/ +COPY --from=octez /usr/local/bin/octez-node /usr/bin/octez-node +COPY --from=octez /usr/share/zcash-params/ /root/.zcash-params/ ARG PACKAGE COPY --from=builder /build/bin/${PACKAGE}_installer.wasm /root/kernel.wasm COPY ./build/etherlink/entrypoint.sh . diff --git a/envs/etherlink-oxford.env b/envs/etherlink-oxford.env index f593c18..ff687de 100644 --- a/envs/etherlink-oxford.env +++ b/envs/etherlink-oxford.env @@ -2,4 +2,4 @@ OCTEZ_TAG=master OCTEZ_PROTO=Proxford NETWORK=oxfordnet TEZOS_REPO=https://gitlab.com/baking-bad/tezos.git -TEZOS_REPO_BRANCH=feat/token-deposits-squashed-v2 +TEZOS_REPO_BRANCH=feat/token-deposits-squashed-v3