v73 and withdrawals fix

OriginProtocol · Jan 22, 2025 · 72812a4 · 72812a4
1 parent 8cdd217
commit 72812a4
Show file tree

Hide file tree

Showing 2 changed files with 461 additions and 721 deletions.
diff --git a/src/templates/withdrawals.ts b/src/templates/withdrawals.ts
@@ -60,9 +60,9 @@ export const createOTokenWithdrawalsProcessor = ({
     log: Context['blocks'][number]['logs'][number],
   ) => {
     const data = oethVault.events.WithdrawalRequested.decode(log)
-
+    const id = `${ctx.chain.id}:${oTokenAddress}:${data._withdrawer.toLowerCase()}:${data._requestId}`
     const withdrawalRequest = new OTokenWithdrawalRequest({
-      id: `${data._withdrawer.toLowerCase()}:${data._requestId}`,
+      id,
       chainId: ctx.chain.id,
       blockNumber: block.header.height,
       timestamp: new Date(block.header.timestamp),
@@ -84,7 +84,7 @@ export const createOTokenWithdrawalsProcessor = ({
     log: Context['blocks'][number]['logs'][number],
   ) => {
     const data = oethVault.events.WithdrawalClaimed.decode(log)
-    const id = `${data._withdrawer.toLowerCase()}:${data._requestId}`
+    const id = `${ctx.chain.id}:${oTokenAddress}:${data._withdrawer.toLowerCase()}:${data._requestId}`
     let updated
     if (result.withdrawalRequests.has(id)) {
       updated = result.withdrawalRequests.get(id)