From 6d8c2a72f9ce3f1f972cc8aa4d35c8d5ad05113d Mon Sep 17 00:00:00 2001 From: fewensa Date: Wed, 7 Feb 2024 08:32:04 +0000 Subject: [PATCH 1/3] update start block --- thegraph/packages/ormpipe/subgraph-arbitrum.yaml | 2 +- thegraph/packages/ormpipe/subgraph-crab.yaml | 2 +- thegraph/packages/ormpipe/subgraph-darwinia.yaml | 2 +- thegraph/packages/ormpipe/subgraph-ethereum.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/thegraph/packages/ormpipe/subgraph-arbitrum.yaml b/thegraph/packages/ormpipe/subgraph-arbitrum.yaml index e39e777..9f48701 100644 --- a/thegraph/packages/ormpipe/subgraph-arbitrum.yaml +++ b/thegraph/packages/ormpipe/subgraph-arbitrum.yaml @@ -8,7 +8,7 @@ dataSources: source: address: "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba" abi: OrmpOracle - startBlock: 0 # todo: update this + startBlock: 178258595 mapping: kind: ethereum/events apiVersion: 0.0.7 diff --git a/thegraph/packages/ormpipe/subgraph-crab.yaml b/thegraph/packages/ormpipe/subgraph-crab.yaml index b06b053..e5a8e9a 100644 --- a/thegraph/packages/ormpipe/subgraph-crab.yaml +++ b/thegraph/packages/ormpipe/subgraph-crab.yaml @@ -8,7 +8,7 @@ dataSources: source: address: "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba" abi: OrmpOracle - startBlock: 0 # todo: update this + startBlock: 2234031 mapping: kind: ethereum/events apiVersion: 0.0.7 diff --git a/thegraph/packages/ormpipe/subgraph-darwinia.yaml b/thegraph/packages/ormpipe/subgraph-darwinia.yaml index 9aeef6e..2fe7dee 100644 --- a/thegraph/packages/ormpipe/subgraph-darwinia.yaml +++ b/thegraph/packages/ormpipe/subgraph-darwinia.yaml @@ -8,7 +8,7 @@ dataSources: source: address: "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba" abi: OrmpOracle - startBlock: 0 # todo: update this + startBlock: 2013339 mapping: kind: ethereum/events apiVersion: 0.0.7 diff --git a/thegraph/packages/ormpipe/subgraph-ethereum.yaml b/thegraph/packages/ormpipe/subgraph-ethereum.yaml index cecc468..99649ff 100644 --- a/thegraph/packages/ormpipe/subgraph-ethereum.yaml +++ b/thegraph/packages/ormpipe/subgraph-ethereum.yaml @@ -8,7 +8,7 @@ dataSources: source: address: "0x0000000003ebeF32D8f0ED406a5CA8805c80AFba" abi: OrmpOracle - startBlock: 0 # todo: update this + startBlock: 19174438 mapping: kind: ethereum/events apiVersion: 0.0.7 From 1a1c8c79dc46bf82018892535d2df9b94891472e Mon Sep 17 00:00:00 2001 From: fewensa Date: Mon, 19 Feb 2024 07:43:49 +0000 Subject: [PATCH 2/3] add logindex --- thegraph/packages/ormpipe/schema.graphql | 3 +++ thegraph/packages/ormpipe/src/ormp-oracle.ts | 1 + thegraph/packages/ormpipe/src/ormp-protocol.ts | 1 + thegraph/packages/ormpipe/src/ormp-relayer.ts | 1 + 4 files changed, 6 insertions(+) diff --git a/thegraph/packages/ormpipe/schema.graphql b/thegraph/packages/ormpipe/schema.graphql index a98078a..3946e46 100644 --- a/thegraph/packages/ormpipe/schema.graphql +++ b/thegraph/packages/ormpipe/schema.graphql @@ -67,16 +67,19 @@ type OrmpProtocolMessageAccepted @entity(immutable: true) { blockNumber: BigInt! blockTimestamp: BigInt! transactionHash: Bytes! + logIndex: BigInt! # ---- oracle oracleAssigned: Boolean oracleAssignedFee: BigInt + oracleLogIndex: BigInt! # ---- relayer relayerAssigned: Boolean relayerAssignedFee: BigInt # uint256 relayerAssignedParams: Bytes # bytes relayerAssignedProof: [Bytes!] # bytes32[32] + relayerLogIndex: BigInt! } type OrmpProtocolMessageDispatched @entity(immutable: true) { diff --git a/thegraph/packages/ormpipe/src/ormp-oracle.ts b/thegraph/packages/ormpipe/src/ormp-oracle.ts index f0ed52b..5596d4f 100644 --- a/thegraph/packages/ormpipe/src/ormp-oracle.ts +++ b/thegraph/packages/ormpipe/src/ormp-oracle.ts @@ -32,6 +32,7 @@ export function handleAssigned(event: AssignedEvent): void { if (messageAccepted) { messageAccepted.oracleAssigned = true; messageAccepted.oracleAssignedFee = entity.fee; + messageAccepted.oracleLogIndex = event.logIndex; messageAccepted.save(); } } diff --git a/thegraph/packages/ormpipe/src/ormp-protocol.ts b/thegraph/packages/ormpipe/src/ormp-protocol.ts index 89ff809..139c56f 100644 --- a/thegraph/packages/ormpipe/src/ormp-protocol.ts +++ b/thegraph/packages/ormpipe/src/ormp-protocol.ts @@ -40,6 +40,7 @@ export function handleMessageAccepted(event: MessageAcceptedEvent): void { entity.message_to = event.params.message.to entity.message_gasLimit = event.params.message.gasLimit entity.message_encoded = event.params.message.encoded + entity.logIndex = event.logIndex entity.blockNumber = event.block.number entity.blockTimestamp = event.block.timestamp diff --git a/thegraph/packages/ormpipe/src/ormp-relayer.ts b/thegraph/packages/ormpipe/src/ormp-relayer.ts index f36f6fe..c9e2071 100644 --- a/thegraph/packages/ormpipe/src/ormp-relayer.ts +++ b/thegraph/packages/ormpipe/src/ormp-relayer.ts @@ -34,6 +34,7 @@ export function handleAssigned(event: AssignedEvent): void { messageAccepted.relayerAssignedFee = entity.fee messageAccepted.relayerAssignedParams = entity.params messageAccepted.relayerAssignedProof = entity.proof + messageAccepted.relayerLogIndex = event.logIndex; messageAccepted.save() } } From 9da4ec07b9d11839597fc2f475ff0025c2d592da Mon Sep 17 00:00:00 2001 From: fewensa Date: Tue, 20 Feb 2024 02:55:44 +0000 Subject: [PATCH 3/3] fix error --- thegraph/packages/ormpipe/schema.graphql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/thegraph/packages/ormpipe/schema.graphql b/thegraph/packages/ormpipe/schema.graphql index 3946e46..354d308 100644 --- a/thegraph/packages/ormpipe/schema.graphql +++ b/thegraph/packages/ormpipe/schema.graphql @@ -72,14 +72,14 @@ type OrmpProtocolMessageAccepted @entity(immutable: true) { # ---- oracle oracleAssigned: Boolean oracleAssignedFee: BigInt - oracleLogIndex: BigInt! + oracleLogIndex: BigInt # ---- relayer relayerAssigned: Boolean relayerAssignedFee: BigInt # uint256 relayerAssignedParams: Bytes # bytes relayerAssignedProof: [Bytes!] # bytes32[32] - relayerLogIndex: BigInt! + relayerLogIndex: BigInt } type OrmpProtocolMessageDispatched @entity(immutable: true) {