diff --git a/src/integration/blockchain/shared/blockscout/blockscout.service.ts b/src/integration/blockchain/shared/blockscout/blockscout.service.ts index 0d97ab92e7..78cd47f0ca 100644 --- a/src/integration/blockchain/shared/blockscout/blockscout.service.ts +++ b/src/integration/blockchain/shared/blockscout/blockscout.service.ts @@ -13,13 +13,13 @@ export interface BlockscoutTransaction { } export interface BlockscoutTokenTransfer { - tx_hash: string; + transaction_hash: string; block_number: number; timestamp: string; from: { hash: string }; to: { hash: string }; token: { - address: string; + address_hash: string; symbol: string; name: string; decimals: string; diff --git a/src/integration/blockchain/shared/evm/citrea-base-client.ts b/src/integration/blockchain/shared/evm/citrea-base-client.ts index 3bb5166cbd..fc3d7b8459 100644 --- a/src/integration/blockchain/shared/evm/citrea-base-client.ts +++ b/src/integration/blockchain/shared/evm/citrea-base-client.ts @@ -159,9 +159,9 @@ export abstract class CitreaBaseClient extends EvmClient { .map((tx) => ({ blockNumber: tx.block_number.toString(), timeStamp: tx.timestamp, - hash: tx.tx_hash, + hash: tx.transaction_hash, from: tx.from.hash, - contractAddress: tx.token.address, + contractAddress: tx.token.address_hash, to: tx.to.hash, value: tx.total.value, tokenName: tx.token.name || tx.token.symbol, diff --git a/src/integration/blockchain/shared/evm/evm-client.ts b/src/integration/blockchain/shared/evm/evm-client.ts index b46e8afa75..c5b1d0397e 100644 --- a/src/integration/blockchain/shared/evm/evm-client.ts +++ b/src/integration/blockchain/shared/evm/evm-client.ts @@ -663,7 +663,11 @@ export abstract class EvmClient extends BlockchainClient { async getSwapResult(txId: string, asset: Asset): Promise { const receipt = await this.getTxReceipt(txId); - const swapLog = receipt?.logs?.find((l) => l.address.toLowerCase() === asset.chainId); + const walletTopic = ethers.utils.hexZeroPad(this.walletAddress.toLowerCase(), 32); + + const swapLog = receipt?.logs?.find( + (l) => l.address.toLowerCase() === asset.chainId.toLowerCase() && l.topics[2]?.toLowerCase() === walletTopic, + ); if (!swapLog) throw new Error(`Failed to get swap result for TX ${txId}`); const token = await this.getToken(asset);