update oracle

darwinia-network · Feb 4, 2024 · 9483e6c · 9483e6c
1 parent 15e1ec6
commit 9483e6c
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 26 deletions.
diff --git a/thegraph/packages/ormpipe/abis/OrmpOracle.json b/thegraph/packages/ormpipe/abis/OrmpOracle.json
@@ -38,7 +38,7 @@
       {
         "indexed": true,
         "internalType": "uint256",
-        "name": "messageIndex",
+        "name": "blockHeight",
         "type": "uint256"
       },
       {
@@ -179,7 +179,7 @@
   {
     "inputs": [
       { "internalType": "uint256", "name": "chainId", "type": "uint256" },
-      { "internalType": "uint256", "name": "messageIndex", "type": "uint256" },
+      { "internalType": "uint256", "name": "blockNumber", "type": "uint256" },
       { "internalType": "bytes32", "name": "messageRoot", "type": "bytes32" }
     ],
     "name": "importMessageRoot",
@@ -199,7 +199,7 @@
   {
     "inputs": [
       { "internalType": "uint256", "name": "chainId", "type": "uint256" },
-      { "internalType": "uint256", "name": "messageIndex", "type": "uint256" }
+      { "internalType": "uint256", "name": "blockNumber", "type": "uint256" }
     ],
     "name": "merkleRoot",
     "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],

diff --git a/thegraph/packages/ormpipe/networks.json b/thegraph/packages/ormpipe/networks.json
@@ -1,7 +1,7 @@
 {
   "arbitrum-sepolia": {
     "OrmpOracle": {
-      "address": "0x0000000004A34ac73374b65a55C93CF9D4Bc3d17"
+      "address": "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba"
     },
     "OrmpRelayer": {
       "address": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"
@@ -12,7 +12,7 @@
   },
   "crab": {
     "OrmpOracle": {
-      "address": "0x0000000004A34ac73374b65a55C93CF9D4Bc3d17"
+      "address": "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba"
     },
     "OrmpRelayer": {
       "address": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"
@@ -23,7 +23,7 @@
   },
   "darwinia": {
     "OrmpOracle": {
-      "address": "0x0000000004A34ac73374b65a55C93CF9D4Bc3d17"
+      "address": "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba"
     },
     "OrmpRelayer": {
       "address": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"
@@ -34,7 +34,7 @@
   },
   "arbitrum": {
     "OrmpOracle": {
-      "address": "0x0000000004A34ac73374b65a55C93CF9D4Bc3d17"
+      "address": "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba"
     },
     "OrmpRelayer": {
       "address": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"
@@ -45,7 +45,7 @@
   },
   "sepolia": {
     "OrmpOracle": {
-      "address": "0x0000000004A34ac73374b65a55C93CF9D4Bc3d17"
+      "address": "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba"
     },
     "OrmpRelayer": {
       "address": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"

diff --git a/thegraph/packages/ormpipe/schema.graphql b/thegraph/packages/ormpipe/schema.graphql
@@ -110,7 +110,7 @@ type OrmpOracleAssigned @entity(immutable: true) {
 type OrmpOracleImportedMessageRoot @entity(immutable: true) {
   id: Bytes!
   chainId: BigInt! # uint256
-  messageIndex: BigInt! # uint256
+  blockHeight: BigInt! # uint256
   messageRoot: Bytes! # bytes32
   blockNumber: BigInt!
   blockTimestamp: BigInt!

diff --git a/thegraph/packages/ormpipe/src/ormp-oracle.ts b/thegraph/packages/ormpipe/src/ormp-oracle.ts
@@ -8,11 +8,11 @@ import {
 } from "../generated/OrmpOracle/OrmpOracle"
 import {
   OrmpOracleAssigned,
-  OrmpOracleImportedMessageRoot, OrmpProtocolMessageAccepted,
+  OrmpOracleImportedMessageRoot,
   OrmpOracleOwnershipTransferred,
   OrmpOracleSetApproved,
   OrmpOracleSetFee,
-  OrmpOracleWithdrawal
+  OrmpOracleWithdrawal, OrmpProtocolMessageAccepted
 } from "../generated/schema"
 
 export function handleAssigned(event: AssignedEvent): void {
@@ -43,7 +43,7 @@ export function handleImportedMessageRoot(
     event.transaction.hash.concatI32(event.logIndex.toI32())
   )
   entity.chainId = event.params.chainId
-  entity.messageIndex = event.params.messageIndex
+  entity.blockHeight = event.params.blockHeight
   entity.messageRoot = event.params.messageRoot
 
   entity.blockNumber = event.block.number

diff --git a/thegraph/packages/ormpipe/subgraph-arbitrum-sepolia.yaml b/thegraph/packages/ormpipe/subgraph-arbitrum-sepolia.yaml
@@ -6,9 +6,9 @@ dataSources:
     name: OrmpOracle
     network: arbitrum-sepolia
     source:
-      address: "0x000000000DA67291724858F7e759A43B2d23225e"
+      address: "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba"
       abi: OrmpOracle
-      startBlock: 11212606
+      startBlock: 11631553
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7

diff --git a/thegraph/packages/ormpipe/subgraph-arbitrum.yaml b/thegraph/packages/ormpipe/subgraph-arbitrum.yaml
@@ -6,7 +6,7 @@ dataSources:
     name: OrmpOracle
     network: arbitrum-one
     source:
-      address: "0x000000000DA67291724858F7e759A43B2d23225e"
+      address: "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba"
       abi: OrmpOracle
       startBlock: 0 # todo: update this
     mapping:

diff --git a/thegraph/packages/ormpipe/subgraph-crab.yaml b/thegraph/packages/ormpipe/subgraph-crab.yaml
@@ -6,9 +6,9 @@ dataSources:
     name: OrmpOracle
     network: crab
     source:
-      address: "0x000000000DA67291724858F7e759A43B2d23225e"
+      address: "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba"
       abi: OrmpOracle
-      startBlock: 2205412
+      startBlock: 0 # todo: update this
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7

diff --git a/thegraph/packages/ormpipe/subgraph-darwinia.yaml b/thegraph/packages/ormpipe/subgraph-darwinia.yaml
@@ -6,7 +6,7 @@ dataSources:
     name: OrmpOracle
     network: darwinia
     source:
-      address: "0x000000000DA67291724858F7e759A43B2d23225e"
+      address: "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba"
       abi: OrmpOracle
       startBlock: 0 # todo: update this
     mapping:

diff --git a/thegraph/packages/ormpipe/subgraph-ethereum.yaml b/thegraph/packages/ormpipe/subgraph-ethereum.yaml
@@ -6,7 +6,7 @@ dataSources:
     name: OrmpOracle
     network: mainnet
     source:
-      address: "0x000000000DA67291724858F7e759A43B2d23225e"
+      address: "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba"
       abi: OrmpOracle
       startBlock: 0 # todo: update this
     mapping:

diff --git a/thegraph/packages/ormpipe/subgraph-pangolin.yaml b/thegraph/packages/ormpipe/subgraph-pangolin.yaml
@@ -6,9 +6,9 @@ dataSources:
     name: OrmpOracle
     network: pangolin
     source:
-      address: "0x000000000DA67291724858F7e759A43B2d23225e"
+      address: "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba"
       abi: OrmpOracle
-      startBlock: 2275722
+      startBlock: 2288092
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7

diff --git a/thegraph/packages/ormpipe/subgraph-sepolia.yaml b/thegraph/packages/ormpipe/subgraph-sepolia.yaml
@@ -6,9 +6,9 @@ dataSources:
     name: OrmpOracle
     network: sepolia
     source:
-      address: "0x000000000DA67291724858F7e759A43B2d23225e"
+      address: "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba"
       abi: OrmpOracle
-      startBlock: 5202852
+      startBlock: 5217030
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7

diff --git a/thegraph/packages/ormpipe/tests/ormp-oracle-utils.ts b/thegraph/packages/ormpipe/tests/ormp-oracle-utils.ts
@@ -26,7 +26,7 @@ export function createAssignedEvent(msgHash: Bytes, fee: BigInt): Assigned {
 
 export function createImportedMessageRootEvent(
   chainId: BigInt,
-  messageIndex: BigInt,
+  blockHeight: BigInt,
   messageRoot: Bytes
 ): ImportedMessageRoot {
   let importedMessageRootEvent = changetype<ImportedMessageRoot>(newMockEvent())
@@ -41,8 +41,8 @@ export function createImportedMessageRootEvent(
   )
   importedMessageRootEvent.parameters.push(
     new ethereum.EventParam(
-      "messageIndex",
-      ethereum.Value.fromUnsignedBigInt(messageIndex)
+      "blockHeight",
+      ethereum.Value.fromUnsignedBigInt(blockHeight)
     )
   )
   importedMessageRootEvent.parameters.push(