refactor: remove ERC1538 references and update related configurations (#52)

Author: Le-Caignec

README.md

@@ -109,10 +109,6 @@ To add support for a new network, update the `networks.json` file with the netwo
 ```json
 {
     "network-name": {
-        "ERC1538": {
-            "address": "0x...",
-            "startBlock": 1234567
-        },
         "Core": {
             "address": "0x...",
             "startBlock": 1234567
@@ -148,3 +144,8 @@ The deployment process will automatically generate the appropriate subgraph conf
 ## Resources
 
 - [thegraph docs](https://thegraph.com/docs/en/)
+
+## TODO
+
+- Rename the `Core` key to `Diamond` in `networks.json` and update all references accordingly.
+- Remove support and configuration entries for the `bellecour` network from `networks.json`, GHA pipeline, and related documentation.

networks.json

@@ -1,9 +1,5 @@
 {
     "fuji": {
-        "ERC1538": {
-            "address": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
-            "startBlock": 39496461
-        },
         "Core": {
             "address": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
             "startBlock": 39496461
@@ -22,32 +18,24 @@
         }
     },
     "arbitrum-sepolia": {
-        "ERC1538": {
-            "address": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
-            "startBlock": 145249746
-        },
         "Core": {
-            "address": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
-            "startBlock": 145249746
+            "address": "0xB2157BF2fAb286b2A4170E3491Ac39770111Da3E",
+            "startBlock": 178282956
         },
         "AppRegistry": {
-            "address": "0x4a6531ce5150ee716b2d93865D0fbB9ce5492D17",
-            "startBlock": 145249746
+            "address": "0x9950D94fb074182ee93ff79A50Cd698C4983281F",
+            "startBlock": 178283215
         },
         "DatasetRegistry": {
-            "address": "0x3441A0C9FE488c51fcABa2bAAA048720f4D4F72D",
-            "startBlock": 145249746
+            "address": "0x07Cc4E1EA30dD02796795876509A3BfC5053128D",
+            "startBlock": 178283257
         },
         "WorkerpoolRegistry": {
-            "address": "0xf81970E3CB0f8711bEaA79135e686873FfbBAC4A",
-            "startBlock": 145249746
+            "address": "0xe3c13bb4A5068601c6A08041Cb50887B07B5F398",
+            "startBlock": 178283233
         }
     },
     "arbitrum-one": {
-        "ERC1538": {
-            "address": "0x0000000000000000000000000000000000000000",
-            "startBlock": 0
-        },
         "Core": {
             "address": "0x0000000000000000000000000000000000000000",
             "startBlock": 0
@@ -66,10 +54,6 @@
         }
     },
     "bellecour": {
-        "ERC1538": {
-            "address": "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
-            "startBlock": 4543300
-        },
         "Core": {
             "address": "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
             "startBlock": 4543300
@@ -88,10 +72,6 @@
         }
     },
     "mainnet": {
-        "ERC1538": {
-            "address": "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
-            "startBlock": 9917600
-        },
         "Core": {
             "address": "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
             "startBlock": 9917600

package-lock.json

@@ -56,7 +56,6 @@
     "zod": "^3.24.3"
   },
   "dependencies": {
-    "@iexec/poco": "^5.5.0",
-    "@iexec/solidity": "^0.1.1"
+    "@iexec/poco": "^5.5.0"
   }
 }

package.json

@@ -27,42 +27,6 @@ type Transaction @entity {
   workerpoolEvents: [WorkerpoolEvent!]! @derivedFrom(field: "transaction")
   ressourceTransferEvent: [RessourceTransferEvent!]!
     @derivedFrom(field: "transaction")
-  erc1538Events: [ERC1538Event!]! @derivedFrom(field: "transaction")
-}
-
-# ================================== ERC1538 ==================================
-type ERC1538Module @entity {
-  id: ID!
-  functions: [ERC1538Function!]! @derivedFrom(field: "module")
-}
-
-type ERC1538Function @entity {
-  id: ID!
-  module: ERC1538Module!
-  name: String!
-  updates: [ERC1538FunctionUpdate!]! @derivedFrom(field: "functionId")
-}
-
-interface ERC1538Event {
-  id: ID!
-  transaction: Transaction!
-  timestamp: BigInt!
-}
-
-type ERC1538FunctionUpdate implements ERC1538Event @entity {
-  id: ID!
-  transaction: Transaction!
-  timestamp: BigInt!
-  functionId: ERC1538Function!
-  oldmodule: ERC1538Module!
-  newmodule: ERC1538Module!
-}
-
-type ERC1538CommitMessage implements ERC1538Event @entity {
-  id: ID!
-  transaction: Transaction!
-  timestamp: BigInt!
-  message: String!
 }
 
 # ============================== Address objects ==============================

schema.graphql

@@ -7,29 +7,6 @@ repository: https://github.com/iExecBlockchainComputing/PoCo-subgraph
 schema:
   file: ./schema.graphql
 dataSources:
-  - name: ERC1538
-    kind: ethereum/contract
-    source:
-      abi: ERC1538
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.6
-      language: wasm/assemblyscript
-      entities:
-        - ERC1538Module
-        - ERC1538Function
-        - ERC1538FunctionUpdateEvent
-        - ERC1538CommitMessageEvent
-      abis:
-        - name: ERC1538
-          file: node_modules/@iexec/solidity/build/contracts/IERC1538.json
-      eventHandlers:
-        - event: CommitMessage(string)
-          handler: handleCommitMessage
-        - event: FunctionUpdate(indexed bytes4,indexed address,indexed address,string)
-          handler: handleFunctionUpdate
-      file: ./src/ERC1538/ERC1538.ts
-
   - name: Core
     kind: ethereum/contract
     source:

src/ERC1538/ERC1538.ts

@@ -12,7 +12,7 @@ const client = new ApolloClient({
     cache: new InMemoryCache(),
 });
 const networkName = env.NETWORK_NAME!;
-const iexecProxyAddress = (config as any)[networkName].ERC1538.address;
+const iexecProxyAddress = (config as any)[networkName].Core.address;
 
 describe('Integration tests', () => {
     it('should index a newly created app', async () => {