update ci to use ewm-das:latest

Signed-off-by: Pranay Valson <pranay.valson@gmail.com>
covalenthq · Jan 24, 2025 · b7d2a8f · b7d2a8f
1 parent a4cbad3
commit b7d2a8f
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 33 deletions.
diff --git a/config/config.exs b/config/config.exs
@@ -8,7 +8,7 @@
 import Config
 
 config :refiner,
-  ipfs_pinner_url: System.get_env("IPFS_PINNER_URL", "http://127.0.0.1:3001"),
+  ipfs_pinner_url: System.get_env("IPFS_PINNER_URL", "http://127.0.0.1:5080"),
   operator_private_key: System.get_env("BLOCK_RESULT_OPERATOR_PRIVATE_KEY"),
   bsp_proofchain_address: "0x4f2E285227D43D9eB52799D0A28299540452446E",
   brp_proofchain_address: "0x4f2E285227D43D9eB52799D0A28299540452446E",

diff --git a/config/docker.exs b/config/docker.exs
@@ -6,5 +6,5 @@ config :refiner,
   brp_proofchain_address: "0x3402ce1e416e082ed3Ba3d9dcba10353F3b64499",
   proofchain_chain_id: 31337,
   proofchain_node: "http://hardhat-node:8545/",
-  ipfs_pinner_url: "http://ipfs-pinner:3001",
+  ipfs_pinner_url: "http://ewm-das:5080",
   evm_server_url: "http://evm-server:3002"
diff --git a/config/test.exs b/config/test.exs
@@ -6,5 +6,5 @@ config :refiner,
   brp_proofchain_address: "0x3402ce1e416e082ed3Ba3d9dcba10353F3b64499",
   proofchain_chain_id: 31337,
   proofchain_node: "http://127.0.0.1:8545/",
-  ipfs_pinner_url: "http://127.0.0.1:3001",
+  ipfs_pinner_url: "http://127.0.0.1:5080",
   evm_server_url: "http://127.0.0.1:3002"
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
@@ -40,11 +40,11 @@ services:
     ports:
       - "8008:8008"
 
-  ipfs-pinner:
-    image: "us-docker.pkg.dev/covalent-project/network/ipfs-pinner:stable"
+  ewm-das:
+    image: "us-docker.pkg.dev/covalent-project/network/ewm-das:latest"
     volumes:
       - ~/.ipfs:/root/.ipfs/
-    container_name: ipfs-pinner
+    container_name: ewm-das
     restart: on-failure
     entrypoint: |
       /bin/bash -l -c "
@@ -54,10 +54,11 @@ services:
         xxd -r -p proof_out_hex.txt > proof_from_hex.out;
         chmod +x proof_from_hex.out;
         mv ./proof_from_hex.out /root/.ipfs/proof_from_hex.out;
-        ./ipfs-server -port 3001 -w3-agent-key $W3_AGENT_KEY -w3-delegation-file $W3_DELEGATION_FILE;"
+        ./usr/local/bin/pinner --addr :5080 --w3-agent-key $W3_AGENT_KEY --w3-delegation-proof-path $W3_DELEGATION_FILE;"
     expose:
       - "4001:4001"
       - "3001:3001"
+      - "5080:5080"
     environment:
       - W3_AGENT_KEY=${W3_AGENT_KEY}
       - W3_DELEGATION_FILE=${W3_DELEGATION_FILE}
@@ -67,6 +68,7 @@ services:
     ports:
       - "4001:4001"
       - "3001:3001"
+      - "5080:5080"
 
   evm-server:
     image: "us-docker.pkg.dev/covalent-project/network/evm-server:latest"
@@ -83,19 +85,19 @@ services:
     image: "us-docker.pkg.dev/covalent-project/network/refiner:latest"
     container_name: refiner
     links:
-      - "ipfs-pinner:ipfs-pinner"
+      - "ewm-das:ewm-das"
     # build:
     #   context: .
     #   dockerfile: Dockerfile
     restart: on-failure
     depends_on:
-      ipfs-pinner:
+      ewm-das:
         condition: service_healthy
       evm-server:
         condition: service_healthy
     entrypoint: >
       /bin/bash -l -c "
-        echo "ipfs-node-address:" $IPFS_PINNER_URL;
+        echo "ewm-das-address:" $IPFS_PINNER_URL;
         echo "hardhat-node-address:" $NODE_ETHEREUM_MAINNET;
         echo "brp-op-pk:" $BLOCK_RESULT_OPERATOR_PRIVATE_KEY;
         echo "evm-server-address:" $EVM_SERVER_URL;
@@ -107,8 +109,8 @@ services:
         done;
         echo Proof-chain contracts deployed!;
         echo Uploading test files to local .ipfs...;
-        curl -F "filedata=@/app/mix/test-data/codec-0.37/encoded/1-20063050" http://ipfs-pinner:3001/upload;
-        curl -F "filedata=@/app/mix/test-data/codec-0.37/encoded/1-20063085" http://ipfs-pinner:3001/upload;
+        curl -F "filedata=@/app/mix/test-data/codec-0.37/encoded/1-20063050" http://ewm-das:5080/upload;
+        curl -F "filedata=@/app/mix/test-data/codec-0.37/encoded/1-20063085" http://ewm-das:5080/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
@@ -3,24 +3,25 @@ version: "3"
 # set .env such that all services in docker are talking to each other only
 
 services:
-  ipfs-pinner:
-    image: "us-docker.pkg.dev/covalent-project/network/ipfs-pinner:stable"
+  ewm-das:
+    image: "us-docker.pkg.dev/covalent-project/network/ewm-das:latest"
     volumes:
       - ~/.ipfs:/root/.ipfs/
-    container_name: ipfs-pinner
+    container_name: ewm-das
     restart: always
     labels:
       "autoheal": "true"
     expose:
       - "3001:3001"
+      - "5080:5080"
     environment:
       - W3_AGENT_KEY=${W3_AGENT_KEY}
       - W3_DELEGATION_FILE=/root/.ipfs/proof.out
     networks:
-      - cqt-net
+      - cxt-net
     ports:
       - "3001:3001"
-
+      - "5080:5080"
   evm-server:
     image: "us-docker.pkg.dev/covalent-project/network/evm-server:stable"
     container_name: evm-server
@@ -30,30 +31,30 @@ services:
     expose:
       - "3002:3002"
     networks:
-      - cqt-net
+      - cxt-net
     ports:
       - "3002:3002"
 
   refiner:
     image: "us-docker.pkg.dev/covalent-project/network/refiner:latest"
     container_name: refiner
     links:
-      - "ipfs-pinner:ipfs-pinner"
+      - "ewm-das:ewm-das"
       - "evm-server:evm-server"
     # build:
     #   context: .
     #   dockerfile: Dockerfile
     restart: always
     depends_on:
-      ipfs-pinner:
+      ewm-das:
         condition: service_healthy
       evm-server:
         condition: service_healthy
     entrypoint: >
       /bin/bash -l -c "
         echo "moonbase-node:" $NODE_ETHEREUM_MAINNET;
         echo "evm-server:" $EVM_SERVER_URL;
-        echo "ipfs-node:" $IPFS_PINNER_URL;
+        echo "ewm-das:" $IPFS_PINNER_URL;
         cd /mix;
         MIX_ENV=dev mix deps.get;
         MIX_ENV=dev mix release --overwrite;
@@ -64,7 +65,7 @@ services:
       - EVM_SERVER_URL=${EVM_SERVER_URL}
       - IPFS_PINNER_URL=${IPFS_PINNER_URL}
     networks:
-      - cqt-net
+      - cxt-net
     ports:
       - "9568:9568" # prometheus metrics will be exported at http://localhost:9568/metrics etc.
 
@@ -78,4 +79,4 @@ services:
       - CURL_TIMEOUT=30
 
 networks:
-  cqt-net:
+  cxt-net:
diff --git a/docker-compose-mbeam.yml b/docker-compose-mbeam.yml
@@ -2,11 +2,11 @@ version: "3"
 # runs the entire refiner pipeline with all supporting services (including refiner) in docker
 # set .env such that all services in docker are talking to each other only
 services:
-  ipfs-pinner:
-    image: "us-docker.pkg.dev/covalent-project/network/ipfs-pinner:stable"
+  ewm-das:
+    image: "us-docker.pkg.dev/covalent-project/network/ewm-das:stable"
     volumes:
       - ~/.ipfs:/root/.ipfs/
-    container_name: ipfs-pinner
+    container_name: ewm-das
     restart: always
     labels:
       "autoheal": "true"
@@ -17,7 +17,7 @@ services:
       - W3_AGENT_KEY=${W3_AGENT_KEY}
       - W3_DELEGATION_FILE=/root/.ipfs/proof.out
     networks:
-      - cqt-net
+      - cxt-net
     ports:
       - "4001:4001"
       - "3001:3001"
@@ -31,30 +31,30 @@ services:
     expose:
       - "3002:3002"
     networks:
-      - cqt-net
+      - cxt-net
     ports:
       - "3002:3002"
 
   refiner:
     image: "us-docker.pkg.dev/covalent-project/network/refiner:stable"
     container_name: refiner
     links:
-      - "ipfs-pinner:ipfs-pinner"
+      - "ewm-das:ewm-das"
       - "evm-server:evm-server"
     # build:
     #   context: .
     #   dockerfile: Dockerfile
     restart: always
     depends_on:
-      ipfs-pinner:
+      ewm-das:
         condition: service_healthy
       evm-server:
         condition: service_healthy
     entrypoint: >
       /bin/bash -l -c "
         echo "moonbeam-node:" $NODE_ETHEREUM_MAINNET;
         echo "evm-server:" $EVM_SERVER_URL;
-        echo "ipfs-node:" $IPFS_PINNER_URL;
+        echo "ewm-das:" $IPFS_PINNER_URL;
         cd /mix;
         MIX_ENV=prod mix deps.get;
         MIX_ENV=prod mix release --overwrite;
@@ -65,7 +65,7 @@ services:
       - EVM_SERVER_URL=${EVM_SERVER_URL}
       - IPFS_PINNER_URL=${IPFS_PINNER_URL}
     networks:
-      - cqt-net
+      - cxt-net
     ports:
       - "9568:9568"
 
@@ -79,4 +79,4 @@ services:
       - CURL_TIMEOUT=30
 
 networks:
-  cqt-net:
+  cxt-net: