From 5768d905739acda0069d8f7ba0ae382524723f9b Mon Sep 17 00:00:00 2001 From: Pranay Valson Date: Fri, 24 Jan 2025 10:45:37 -0800 Subject: [PATCH] update ci to use ewm-das:latest Signed-off-by: Pranay Valson --- config/config.exs | 2 +- config/docker.exs | 2 +- config/test.exs | 2 +- docker-compose-ci.yml | 20 +++++++++++--------- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/config/config.exs b/config/config.exs index 40ef3890..537a7af6 100644 --- 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 index 2eb6aa0d..ed2ad1ef 100644 --- 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 index 65041d50..a9163570 100644 --- 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 index 0e34b06a..bbeb8d12 100644 --- 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:" $EWM_DAS_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;