Support the new Indexer schema

baking-bad · Aug 6, 2024 · 08a4a48 · 08a4a48
1 parent e3511e6
commit 08a4a48
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 28 deletions.
diff --git a/...ders/dipDupBridgeDataProvider/dipDupGraphQLQueryBuilder/queryParts/bridgeDepositFields.ts b/...ders/dipDupBridgeDataProvider/dipDupGraphQLQueryBuilder/queryParts/bridgeDepositFields.ts
@@ -15,11 +15,6 @@ l1_transaction {
  l1_account
  l2_account
  timestamp
- inbox_message {
- type
- level
- index
- }
 }
 l2_transaction {
  level
@@ -30,4 +25,9 @@ l2_transaction {
  id
  }
  timestamp
+}
+inbox_message {
+ type
+ level
+ index
 }`;
diff --git a/...s/dipDupBridgeDataProvider/dipDupGraphQLQueryBuilder/queryParts/bridgeWithdrawalFields.ts b/...s/dipDupBridgeDataProvider/dipDupGraphQLQueryBuilder/queryParts/bridgeWithdrawalFields.ts
@@ -24,13 +24,13 @@ l2_transaction {
  l1_account
  l2_account
  timestamp
- outbox_message {
- level
- index
- commitment {
- hash
- }
- proof
- cemented_at
+}
+outbox_message {
+ level
+ index
+ commitment {
+ hash
  }
+ proof
+ cemented_at
 }`;
diff --git a/src/bridgeDataProviders/dipDupBridgeDataProvider/dtos.ts b/src/bridgeDataProviders/dipDupBridgeDataProvider/dtos.ts
@@ -26,6 +26,15 @@ interface InboxMessageDto {
  index: number;
 }
 
+interface OutboxMessageDto {
+ level: number;
+ index: number;
+ commitment: { hash: string; } | null;
+ proof: string | null;
+ cemented_at: string;
+ cemented_level: number;
+}
+
 interface TezosTicketDto {
  token: TezosTokenDto;
 }
@@ -40,7 +49,6 @@ interface DepositL1TransactionDto {
  l1_account: string;
  l2_account: string;
  timestamp: string;
- inbox_message: InboxMessageDto;
 }
 
 interface DepositL2TransactionDto {
@@ -57,6 +65,7 @@ interface DepositL2TransactionDto {
 export interface BridgeDepositDto {
  l1_transaction: DepositL1TransactionDto;
  l2_transaction: DepositL2TransactionDto | null;
+ inbox_message: InboxMessageDto | null;
 }
 
 interface WithdrawalL1TransactionDto {
@@ -65,6 +74,7 @@ interface WithdrawalL1TransactionDto {
  counter: number;
  nonce: number | null;
  timestamp: string;
+ outbox_message: OutboxMessageDto;
 }
 
 interface WithdrawalL2TransactionDto {
@@ -79,18 +89,12 @@ interface WithdrawalL2TransactionDto {
  l1_account: string;
  l2_account: string;
  timestamp: string;
- outbox_message: {
- level: number;
- index: number;
- commitment: { hash: string; } | null;
- proof: string | null;
- cemented_at: string | null;
- }
 }
 
 export interface BridgeWithdrawalDto {
  l1_transaction: WithdrawalL1TransactionDto | null;
  l2_transaction: WithdrawalL2TransactionDto;
+ outbox_message: OutboxMessageDto | null;
 }
 
 export interface BridgeOperationDto {

diff --git a/src/bridgeDataProviders/dipDupBridgeDataProvider/mappers.ts b/src/bridgeDataProviders/dipDupBridgeDataProvider/mappers.ts
@@ -130,10 +130,10 @@ export const mapBridgeWithdrawalDtoToWithdrawalBridgeTokenTransfer = (dto: Bridg
  }
  : undefined;
  const rollupData = {
- outboxMessageLevel: dto.l2_transaction.outbox_message.level,
- outboxMessageIndex: dto.l2_transaction.outbox_message.index,
- commitment: dto.l2_transaction.outbox_message.commitment?.hash || '',
- proof: dto.l2_transaction.outbox_message.proof || ''
+ outboxMessageLevel: dto.outbox_message?.level || 0,
+ outboxMessageIndex: dto.outbox_message?.index || 0,
+ commitment: dto.outbox_message?.commitment?.hash || '',
+ proof: dto.outbox_message?.proof || ''
  };
  const id = bridgeUtils.convertOperationDataToTokenTransferId(etherlinkOperation.hash, etherlinkOperation.logIndex);
 
@@ -178,9 +178,9 @@ export const mapBridgeWithdrawalDtoToWithdrawalBridgeTokenTransfer = (dto: Bridg
  receiver,
  etherlinkOperation,
  rollupData: {
- outboxMessageLevel: dto.l2_transaction.outbox_message.level,
- outboxMessageIndex: dto.l2_transaction.outbox_message.index,
- estimatedOutboxMessageExecutionTimestamp: dto.l2_transaction.outbox_message.cemented_at || undefined
+ outboxMessageLevel: dto.outbox_message?.level || 0,
+ outboxMessageIndex: dto.outbox_message?.index || 0,
+ estimatedOutboxMessageExecutionTimestamp: dto.outbox_message?.cemented_at || undefined
  }
  };
  }