Merge pull request #128 from covalenthq/develop

Rudder-DTM-RC:v0.2.10

config/config.exs

@@ -10,7 +10,8 @@ import Config
 config :rudder,
   ipfs_pinner_url: System.get_env("IPFS_PINNER_URL", "http://127.0.0.1:3001"),
   operator_private_key: System.get_env("BLOCK_RESULT_OPERATOR_PRIVATE_KEY"),
-  proofchain_address: "0x4f2E285227D43D9eB52799D0A28299540452446E",
+  bsp_proofchain_address: "0x4f2E285227D43D9eB52799D0A28299540452446E",
+  brp_proofchain_address: "0x4f2E285227D43D9eB52799D0A28299540452446E",
   proofchain_chain_id: 1284,
   block_specimen_chain_id: 1,
   proofchain_node: System.get_env("NODE_ETHEREUM_MAINNET"),

config/dev.exs

@@ -50,7 +50,8 @@ 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"),
-  proofchain_address: "0x19492a5019B30471aA8fa2c6D9d39c99b5Cda20C",
+  bsp_proofchain_address: "0x1BFa3b5E9bE2c5298B7DE11B5Acb08c37683f4eF",
+  brp_proofchain_address: "0xeFD84B6F1C04Ad9A7D666E21C9608a2ea2FE4B83",
   proofchain_chain_id: 1287,
   proofchain_node: System.get_env("NODE_ETHEREUM_MAINNET"),
   ipfs_pinner_url: System.get_env("IPFS_PINNER_URL"),

config/docker.exs

@@ -2,7 +2,8 @@ import Config
 
 config :rudder,
   operator_private_key: "8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba",
-  proofchain_address: "0xCF3d5540525D191D6492F1E0928d4e816c29778c",
+  bsp_proofchain_address: "0xce44d283b806C62698285D83c2Ca3F1e42Eb7112",
+  brp_proofchain_address: "0x3402ce1e416e082ed3Ba3d9dcba10353F3b64499",
   proofchain_chain_id: 31337,
   proofchain_node: "http://hardhat-node:8545/",
   ipfs_pinner_url: "http://ipfs-pinner:3001",

config/prod.exs

@@ -50,7 +50,8 @@ 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"),
-  proofchain_address: "0x4f2E285227D43D9eB52799D0A28299540452446E",
+  bsp_proofchain_address: "0x4f2E285227D43D9eB52799D0A28299540452446E",
+  brp_proofchain_address: "0x4f2E285227D43D9eB52799D0A28299540452446E",
   proofchain_chain_id: 1284,
   proofchain_node: System.get_env("NODE_ETHEREUM_MAINNET"),
   ipfs_pinner_url: System.get_env("IPFS_PINNER_URL"),

config/test.exs

@@ -2,7 +2,8 @@ import Config
 
 config :rudder,
   operator_private_key: "8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba",
-  proofchain_address: "0xCF3d5540525D191D6492F1E0928d4e816c29778c",
+  bsp_proofchain_address: "0xce44d283b806C62698285D83c2Ca3F1e42Eb7112",
+  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",

docker-compose-ci.yml

@@ -40,7 +40,7 @@ services:
       - "8008:8008"
 
   ipfs-pinner:
-    image: "us-docker.pkg.dev/covalent-project/network/ipfs-pinner:latest"
+    image: "us-docker.pkg.dev/covalent-project/network/ipfs-pinner:stable"
     volumes:
       - ~/.ipfs:/root/.ipfs/
     container_name: ipfs-pinner
@@ -57,7 +57,7 @@ services:
       - "3001:3001"
 
   evm-server:
-    image: "us-docker.pkg.dev/covalent-project/network/evm-server:latest"
+    image: "us-docker.pkg.dev/covalent-project/network/evm-server:stable"
     container_name: evm-server
     restart: on-failure
     expose:
@@ -78,9 +78,9 @@ services:
     restart: on-failure
     depends_on:
       ipfs-pinner:
-        condition: service_started
+        condition: service_healthy
       evm-server:
-        condition: service_started
+        condition: service_healthy
     entrypoint: >
       /bin/bash -l -c "
         echo "ipfs-node-address:" $IPFS_PINNER_URL;