feat: add escrow expired event

Author: kuco23

packages/fasset-indexer-core/chain/artifacts/ICoreVaultManager.json

@@ -183,6 +183,25 @@
       "name": "EmergencyPauseSenderRemoved",
       "type": "event"
     },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "bytes32",
+          "name": "preimageHash",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "EscrowExpired",
+      "type": "event"
+    },
     {
       "anonymous": false,
       "inputs": [

packages/fasset-indexer-core/chain/typechain/ICoreVaultManager.ts

@@ -194,6 +194,7 @@ export interface ICoreVaultManagerInterface extends Interface {
       | "CustomInstructions"
       | "EmergencyPauseSenderAdded"
       | "EmergencyPauseSenderRemoved"
+      | "EscrowExpired"
       | "EscrowFinished"
       | "EscrowInstructions"
       | "NotAllEscrowsProcessed"
@@ -523,6 +524,19 @@ export namespace EmergencyPauseSenderRemovedEvent {
   export type LogDescription = TypedLogDescription<Event>;
 }
 
+export namespace EscrowExpiredEvent {
+  export type InputTuple = [preimageHash: BytesLike, amount: BigNumberish];
+  export type OutputTuple = [preimageHash: string, amount: bigint];
+  export interface OutputObject {
+    preimageHash: string;
+    amount: bigint;
+  }
+  export type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+  export type Filter = TypedDeferredTopicFilter<Event>;
+  export type Log = TypedEventLog<Event>;
+  export type LogDescription = TypedLogDescription<Event>;
+}
+
 export namespace EscrowFinishedEvent {
   export type InputTuple = [preimageHash: BytesLike, amount: BigNumberish];
   export type OutputTuple = [preimageHash: string, amount: bigint];
@@ -1109,6 +1123,13 @@ export interface ICoreVaultManager extends BaseContract {
     EmergencyPauseSenderRemovedEvent.OutputTuple,
     EmergencyPauseSenderRemovedEvent.OutputObject
   >;
+  getEvent(
+    key: "EscrowExpired"
+  ): TypedContractEvent<
+    EscrowExpiredEvent.InputTuple,
+    EscrowExpiredEvent.OutputTuple,
+    EscrowExpiredEvent.OutputObject
+  >;
   getEvent(
     key: "EscrowFinished"
   ): TypedContractEvent<
@@ -1275,6 +1296,17 @@ export interface ICoreVaultManager extends BaseContract {
       EmergencyPauseSenderRemovedEvent.OutputObject
     >;
 
+    "EscrowExpired(bytes32,uint256)": TypedContractEvent<
+      EscrowExpiredEvent.InputTuple,
+      EscrowExpiredEvent.OutputTuple,
+      EscrowExpiredEvent.OutputObject
+    >;
+    EscrowExpired: TypedContractEvent<
+      EscrowExpiredEvent.InputTuple,
+      EscrowExpiredEvent.OutputTuple,
+      EscrowExpiredEvent.OutputObject
+    >;
+
     "EscrowFinished(bytes32,uint256)": TypedContractEvent<
       EscrowFinishedEvent.InputTuple,
       EscrowFinishedEvent.OutputTuple,

packages/fasset-indexer-core/chain/typechain/factories/ICoreVaultManager__factory.ts

@@ -189,6 +189,25 @@ const _abi = [
     name: "EmergencyPauseSenderRemoved",
     type: "event",
   },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "bytes32",
+        name: "preimageHash",
+        type: "bytes32",
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256",
+      },
+    ],
+    name: "EscrowExpired",
+    type: "event",
+  },
   {
     anonymous: false,
     inputs: [

packages/fasset-indexer-core/src/config/constants.ts

@@ -122,9 +122,10 @@ export const EVENTS = {
     ESCROW_INSTRUCTIONS: "EscrowInstructions",
     TRANSFER_REQUEST_CANCELED: "TransferRequestCanceled",
     NOT_ALL_ESCROWS_PROCESSED: "NotAllEscrowsProcessed",
+    ESCROW_EXPIRED: "EscrowExpired",
     ESCROW_FINISHED: "EscrowFinished",
-    CUSTODIAN_ADDRESS_UPDATED: "CustodianAddressUpdated",
-    SETTINGS_UPDATED: "SettingsUpdated"
+    SETTINGS_UPDATED: "SettingsUpdated",
+    CUSTODIAN_ADDRESS_UPDATED: "CustodianAddressUpdated"
   }
 } as const
 

packages/fasset-indexer-core/src/indexer/eventlib/event-storer.ts

@@ -275,6 +275,9 @@ export class EventStorer {
       } case EVENTS.CORE_VAULT_MANAGER.CUSTODIAN_ADDRESS_UPDATED: {
         await this.onCustodianAddressUpdated(em, evmLog, log.args)
         break
+      } case EVENTS.CORE_VAULT_MANAGER.ESCROW_EXPIRED: {
+        await this.onEscrowExpired(em, evmLog, log.args)
+        break
       } case EVENTS.CORE_VAULT_MANAGER.ESCROW_FINISHED: {
         await this.onEscrowFinished(em, evmLog, log.args)
         break
@@ -1373,6 +1376,16 @@ export class EventStorer {
     })
   }
 
+  protected async onEscrowExpired(
+    em: EntityManager,
+    evmLog: Entities.EvmLog,
+    logArgs: CoreVaultManager.EscrowExpiredEvent.OutputTuple
+  ): Promise<Entities.EscrowExpired> {
+    const fasset = this.lookup.coreVaultManagerToFAssetType(evmLog.address.hex)
+    const [ preimageHash, amount ] = logArgs
+    return em.create(Entities.EscrowExpired, { evmLog, fasset, preimageHash, amount })
+  }
+
   protected async onEscrowFinished(
     em: EntityManager,
     evmLog: Entities.EvmLog,

packages/fasset-indexer-core/src/orm/entities/events/core-vault-manager.ts

@@ -21,6 +21,13 @@ export class CoreVaultManagerSettingsUpdated extends FAssetEventBound {
   fee!: bigint
 }
 
+@Entity()
+export class CoreVaultManagerCustodianAddressUpdated extends FAssetEventBound {
+
+  @ManyToOne({ entity: () => UnderlyingAddress })
+  custodian!: UnderlyingAddress
+}
+
 @Entity()
 @Unique({ properties: ['fasset', 'transactionId'] })
 export class CoreVaultManagerPaymentConfirmed extends FAssetEventBound {
@@ -115,7 +122,7 @@ export class CoreVaultManagerTransferRequestCanceled extends FAssetEventBound {
 export class CoreVaultManagerNotAllEscrowsProcessed extends FAssetEventBound {}
 
 @Entity()
-export class EscrowFinished extends FAssetEventBound {
+export class EscrowExpired extends FAssetEventBound {
 
   @Property({ type: 'text', length: BYTES32_LENGTH })
   preimageHash!: string
@@ -125,8 +132,11 @@ export class EscrowFinished extends FAssetEventBound {
 }
 
 @Entity()
-export class CoreVaultManagerCustodianAddressUpdated extends FAssetEventBound {
+export class EscrowFinished extends FAssetEventBound {
 
-  @ManyToOne({ entity: () => UnderlyingAddress })
-  custodian!: UnderlyingAddress
+  @Property({ type: 'text', length: BYTES32_LENGTH })
+  preimageHash!: string
+
+  @Property({ type: new uint256() })
+  amount!: bigint
 }

packages/fasset-indexer-core/src/orm/entities/index.ts

@@ -63,7 +63,7 @@ export {
   CoreVaultManagerEscrowInstructions, CoreVaultManagerNotAllEscrowsProcessed,
   CoreVaultManagerPaymentConfirmed, CoreVaultManagerPaymentInstructions,
   CoreVaultManagerSettingsUpdated, CoreVaultManagerTransferRequestCanceled,
-  EscrowFinished
+  EscrowExpired, EscrowFinished
 } from './events/core-vault-manager'
 export { PricesPublished } from './events/price'
 // underlying data