New Relayer and Contract (#953)

Co-authored-by: Olga Kunyavskaya <olga.kunyavskaya@aurora.dev>

Author: r-near

.dockerignore

@@ -0,0 +1,12 @@
+**/target/
+.git/
+.gitignore
+relayer/target/
+contracts/near/target/
+relayer/*.md
+relayer/tests/
+relayer/.env*
+relayer/relayer.toml
+relayer/keys/
+relayer/libpod/
+*.log

.github/workflows/contracts-near.yml

@@ -15,14 +15,7 @@ jobs:
           - job-name: build rust contracts
             cmd: |
               cd contracts/near
-              rustup target add wasm32-unknown-unknown
-              make build
-            timeout-minutes: 40
-
-          - job-name: test eth-prover
-            cmd: |
-              cd contracts/near/eth-prover
-              ./test.sh
+              make build-eth2-client
             timeout-minutes: 40
 
           - job-name: test eth2-client
@@ -31,34 +24,11 @@ jobs:
               ./test.sh
             timeout-minutes: 40
 
-          - job-name: test eth2near/contract_wrapper
-            cmd: |
-              cd eth2near/contract_wrapper
-              ./test.sh
-            timeout-minutes: 20
-
-          - job-name: test eth2near/finality-update-verify
+          - job-name: test relayer
             cmd: |
-              cd eth2near/finality-update-verify
-              ./test.sh
-            timeout-minutes: 20
-
-          - job-name: test eth2near/eth2-to-near-block-relay-rs
-            cmd: |
-              cd eth2near/eth2near-block-relay-rs
-              ./test.sh
-            timeout-minutes: 20
-
-          - job-name: test eth2near/eth2-contract-init
-            cmd: |
-              cd eth2near/eth2-contract-init
-              ./test.sh
-            timeout-minutes: 20
-
-          - job-name: test eth2near/eth_rpc_client
-            cmd: |
-              cd eth2near/eth_rpc_client
-              ./test.sh
+              cd relayer
+              rustup target add wasm32-unknown-unknown
+              cargo test
             timeout-minutes: 20
 
     name: ${{ matrix.job-name }}

.github/workflows/relayer-docker.yml

@@ -0,0 +1,64 @@
+name: Build and Push Relayer Docker Image
+
+on:
+  push:
+    paths:
+      - 'relayer/**'
+      - 'contracts/near/**'
+      - '.github/workflows/relayer-docker.yml'
+  release:
+    types: [published]
+  workflow_dispatch:
+
+env:
+  REGISTRY: europe-west4-docker.pkg.dev
+  PROJECT_ID: bridge-misc
+  REPOSITORY: omni-bridge-docker-images
+
+jobs:
+  build-and-push:
+    runs-on: warp-ubuntu-latest-x64-2x
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Authenticate to Google Cloud
+        uses: google-github-actions/auth@v2
+        with:
+          credentials_json: ${{ secrets.GCP_SA_KEY }}
+
+      - name: Configure Docker to use gcloud as credential helper
+        run: gcloud auth configure-docker ${{ env.REGISTRY }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.PROJECT_ID }}/${{ env.REPOSITORY }}/eth-relayer
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha,prefix={{branch}}
+            type=raw,value=latest,enable={{is_default_branch}}
+
+      - name: Build and push Docker image
+        id: build
+        uses: Warpbuilds/build-push-action@v6
+        with:
+          context: .
+          file: ./relayer/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64
+          profile-name: "bridge-docker-builder"
+
+      - name: Output image digest
+        run: echo "Image pushed with digest ${{ steps.build.outputs.digest }}"

contracts/near/Cargo.lock

@@ -28,7 +28,7 @@ tree_hash = "0.8"
 tree_hash_derive = "0.8"
 ethereum_ssz = "0.7"
 ethereum_ssz_derive = "0.7"
-ethereum_serde_utils = "0.7"
+ethereum_serde_utils = "0.8"
 ethereum_hashing = "0.7.0"
 derive_more = "^0.99.2"
 hex = "0.4.2"

contracts/near/Cargo.toml

@@ -9,7 +9,7 @@ repository.workspace = true
 # in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
-image = "sourcescan/cargo-near:0.13.2-rust-1.84.0"
+image = "sourcescan/cargo-near:0.16.0-rust-1.86.0"
 # tag after colon above serves only descriptive purpose; image is identified by digest
 image_digest = "sha256:b41cb89907f92b114da9e2be4e109bff30ab792c22ddcbd2a4cff8e340cb9acb"
 # list of environment variables names, whose values, if set, will be used as external build parameters

contracts/near/eth-prover/Cargo.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.84.0"
+channel = "1.86.0"

contracts/near/eth-prover/rust-toolchain

@@ -30,7 +30,7 @@ mod tests {
 
     // TESTS
 
-    use near_sdk::{testing_env, VMContext, NearToken};
+    use near_sdk::{testing_env, NearToken, VMContext};
 
     fn get_context(input: Vec<u8>) -> VMContext {
         VMContext {

contracts/near/eth-prover/src/tests.rs

@@ -80,7 +80,7 @@ mod tests_storage_proof {
 
     // TESTS
 
-    use near_sdk::{testing_env, VMContext, NearToken};
+    use near_sdk::{testing_env, NearToken, VMContext};
 
     fn get_context(input: Vec<u8>) -> VMContext {
         VMContext {