Merge pull request #300 from covalenthq/develop

Enable `bsp-agent` to work with `ewm-das`
covalenthq · Jan 27, 2025 · 608a8b2 · 608a8b2
2 parents 8aeb554 + f9ce3c0
commit 608a8b2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
@@ -1,11 +1,11 @@
 version: "3"
 
 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: on-failure
     entrypoint: |
       /bin/bash -l -c "
@@ -15,16 +15,17 @@ 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;"
     environment:
       - W3_AGENT_KEY=${W3_AGENT_KEY}
       - W3_DELEGATION_FILE=${W3_DELEGATION_FILE}
       - PROOF_OUT_HEX=${PROOF_OUT_HEX}
     networks:
-      - cqt-net
+      - cxt-net
     ports:
       - "4001:4001"
       - "3001:3001"
+      - "5080:5080"
 
   redis:
     image: redis:alpine
@@ -38,7 +39,7 @@ services:
     environment:
       - REDIS_REPLICATION_MODE=master
     networks:
-      - cqt-net
+      - cxt-net
     entrypoint: redis-server #/usr/local/etc/redis/redis.conf
     ports:
       - "6379:6379"
@@ -53,7 +54,7 @@ services:
     environment:
       - REDIS_HOSTS=local:redis:6379
     networks:
-      - cqt-net
+      - cxt-net
     ports:
       - "8081:8081"
 
@@ -77,7 +78,7 @@ services:
     depends_on:
       - redis-commander
     networks:
-      - cqt-net
+      - cxt-net
     ports:
       - "8545:8545"
 
@@ -95,7 +96,7 @@ services:
     depends_on:
       - node
     networks:
-      - cqt-net
+      - cxt-net
     environment:
       npm_config_user: "root"
     ports:
@@ -113,7 +114,7 @@ services:
     depends_on:
       cqt-virtnet:
         condition: service_started
-      ipfs-pinner:
+      ewm-das:
         condition: service_started
     entrypoint: >
       /bin/bash -l -c "
@@ -123,16 +124,16 @@ services:
         sleep 1;
         done;
         echo proof-chain contracts deployed!;
-        ./bsp-agent --redis-url=redis://username:@redis:6379/0?topic=replication#replicate --avro-codec-path=./codec/block-ethereum.avsc --binary-file-path=./bin/block-ethereum/  --block-divisor=3  --log-folder ./logs/ --metrics --metrics.port 6063 --metrics.addr 0.0.0.0 --proof-chain-address=0xEa2ff902dbeEECcc828757B881b343F9316752e5 --consumer-timeout=15 --ipfs-pinner-server="http://ipfs-pinner:3001/";
+        ./bsp-agent --redis-url=redis://username:@redis:6379/0?topic=replication#replicate --avro-codec-path=./codec/block-ethereum.avsc --binary-file-path=./bin/block-ethereum/  --block-divisor=3  --log-folder ./logs/ --metrics --metrics.port 6063 --metrics.addr 0.0.0.0 --proof-chain-address=0xEa2ff902dbeEECcc828757B881b343F9316752e5 --consumer-timeout=15 --ipfs-pinner-server="http://ewm-das:5080/";
         exit 0;"
     environment:
       - MB_PRIVATE_KEY=${PRIVATE_KEY}
       - MB_RPC_URL=${RPC_URL}
       - BLOCKCHAIN=${BLOCKCHAIN}
     networks:
-      - cqt-net
+      - cxt-net
     ports:
       - "8080:8080"
 
 networks:
-  cqt-net:
+  cxt-net:
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
@@ -1,11 +1,11 @@
-version: '3'
+version: "3"
 
 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: on-failure
     entrypoint: |
       /bin/bash -l -c "
@@ -15,7 +15,7 @@ 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;"
     environment:
       - W3_AGENT_KEY=${W3_AGENT_KEY}
       - W3_DELEGATION_FILE=${W3_DELEGATION_FILE}
@@ -69,11 +69,11 @@ services:
       - --deterministic
       - --db=/ganache_data
       - --mnemonic
-      - 'minimum symptom minute gloom tragic situate silver mechanic salad amused elite beef'
+      - "minimum symptom minute gloom tragic situate silver mechanic salad amused elite beef"
       - --networkId
-      - '5777'
+      - "5777"
       - --hostname
-      - '0.0.0.0'
+      - "0.0.0.0"
     depends_on:
       - redis-commander
     networks:
@@ -123,7 +123,7 @@ services:
         sleep 1;
         done;
         echo proof-chain contracts deployed!;
-        ./bsp-agent --redis-url=redis://username:@redis:6379/0?topic=replication-2#replicate --avro-codec-path=./codec/block-ethereum.avsc --binary-file-path=./bin/block-ethereum/  --block-divisor=3  --log-folder ./logs/ --metrics --metrics.port 6063 --metrics.addr 0.0.0.0 --proof-chain-address=0xEa2ff902dbeEECcc828757B881b343F9316752e5 --consumer-timeout=100000 --ipfs-pinner-server="http://ipfs-pinner:3001/";
+        ./bsp-agent --redis-url=redis://username:@redis:6379/0?topic=replication-2#replicate --avro-codec-path=./codec/block-ethereum.avsc --binary-file-path=./bin/block-ethereum/  --block-divisor=3  --log-folder ./logs/ --metrics --metrics.port 6063 --metrics.addr 0.0.0.0 --proof-chain-address=0xEa2ff902dbeEECcc828757B881b343F9316752e5 --consumer-timeout=100000 --ipfs-pinner-server="http://ewm-das:3001/";
         exit 0;"
     environment:
       - MB_PRIVATE_KEY=${PRIVATE_KEY}