Ormpipe v2 for crab with arbitrum-sepolia (#142)

* subapi * subapi * ormp protocol * ormp oracle * ormp relayer * update start block for crab * update networks * update scripts * update config and entities name * update address * add seq to oracle and relayer assigned * fix test * update address
darwinia-network · Oct 24, 2023 · b4a8e47 · b4a8e47
1 parent 599ac70
commit b4a8e47
Show file tree

Hide file tree

Showing 13 changed files with 535 additions and 357 deletions.
diff --git a/thegraph/ormpipe/README.md b/thegraph/ormpipe/README.md
diff --git a/thegraph/ormpipe/abis/AirnodeDapi.json → thegraph/ormpipe/abis/Subapi.json b/thegraph/ormpipe/abis/AirnodeDapi.json → thegraph/ormpipe/abis/Subapi.json
@@ -1,10 +1,8 @@
 [
   {
     "inputs": [
-      { "internalType": "string", "name": "name_", "type": "string" },
-      { "internalType": "address", "name": "airnodeRrp", "type": "address" },
       { "internalType": "address", "name": "dao", "type": "address" },
-      { "internalType": "uint256", "name": "fee_", "type": "uint256" }
+      { "internalType": "address", "name": "ormp", "type": "address" }
     ],
     "stateMutability": "nonpayable",
     "type": "constructor"
@@ -34,7 +32,7 @@
           }
         ],
         "indexed": false,
-        "internalType": "struct AirnodeMessageRootDapi.Beacon",
+        "internalType": "struct SubAPI.Beacon",
         "name": "beacon",
         "type": "tuple"
       }
@@ -46,32 +44,17 @@
     "anonymous": false,
     "inputs": [
       {
+        "components": [
+          { "internalType": "uint256", "name": "count", "type": "uint256" },
+          { "internalType": "bytes32", "name": "root", "type": "bytes32" }
+        ],
         "indexed": false,
-        "internalType": "bytes32",
-        "name": "msgRoot",
-        "type": "bytes32"
-      }
-    ],
-    "name": "AggregatedMessageRoot",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "beaconId",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes32",
-        "name": "msgRoot",
-        "type": "bytes32"
+        "internalType": "struct SubAPIFeed.ORMPData",
+        "name": "ormpData",
+        "type": "tuple"
       }
     ],
-    "name": "AirnodeMessageRootFeedUpdated",
+    "name": "AggregatedORMPData",
     "type": "event"
   },
   {
@@ -169,6 +152,36 @@
     "name": "RemoveBeacon",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "beaconId",
+        "type": "bytes32"
+      },
+      {
+        "components": [
+          { "internalType": "uint256", "name": "count", "type": "uint256" },
+          { "internalType": "bytes32", "name": "root", "type": "bytes32" }
+        ],
+        "indexed": false,
+        "internalType": "struct SubAPIFeed.ORMPData",
+        "name": "msgRoot",
+        "type": "tuple"
+      }
+    ],
+    "name": "SubAPIFeedUpdated",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "ORMP",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "acceptOwnership",
@@ -193,7 +206,7 @@
             "type": "address"
           }
         ],
-        "internalType": "struct AirnodeMessageRootDapi.Beacon",
+        "internalType": "struct SubAPI.Beacon",
         "name": "beacon",
         "type": "tuple"
       }
@@ -249,7 +262,7 @@
             "type": "address"
           }
         ],
-        "internalType": "struct AirnodeMessageRootDapi.Beacon",
+        "internalType": "struct SubAPI.Beacon",
         "name": "beacon",
         "type": "tuple"
       }
@@ -261,6 +274,32 @@
     "stateMutability": "pure",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "components": [
+          { "internalType": "uint256", "name": "count", "type": "uint256" },
+          { "internalType": "bytes32", "name": "root", "type": "bytes32" }
+        ],
+        "internalType": "struct SubAPIFeed.ORMPData",
+        "name": "a",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          { "internalType": "uint256", "name": "count", "type": "uint256" },
+          { "internalType": "bytes32", "name": "root", "type": "bytes32" }
+        ],
+        "internalType": "struct SubAPIFeed.ORMPData",
+        "name": "b",
+        "type": "tuple"
+      }
+    ],
+    "name": "eq",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "pure",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "fee",
@@ -293,7 +332,15 @@
     ],
     "name": "getDataFeedWithId",
     "outputs": [
-      { "internalType": "bytes32", "name": "msgRoot", "type": "bytes32" }
+      {
+        "components": [
+          { "internalType": "uint256", "name": "count", "type": "uint256" },
+          { "internalType": "bytes32", "name": "root", "type": "bytes32" }
+        ],
+        "internalType": "struct SubAPIFeed.ORMPData",
+        "name": "msgRoot",
+        "type": "tuple"
+      }
     ],
     "stateMutability": "view",
     "type": "function"
@@ -326,6 +373,13 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "localCommitment",
+    "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "messageRoot",
@@ -340,6 +394,32 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "components": [
+          { "internalType": "uint256", "name": "count", "type": "uint256" },
+          { "internalType": "bytes32", "name": "root", "type": "bytes32" }
+        ],
+        "internalType": "struct SubAPIFeed.ORMPData",
+        "name": "a",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          { "internalType": "uint256", "name": "count", "type": "uint256" },
+          { "internalType": "bytes32", "name": "root", "type": "bytes32" }
+        ],
+        "internalType": "struct SubAPIFeed.ORMPData",
+        "name": "b",
+        "type": "tuple"
+      }
+    ],
+    "name": "neq",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "pure",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "owner",
@@ -354,6 +434,16 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "remoteCommitment",
+    "outputs": [
+      { "internalType": "uint256", "name": "count", "type": "uint256" },
+      { "internalType": "bytes32", "name": "root", "type": "bytes32" }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       { "internalType": "bytes32", "name": "beaconId", "type": "bytes32" }
@@ -387,7 +477,7 @@
             "type": "address"
           }
         ],
-        "internalType": "struct AirnodeMessageRootDapi.Beacon[]",
+        "internalType": "struct SubAPI.Beacon[]",
         "name": "beacons",
         "type": "tuple[]"
       }
@@ -397,6 +487,15 @@
     "stateMutability": "payable",
     "type": "function"
   },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "_airnodeRrp", "type": "address" }
+    ],
+    "name": "setAirnodeRrp",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       { "internalType": "uint256", "name": "fee_", "type": "uint256" }
@@ -406,6 +505,13 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [{ "internalType": "string", "name": "name_", "type": "string" }],
+    "name": "setName",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       { "internalType": "address", "name": "newOwner", "type": "address" }

diff --git a/thegraph/ormpipe/networks.json b/thegraph/ormpipe/networks.json
@@ -1,30 +1,30 @@
 {
-  "arbitrum-goerli": {
-    "AirnodeDapi": {
-      "address": "0xa681492DBAd5a3999cFCE2d72196d5784dd08D0c"
+  "arbitrum-sepolia": {
+    "OrmpProtocol": {
+      "address": "0x0034607daf9c1dc6628f6e09E81bB232B6603A89"
+    },
+    "Subapi": {
+      "address": "0x007471Db6AD668b30a7CE648589a4C8C4f65a36f"
     },
     "OrmpOracle": {
-      "address": "0x000000003e2E2C9C8DD469E129E02E1666898E76"
+      "address": "0x0002396F1D52323fcd1ae8079b38808F046882c3"
     },
     "OrmpRelayer": {
-      "address": "0x000000007e24Da6666c773280804d8021E12e13F"
-    },
-    "OrmpProtocol": {
-      "address": "0x0000000000BD9dcFDa5C60697039E2b3B28b079b"
+      "address": "0x007EED6207c9AF3715964Fb7f8B5f44E002a3498"
     }
   },
-  "pangolin": {
-    "AirnodeDapi": {
-      "address": "0x770713580e5c618A4D29D7E8c0d7604276B63832"
+  "crab": {
+    "OrmpProtocol": {
+      "address": "0x0034607daf9c1dc6628f6e09E81bB232B6603A89"
+    },
+    "Subapi": {
+      "address": "0x007471Db6AD668b30a7CE648589a4C8C4f65a36f"
     },
     "OrmpOracle": {
-      "address": "0x000000003e2E2C9C8DD469E129E02E1666898E76"
+      "address": "0x0002396F1D52323fcd1ae8079b38808F046882c3"
     },
     "OrmpRelayer": {
-      "address": "0x000000007e24Da6666c773280804d8021E12e13F"
-    },
-    "OrmpProtocol": {
-      "address": "0x0000000000BD9dcFDa5C60697039E2b3B28b079b"
+      "address": "0x007EED6207c9AF3715964Fb7f8B5f44E002a3498"
     }
   }
 }