From ac43d52244c6938b1a30dce24490683935d7e563 Mon Sep 17 00:00:00 2001 From: moebius <0xmoebius@protonmail.com> Date: Fri, 28 Mar 2025 12:41:23 +0100 Subject: [PATCH] fix: account service duplication fix and entrypoint abi update --- packages/sdk/src/abi/IEntrypoint.ts | 30 ++++++++++++------------ packages/sdk/src/core/account.service.ts | 10 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/sdk/src/abi/IEntrypoint.ts b/packages/sdk/src/abi/IEntrypoint.ts index 880c4e0..e5e374f 100644 --- a/packages/sdk/src/abi/IEntrypoint.ts +++ b/packages/sdk/src/abi/IEntrypoint.ts @@ -85,9 +85,9 @@ export const IEntrypointABI = [ "internalType": "uint256" }, { - "name": "ipfsHash", - "type": "bytes32", - "internalType": "bytes32" + "name": "ipfsCID", + "type": "string", + "internalType": "string" }, { "name": "timestamp", @@ -484,9 +484,9 @@ export const IEntrypointABI = [ "internalType": "uint256" }, { - "name": "_ipfsHash", - "type": "bytes32", - "internalType": "bytes32" + "name": "_ipfsCID", + "type": "string", + "internalType": "string" } ], "outputs": [ @@ -802,10 +802,10 @@ export const IEntrypointABI = [ "internalType": "uint256" }, { - "name": "_ipfsHash", - "type": "bytes32", + "name": "_ipfsCID", + "type": "string", "indexed": false, - "internalType": "bytes32" + "internalType": "string" }, { "name": "_timestamp", @@ -924,11 +924,6 @@ export const IEntrypointABI = [ "name": "ERC1967NonPayable", "inputs": [] }, - { - "type": "error", - "name": "EmptyIPFSHash", - "inputs": [] - }, { "type": "error", "name": "EmptyRoot", @@ -949,6 +944,11 @@ export const IEntrypointABI = [ "name": "InvalidFeeBPS", "inputs": [] }, + { + "type": "error", + "name": "InvalidIPFSCIDLength", + "inputs": [] + }, { "type": "error", "name": "InvalidIndex", @@ -1055,5 +1055,5 @@ export const IEntrypointABI = [ "type": "error", "name": "ZeroAddress", "inputs": [] - }, + } ] as const; diff --git a/packages/sdk/src/core/account.service.ts b/packages/sdk/src/core/account.service.ts index 94f217e..ecd9f2c 100644 --- a/packages/sdk/src/core/account.service.ts +++ b/packages/sdk/src/core/account.service.ts @@ -550,12 +550,12 @@ export class AccountService { this.logger.info( `Found ${foundDeposits.length} deposits for pool ${pool.address}`, ); - - // Process withdrawals and ragequits for all pools - // This is done after all deposits are processed to ensure we have the complete account state - await this._processWithdrawalsAndRagequits(pools); - }), + }) ); + + // Process withdrawals and ragequits for all pools + // This is done after all deposits are processed to ensure we have the complete account state + await this._processWithdrawalsAndRagequits(pools); } /**