apply changes

iExecBlockchainComputing · Jul 12, 2024 · 0b4538b · 0b4538b
1 parent 12a57b8
commit 0b4538b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ Ensure `config.json` is populated with the required values. Example:
 ```json
 {
  "bellecour": {
- "STARTBLOCK": 4543300,
+ "START_BLOCK": 4543300,
  "ERC1538_ADDRESS": "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "IEXECE_INTERFACE_TOKEN_CORE_ADDRESS": "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "APP_REGISTRY_ADDRESS": "0xB1C52075b276f87b1834919167312221d50c9D16",

diff --git a/config.json b/config.json
@@ -1,54 +1,54 @@
 {
  "bellecour": {
- "STARTBLOCK": 4543300,
+ "START_BLOCK": 4543300,
  "ERC1538_ADDRESS" : "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "IEXECE_INTERFACE_TOKEN_CORE_ADDRESS" : "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "APP_REGISTRY_ADDRESS" : "0xB1C52075b276f87b1834919167312221d50c9D16",
  "DATATSET_REGISTRY_ADDRESS" : "0x799DAa22654128d0C64d5b79eac9283008158730",
  "WORKERPOOL_REGISTRY_ADDRESS" : "0xC76A18c78B7e530A165c5683CB1aB134E21938B4"
  },
  "c13": {
- "STARTBLOCK": 4543300,
+ "START_BLOCK": 4543300,
  "ERC1538_ADDRESS" : "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "IEXECE_INTERFACE_TOKEN_CORE_ADDRESS" : "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "APP_REGISTRY_ADDRESS" : "0xB1C52075b276f87b1834919167312221d50c9D16",
  "DATATSET_REGISTRY_ADDRESS" : "0x799DAa22654128d0C64d5b79eac9283008158730",
  "WORKERPOOL_REGISTRY_ADDRESS" : "0xC76A18c78B7e530A165c5683CB1aB134E21938B4"
  },
  "goerli": {
- "STARTBLOCK": 2564000,
+ "START_BLOCK": 2564000,
  "ERC1538_ADDRESS" : "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "IEXECE_INTERFACE_TOKEN_CORE_ADDRESS" : "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "APP_REGISTRY_ADDRESS" : "0xB1C52075b276f87b1834919167312221d50c9D16",
  "DATATSET_REGISTRY_ADDRESS" : "0x799DAa22654128d0C64d5b79eac9283008158730",
  "WORKERPOOL_REGISTRY_ADDRESS" : "0xC76A18c78B7e530A165c5683CB1aB134E21938B4"
  },
  "mainnet": {
- "STARTBLOCK": 9917600,
+ "START_BLOCK": 9917600,
  "ERC1538_ADDRESS" : "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "IEXECE_INTERFACE_TOKEN_CORE_ADDRESS" : "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "APP_REGISTRY_ADDRESS" : "0xB1C52075b276f87b1834919167312221d50c9D16",
  "DATATSET_REGISTRY_ADDRESS" : "0x799DAa22654128d0C64d5b79eac9283008158730",
  "WORKERPOOL_REGISTRY_ADDRESS" : "0xC76A18c78B7e530A165c5683CB1aB134E21938B4"
  },
  "rinkeby": {
- "STARTBLOCK": 6355862,
+ "START_BLOCK": 6355862,
  "ERC1538_ADDRESS" : "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "IEXECE_INTERFACE_TOKEN_CORE_ADDRESS" : "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "APP_REGISTRY_ADDRESS" : "0xB1C52075b276f87b1834919167312221d50c9D16",
  "DATATSET_REGISTRY_ADDRESS" : "0x799DAa22654128d0C64d5b79eac9283008158730",
  "WORKERPOOL_REGISTRY_ADDRESS" : "0xC76A18c78B7e530A165c5683CB1aB134E21938B4"
  },
  "viviani": {
- "STARTBLOCK": 5556000,
+ "START_BLOCK": 5556000,
  "ERC1538_ADDRESS" : "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "IEXECE_INTERFACE_TOKEN_CORE_ADDRESS" : "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
  "APP_REGISTRY_ADDRESS" : "0xB1C52075b276f87b1834919167312221d50c9D16",
  "DATATSET_REGISTRY_ADDRESS" : "0x799DAa22654128d0C64d5b79eac9283008158730",
  "WORKERPOOL_REGISTRY_ADDRESS" : "0xC76A18c78B7e530A165c5683CB1aB134E21938B4"
  },
  "test": {
- "STARTBLOCK": 0,
+ "START_BLOCK": 0,
  "ERC1538_ADDRESS" : "0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca",
  "IEXECE_INTERFACE_TOKEN_CORE_ADDRESS" : "0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca",
  "APP_REGISTRY_ADDRESS" : "0xbB66c75dc79D21E8A5b9EF5DE346021082469892",

diff --git a/generate_subgraph.sh b/generate_subgraph.sh
@@ -6,14 +6,19 @@ if ! command -v jq &> /dev/null; then
  exit 1
 fi
 
+if [ -z "$1" ]; then
+ echo "Usage: $0 <network-name>"
+ exit 1
+fi
+
 generate_yaml() {
  local network=$1
  local config_file="config.json"
  local template_file="subgraph.bellecour.template.yaml"
  local output_file="subgraph.${network}.yaml"
 
  # Read values from config.json
- local start_block=$(jq -r ".${network}.STARTBLOCK" ${config_file})
+ local start_block=$(jq -r ".${network}.START_BLOCK" ${config_file})
  local erc1538_address=$(jq -r ".${network}.ERC1538_ADDRESS" ${config_file})
  local core_address=$(jq -r ".${network}.IEXECE_INTERFACE_TOKEN_CORE_ADDRESS" ${config_file})
  local app_registry_address=$(jq -r ".${network}.APP_REGISTRY_ADDRESS" ${config_file})
@@ -22,7 +27,7 @@ generate_yaml() {
 
  # Replace placeholders in the template and create the output file
  sed -e "s/#NETWORK_NAME#/network: ${network}/g" \
- -e "s/#STARTBLOCK#/startBlock: ${start_block}/g" \
+ -e "s/#START_BLOCK#/startBlock: ${start_block}/g" \
  -e "s|#ERC1538_ADDRESS#|address: \"${erc1538_address}\"|g" \
  -e "s|#IEXECE_INTERFACE_TOKEN_CORE_ADDRESS#|address: \"${core_address}\"|g" \
  -e "s|#APP_REGISTRY_ADDRESS#|address: \"${app_registry_address}\"|g" \
@@ -33,12 +38,6 @@ generate_yaml() {
  echo "Generated ${output_file}"
 }
 
-
-if [ -z "$1" ]; then
- echo "Usage: $0 <network-name>"
- exit 1
-fi
-
 network_name=$1
 
 generate_yaml ${network_name}
diff --git a/subgraph.bellecour.template.yaml b/subgraph.bellecour.template.yaml
@@ -24,7 +24,7 @@ dataSources:
  source:
  #ERC1538_ADDRESS#
  abi: ERC1538
- #STARTBLOCK#
+ #START_BLOCK#
  mapping:
  kind: ethereum/events
  apiVersion: 0.0.6
@@ -50,7 +50,7 @@ dataSources:
  source:
  #IEXECE_INTERFACE_TOKEN_CORE_ADDRESS#
  abi: IexecInterfaceToken
- #STARTBLOCK#
+ #START_BLOCK#
  mapping:
  kind: ethereum/events
  apiVersion: 0.0.6
@@ -130,7 +130,7 @@ dataSources:
  source:
  #APP_REGISTRY_ADDRESS#
  abi: AppRegistry
- #STARTBLOCK#
+ #START_BLOCK#
  mapping:
  kind: ethereum/events
  apiVersion: 0.0.6
@@ -155,7 +155,7 @@ dataSources:
  source:
  #DATATSET_REGISTRY_ADDRESS#
  abi: DatasetRegistry
- #STARTBLOCK#
+ #START_BLOCK#
  mapping:
  kind: ethereum/events
  apiVersion: 0.0.6
@@ -180,7 +180,7 @@ dataSources:
  source:
  #WORKERPOOL_REGISTRY_ADDRESS#
  abi: WorkerpoolRegistry
- #STARTBLOCK#
+ #START_BLOCK#
  mapping:
  kind: ethereum/events
  apiVersion: 0.0.6