update abi

Author: vbrvk

typescript/aqua/src/abi/Aqua.abi.ts

@@ -1,16 +1,4 @@
 export const AQUA_ABI = [
-  {
-    type: 'function',
-    name: 'balances',
-    inputs: [
-      { name: 'maker', type: 'address', internalType: 'address' },
-      { name: 'app', type: 'address', internalType: 'address' },
-      { name: 'strategyHash', type: 'bytes32', internalType: 'bytes32' },
-      { name: 'token', type: 'address', internalType: 'address' },
-    ],
-    outputs: [{ name: '', type: 'uint256', internalType: 'uint256' }],
-    stateMutability: 'view',
-  },
   {
     type: 'function',
     name: 'dock',
@@ -48,6 +36,37 @@ export const AQUA_ABI = [
     outputs: [],
     stateMutability: 'nonpayable',
   },
+  {
+    type: 'function',
+    name: 'rawBalances',
+    inputs: [
+      { name: 'maker', type: 'address', internalType: 'address' },
+      { name: 'app', type: 'address', internalType: 'address' },
+      { name: 'strategyHash', type: 'bytes32', internalType: 'bytes32' },
+      { name: 'token', type: 'address', internalType: 'address' },
+    ],
+    outputs: [
+      { name: 'balance', type: 'uint248', internalType: 'uint248' },
+      { name: 'tokensCount', type: 'uint8', internalType: 'uint8' },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'safeBalances',
+    inputs: [
+      { name: 'maker', type: 'address', internalType: 'address' },
+      { name: 'app', type: 'address', internalType: 'address' },
+      { name: 'strategyHash', type: 'bytes32', internalType: 'bytes32' },
+      { name: 'token0', type: 'address', internalType: 'address' },
+      { name: 'token1', type: 'address', internalType: 'address' },
+    ],
+    outputs: [
+      { name: 'balance0', type: 'uint256', internalType: 'uint256' },
+      { name: 'balance1', type: 'uint256', internalType: 'uint256' },
+    ],
+    stateMutability: 'view',
+  },
   {
     type: 'function',
     name: 'ship',
@@ -131,6 +150,16 @@ export const AQUA_ABI = [
       { name: 'token', type: 'address', internalType: 'address' },
     ],
   },
+  {
+    type: 'error',
+    name: 'SafeBalancesForTokenNotInActiveStrategy',
+    inputs: [
+      { name: 'maker', type: 'address', internalType: 'address' },
+      { name: 'app', type: 'address', internalType: 'address' },
+      { name: 'strategyHash', type: 'bytes32', internalType: 'bytes32' },
+      { name: 'token', type: 'address', internalType: 'address' },
+    ],
+  },
   {
     type: 'error',
     name: 'SafeCastOverflowedUintDowncast',

typescript/aqua/tests/aqua.spec.ts

@@ -21,12 +21,14 @@ describe('Aqua', () => {
     strategyHash: Hex,
     token: Address | Hex,
   ): Promise<bigint> => {
-    return forkNode.provider.readContract({
+    const [balance] = await forkNode.provider.readContract({
       address: forkNode.addresses.aqua,
       abi: AQUA_ABI,
-      functionName: 'balances',
+      functionName: 'rawBalances',
       args: [maker.toString() as Hex, app.toString() as Hex, strategyHash, token.toString() as Hex],
     })
+
+    return balance
   }
 
   beforeAll(async () => {

typescript/swap-vm/tests/swap-vm.spec.ts

@@ -5,7 +5,7 @@ import { Address, HexString } from '@1inch/sdk-core'
 import { ADDRESSES } from '@1inch/sdk-core/test-utils'
 import type { Hex } from 'viem'
 import { decodeFunctionResult, parseUnits } from 'viem'
-import { ABI, AquaProtocolContract } from '@1inch/aqua-sdk'
+import { AquaProtocolContract, ABI } from '@1inch/aqua-sdk'
 import { ReadyEvmFork } from './setup-evm.js'
 import { Order } from '../src/swap-vm/order.js'
 import { MakerTraits } from '../src/swap-vm/maker-traits.js'
@@ -32,12 +32,14 @@ describe('SwapVM', () => {
     strategyHash: Hex,
     token: Address | Hex,
   ): Promise<bigint> => {
-    return forkNode.provider.readContract({
+    const [balance] = await forkNode.provider.readContract({
       address: forkNode.addresses.aqua,
       abi: ABI.AQUA_ABI,
-      functionName: 'balances',
+      functionName: 'rawBalances',
       args: [maker.toString() as Hex, app.toString() as Hex, strategyHash, token.toString() as Hex],
     })
+
+    return balance
   }
 
   beforeAll(async () => {
@@ -66,14 +68,8 @@ describe('SwapVM', () => {
     const hashFromContract = await forkNode.provider.readContract({
       address: forkNode.addresses.swapVMAquaRouter,
       abi: SWAP_VM_ABI,
-      functionName: 'hashOrder',
-      args: [
-        {
-          maker: order.maker.toString(),
-          program: order.program.toString(),
-          traits: order.traits.asBigInt(),
-        },
-      ],
+      functionName: 'hash',
+      args: [order.build()],
     })
 
     expect(calculatedHash.toString()).toEqual(hashFromContract)
@@ -269,21 +265,22 @@ describe('SwapVM', () => {
     }
 
     // Simulate the call to get the dstAmount
-    const simulateResult = await forkNode.provider.call({
-      account: swapperAddress,
-      ...swapVM.quote(swapParams),
-    })
-
-    const [_, dstAmount] = decodeFunctionResult({
-      abi: SWAP_VM_ABI,
-      functionName: 'quote',
-      data: simulateResult.data!,
-    })
-
+    // const simulateResult = await forkNode.provider.call({
+    //   account: swapperAddress,
+    //   ...swapVM.quote(swapParams),
+    // })
+
+    // const [_, dstAmount] = decodeFunctionResult({
+    //   abi: SWAP_VM_ABI,
+    //   functionName: 'quote',
+    //   data: simulateResult.data!,
+    // })
+
+    const dstAmount = 1000n
     const swap = swapVM.swap(swapParams)
 
-    const { txHash: _swapTx } = await swapper.send({ ...swap, allowFail: false })
-    // await forkNode.printTrace(swapTx)
+    const { txHash: swapTx } = await swapper.send({ ...swap, allowFail: true })
+    await forkNode.printTrace(swapTx)
 
     const providerWethBalanceAfter = await getAquaBalance(
       liqProviderAddress,