Merge pull request #195 from covalenthq/develop

Rudder-DTM-RC:v0.4.1 (Dencun upgrade)
covalenthq · Mar 16, 2024 · b680aae · b680aae
2 parents ba2cd9a + 09afb81
commit b680aae
Show file tree

Hide file tree

Showing 24 changed files with 90,958 additions and 62 deletions.
diff --git a/.github/workflows/docker-ci-test.yaml b/.github/workflows/docker-ci-test.yaml
@@ -26,9 +26,9 @@ jobs:
           password: ${{ secrets.GCR_JSON_KEY }}
 
       - uses: actions/checkout@v2
-      # - uses: satackey/action-docker-layer-caching@v0.0.10
-      #   # Ignore the failure of a step and avoid terminating the job.
-      #   continue-on-error: true
+        # - uses: satackey/action-docker-layer-caching@v0.0.10
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
       - name: Build & Publish the Docker image
         run: |
           docker buildx create --name builder --use --platform=linux/amd64,linux/arm64  && docker buildx build --platform=linux/amd64,linux/arm64 . -t  us-docker.pkg.dev/covalent-project/network/refiner:latest --push

diff --git a/config/dev.exs b/config/dev.exs
@@ -50,9 +50,11 @@ config :phoenix, :plug_init_mode, :runtime
 # Default these should point to moonbase alpha since we do all the development testing there
 config :rudder,
   operator_private_key: System.get_env("BLOCK_RESULT_OPERATOR_PRIVATE_KEY"),
-  bsp_proofchain_address: "0x30F220B44E937dd6A2A43D91D564E259f3574eb8",
-  brp_proofchain_address: "0x3f91F5034dACc2961F62dCF744286540C8786710",
-  proofchain_chain_id: 1287,
+  bsp_proofchain_address:
+    System.get_env("BSP_PROOFCHAIN_ADDRESS", "0x916B54696A70588a716F899bE1e8f2A5fFd5f135"),
+  brp_proofchain_address:
+    System.get_env("BRP_PROOFCHAIN_ADDRESS", "0xCBC44F143FB5baf26e45FB6C7A4fC13e6ca0fa09"),
+  proofchain_chain_id: Integer.parse(System.get_env("PROOFCHAIN_CHAIN_ID", "1287")) |> elem(0),
   proofchain_node: System.get_env("NODE_ETHEREUM_MAINNET"),
   ipfs_pinner_url: System.get_env("IPFS_PINNER_URL"),
   evm_server_url: System.get_env("EVM_SERVER_URL")
diff --git a/config/prod.exs b/config/prod.exs
@@ -50,9 +50,11 @@ config :phoenix, :plug_init_mode, :runtime
 # Default these should point to moonbeam since we do all prod deployments there
 config :refiner,
   operator_private_key: System.get_env("BLOCK_RESULT_OPERATOR_PRIVATE_KEY"),
-  bsp_proofchain_address: "0x4f2E285227D43D9eB52799D0A28299540452446E",
-  brp_proofchain_address: "0x254E3FA072324fa202577F24147066359947bC23",
-  proofchain_chain_id: 1284,
+  bsp_proofchain_address:
+    System.get_env("BSP_PROOFCHAIN_ADDRESS", "0x4f2E285227D43D9eB52799D0A28299540452446E"),
+  brp_proofchain_address:
+    System.get_env("BRP_PROOFCHAIN_ADDRESS", "0x254E3FA072324fa202577F24147066359947bC23"),
+  proofchain_chain_id: Integer.parse(System.get_env("PROOFCHAIN_CHAIN_ID", "1284")) |> elem(0),
   proofchain_node: System.get_env("NODE_ETHEREUM_MAINNET"),
   ipfs_pinner_url: System.get_env("IPFS_PINNER_URL"),
   evm_server_url: System.get_env("EVM_SERVER_URL")
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
@@ -69,7 +69,7 @@ services:
       - "3001:3001"
 
   evm-server:
-    image: "us-docker.pkg.dev/covalent-project/network/evm-server:stable"
+    image: "us-docker.pkg.dev/covalent-project/network/evm-server:latest"
     container_name: evm-server
     restart: on-failure
     expose:
@@ -107,8 +107,8 @@ services:
         done;
         echo Proof-chain contracts deployed!;
         echo Uploading test files to local .ipfs...;
-        curl -F "filedata=@/app/test-data/codec-0.35/encoded/1-17090940-replica-0x7b8e1d463a0fbc6fce05b31c5c30e605aa13efaca14a1f3ba991d33ea979b12b" http://ipfs-pinner:3001/upload;
-        curl -F "filedata=@/app/test-data/codec-0.35/encoded/1-17090960-replica-0xc95d44182ee006e79f1352ef32664210f383baa016988d5ab2fd950b52bf22ff" http://ipfs-pinner:3001/upload;
+        curl -F "filedata=@/app/test-data/codec-0.36/encoded/1-19434485-replica-0x5800aab40ca1c9aedae3329ad82ad051099edaa293d68504b987a12acfa7b799" http://ipfs-pinner:3001/upload;
+        curl -F "filedata=@/app/test-data/codec-0.36/encoded/1-19434555-replica-0x3e6af5a88c6205e03364e4a8e4d6d558d53bbea0ed9398df0ee078e6bce3086e" http://ipfs-pinner:3001/upload;
         echo Test bsp files uploaded!;
         cd /mix;
         MIX_ENV=docker mix coveralls.json;

diff --git a/docker-compose-mbase.yml b/docker-compose-mbase.yml
@@ -22,7 +22,7 @@ services:
       - "3001:3001"
 
   evm-server:
-    image: "us-docker.pkg.dev/covalent-project/network/evm-server:stable"
+    image: "us-docker.pkg.dev/covalent-project/network/evm-server:latest"
     container_name: evm-server
     restart: always
     labels:
@@ -62,6 +62,9 @@ services:
       - BLOCK_RESULT_OPERATOR_PRIVATE_KEY=${BLOCK_RESULT_OPERATOR_PRIVATE_KEY}
       - EVM_SERVER_URL=${EVM_SERVER_URL}
       - IPFS_PINNER_URL=${IPFS_PINNER_URL}
+      - BSP_PROOFCHAIN_ADDRESS=${BSP_PROOFCHAIN_ADDRESS}
+      - BRP_PROOFCHAIN_ADDRESS=${BRP_PROOFCHAIN_ADDRESS}
+      - PROOFCHAIN_CHAIN_ID=${PROOFCHAIN_CHAIN_ID}
     networks:
       - cqt-net
     ports:

diff --git a/docker-compose-mbeam.yml b/docker-compose-mbeam.yml
@@ -23,7 +23,7 @@ services:
       - "3001:3001"
 
   evm-server:
-    image: "us-docker.pkg.dev/covalent-project/network/evm-server:stable"
+    image: "us-docker.pkg.dev/covalent-project/network/evm-server:latest"
     container_name: evm-server
     restart: always
     labels:
@@ -63,6 +63,9 @@ services:
       - BLOCK_RESULT_OPERATOR_PRIVATE_KEY=${BLOCK_RESULT_OPERATOR_PRIVATE_KEY}
       - EVM_SERVER_URL=${EVM_SERVER_URL}
       - IPFS_PINNER_URL=${IPFS_PINNER_URL}
+      - BSP_PROOFCHAIN_ADDRESS=${BSP_PROOFCHAIN_ADDRESS}
+      - BRP_PROOFCHAIN_ADDRESS=${BRP_PROOFCHAIN_ADDRESS}
+      - PROOFCHAIN_CHAIN_ID=${PROOFCHAIN_CHAIN_ID}
     networks:
       - cqt-net
     ports:

diff --git a/mix.exs b/mix.exs
@@ -63,7 +63,7 @@ defmodule Refiner.MixProject do
       # networking
       {:certifi, "~> 2.9", override: true},
       {:cors_plug, "~> 3.0"},
-      {:finch, "~> 0.17.0"},
+      {:finch, "~> 0.18.0"},
       {:downstream, "~> 1.0"},
       {:websockex, "~> 0.4.3"},
       {:multipart, "~> 0.4.0"},