@paraswap/dex-lib 4.0.26 → 4.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "4.0.26",
+  "version": "4.0.27",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/dex/algebra/config.ts

@@ -95,7 +95,7 @@ export const AlgebraConfig: DexConfigMap<DexParams> = {
       initRetryFrequency: 10,
       // AlgebraStateMulticall
       algebraStateMulticall: '0x49C46f7f88110ccA234ef27Cd664510f7bbF5998',
-      subgraphURL: 'YwkNWffc8UTH77wDqGWgMShMq1uXdiQsD5wrD5MzKwJ',
+      subgraphURL: 'AAA1vYjxwFHzbt6qKwLHNcDSASyr1J1xVViDH8gTMFMR',
       uniswapMulticall: '0x4dfa9a980efE4802E969AC33968E3d6E59B8a19e',
       deployer: '0xC1b576AC6Ec749d5Ace1787bF9Ec6340908ddB47',
       version: 'v1.9-bidirectional-fee',

package/src/dex/balancer-v2/scripts/abi.json

@@ -0,0 +1,339 @@
+[
+  {
+    "inputs": [
+      { "internalType": "uint256[]", "name": "balances", "type": "uint256[]" },
+      { "internalType": "uint256", "name": "amountOut", "type": "uint256" },
+      { "internalType": "bool", "name": "tokenInIsToken0", "type": "bool" },
+      {
+        "components": [
+          { "internalType": "int256", "name": "alpha", "type": "int256" },
+          { "internalType": "int256", "name": "beta", "type": "int256" },
+          { "internalType": "int256", "name": "c", "type": "int256" },
+          { "internalType": "int256", "name": "s", "type": "int256" },
+          { "internalType": "int256", "name": "lambda", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.Params",
+        "name": "params",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          {
+            "components": [
+              { "internalType": "int256", "name": "x", "type": "int256" },
+              { "internalType": "int256", "name": "y", "type": "int256" }
+            ],
+            "internalType": "struct GyroECLPMath.Vector2",
+            "name": "tauAlpha",
+            "type": "tuple"
+          },
+          {
+            "components": [
+              { "internalType": "int256", "name": "x", "type": "int256" },
+              { "internalType": "int256", "name": "y", "type": "int256" }
+            ],
+            "internalType": "struct GyroECLPMath.Vector2",
+            "name": "tauBeta",
+            "type": "tuple"
+          },
+          { "internalType": "int256", "name": "u", "type": "int256" },
+          { "internalType": "int256", "name": "v", "type": "int256" },
+          { "internalType": "int256", "name": "w", "type": "int256" },
+          { "internalType": "int256", "name": "z", "type": "int256" },
+          { "internalType": "int256", "name": "dSq", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.DerivedParams",
+        "name": "derived",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          { "internalType": "int256", "name": "x", "type": "int256" },
+          { "internalType": "int256", "name": "y", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.Vector2",
+        "name": "invariant",
+        "type": "tuple"
+      }
+    ],
+    "name": "calcInGivenOut",
+    "outputs": [
+      { "internalType": "uint256", "name": "amountIn", "type": "uint256" }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "uint256[]", "name": "balances", "type": "uint256[]" },
+      { "internalType": "uint256", "name": "amountIn", "type": "uint256" },
+      { "internalType": "bool", "name": "tokenInIsToken0", "type": "bool" },
+      {
+        "components": [
+          { "internalType": "int256", "name": "alpha", "type": "int256" },
+          { "internalType": "int256", "name": "beta", "type": "int256" },
+          { "internalType": "int256", "name": "c", "type": "int256" },
+          { "internalType": "int256", "name": "s", "type": "int256" },
+          { "internalType": "int256", "name": "lambda", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.Params",
+        "name": "params",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          {
+            "components": [
+              { "internalType": "int256", "name": "x", "type": "int256" },
+              { "internalType": "int256", "name": "y", "type": "int256" }
+            ],
+            "internalType": "struct GyroECLPMath.Vector2",
+            "name": "tauAlpha",
+            "type": "tuple"
+          },
+          {
+            "components": [
+              { "internalType": "int256", "name": "x", "type": "int256" },
+              { "internalType": "int256", "name": "y", "type": "int256" }
+            ],
+            "internalType": "struct GyroECLPMath.Vector2",
+            "name": "tauBeta",
+            "type": "tuple"
+          },
+          { "internalType": "int256", "name": "u", "type": "int256" },
+          { "internalType": "int256", "name": "v", "type": "int256" },
+          { "internalType": "int256", "name": "w", "type": "int256" },
+          { "internalType": "int256", "name": "z", "type": "int256" },
+          { "internalType": "int256", "name": "dSq", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.DerivedParams",
+        "name": "derived",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          { "internalType": "int256", "name": "x", "type": "int256" },
+          { "internalType": "int256", "name": "y", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.Vector2",
+        "name": "invariant",
+        "type": "tuple"
+      }
+    ],
+    "name": "calcOutGivenIn",
+    "outputs": [
+      { "internalType": "uint256", "name": "amountOut", "type": "uint256" }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "uint256[]", "name": "balances", "type": "uint256[]" },
+      {
+        "components": [
+          { "internalType": "int256", "name": "alpha", "type": "int256" },
+          { "internalType": "int256", "name": "beta", "type": "int256" },
+          { "internalType": "int256", "name": "c", "type": "int256" },
+          { "internalType": "int256", "name": "s", "type": "int256" },
+          { "internalType": "int256", "name": "lambda", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.Params",
+        "name": "params",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          {
+            "components": [
+              { "internalType": "int256", "name": "x", "type": "int256" },
+              { "internalType": "int256", "name": "y", "type": "int256" }
+            ],
+            "internalType": "struct GyroECLPMath.Vector2",
+            "name": "tauAlpha",
+            "type": "tuple"
+          },
+          {
+            "components": [
+              { "internalType": "int256", "name": "x", "type": "int256" },
+              { "internalType": "int256", "name": "y", "type": "int256" }
+            ],
+            "internalType": "struct GyroECLPMath.Vector2",
+            "name": "tauBeta",
+            "type": "tuple"
+          },
+          { "internalType": "int256", "name": "u", "type": "int256" },
+          { "internalType": "int256", "name": "v", "type": "int256" },
+          { "internalType": "int256", "name": "w", "type": "int256" },
+          { "internalType": "int256", "name": "z", "type": "int256" },
+          { "internalType": "int256", "name": "dSq", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.DerivedParams",
+        "name": "derived",
+        "type": "tuple"
+      },
+      { "internalType": "int256", "name": "invariant", "type": "int256" }
+    ],
+    "name": "calcSpotPrice0in1",
+    "outputs": [{ "internalType": "uint256", "name": "px", "type": "uint256" }],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "uint256[]", "name": "balances", "type": "uint256[]" },
+      {
+        "components": [
+          { "internalType": "int256", "name": "alpha", "type": "int256" },
+          { "internalType": "int256", "name": "beta", "type": "int256" },
+          { "internalType": "int256", "name": "c", "type": "int256" },
+          { "internalType": "int256", "name": "s", "type": "int256" },
+          { "internalType": "int256", "name": "lambda", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.Params",
+        "name": "params",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          {
+            "components": [
+              { "internalType": "int256", "name": "x", "type": "int256" },
+              { "internalType": "int256", "name": "y", "type": "int256" }
+            ],
+            "internalType": "struct GyroECLPMath.Vector2",
+            "name": "tauAlpha",
+            "type": "tuple"
+          },
+          {
+            "components": [
+              { "internalType": "int256", "name": "x", "type": "int256" },
+              { "internalType": "int256", "name": "y", "type": "int256" }
+            ],
+            "internalType": "struct GyroECLPMath.Vector2",
+            "name": "tauBeta",
+            "type": "tuple"
+          },
+          { "internalType": "int256", "name": "u", "type": "int256" },
+          { "internalType": "int256", "name": "v", "type": "int256" },
+          { "internalType": "int256", "name": "w", "type": "int256" },
+          { "internalType": "int256", "name": "z", "type": "int256" },
+          { "internalType": "int256", "name": "dSq", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.DerivedParams",
+        "name": "derived",
+        "type": "tuple"
+      }
+    ],
+    "name": "calculateInvariant",
+    "outputs": [
+      { "internalType": "uint256", "name": "uinvariant", "type": "uint256" }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "uint256[]", "name": "balances", "type": "uint256[]" },
+      {
+        "components": [
+          { "internalType": "int256", "name": "alpha", "type": "int256" },
+          { "internalType": "int256", "name": "beta", "type": "int256" },
+          { "internalType": "int256", "name": "c", "type": "int256" },
+          { "internalType": "int256", "name": "s", "type": "int256" },
+          { "internalType": "int256", "name": "lambda", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.Params",
+        "name": "params",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          {
+            "components": [
+              { "internalType": "int256", "name": "x", "type": "int256" },
+              { "internalType": "int256", "name": "y", "type": "int256" }
+            ],
+            "internalType": "struct GyroECLPMath.Vector2",
+            "name": "tauAlpha",
+            "type": "tuple"
+          },
+          {
+            "components": [
+              { "internalType": "int256", "name": "x", "type": "int256" },
+              { "internalType": "int256", "name": "y", "type": "int256" }
+            ],
+            "internalType": "struct GyroECLPMath.Vector2",
+            "name": "tauBeta",
+            "type": "tuple"
+          },
+          { "internalType": "int256", "name": "u", "type": "int256" },
+          { "internalType": "int256", "name": "v", "type": "int256" },
+          { "internalType": "int256", "name": "w", "type": "int256" },
+          { "internalType": "int256", "name": "z", "type": "int256" },
+          { "internalType": "int256", "name": "dSq", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.DerivedParams",
+        "name": "derived",
+        "type": "tuple"
+      }
+    ],
+    "name": "calculateInvariantWithError",
+    "outputs": [
+      { "internalType": "int256", "name": "", "type": "int256" },
+      { "internalType": "int256", "name": "", "type": "int256" }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "components": [
+          { "internalType": "int256", "name": "alpha", "type": "int256" },
+          { "internalType": "int256", "name": "beta", "type": "int256" },
+          { "internalType": "int256", "name": "c", "type": "int256" },
+          { "internalType": "int256", "name": "s", "type": "int256" },
+          { "internalType": "int256", "name": "lambda", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.Params",
+        "name": "params",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          {
+            "components": [
+              { "internalType": "int256", "name": "x", "type": "int256" },
+              { "internalType": "int256", "name": "y", "type": "int256" }
+            ],
+            "internalType": "struct GyroECLPMath.Vector2",
+            "name": "tauAlpha",
+            "type": "tuple"
+          },
+          {
+            "components": [
+              { "internalType": "int256", "name": "x", "type": "int256" },
+              { "internalType": "int256", "name": "y", "type": "int256" }
+            ],
+            "internalType": "struct GyroECLPMath.Vector2",
+            "name": "tauBeta",
+            "type": "tuple"
+          },
+          { "internalType": "int256", "name": "u", "type": "int256" },
+          { "internalType": "int256", "name": "v", "type": "int256" },
+          { "internalType": "int256", "name": "w", "type": "int256" },
+          { "internalType": "int256", "name": "z", "type": "int256" },
+          { "internalType": "int256", "name": "dSq", "type": "int256" }
+        ],
+        "internalType": "struct GyroECLPMath.DerivedParams",
+        "name": "derived",
+        "type": "tuple"
+      }
+    ],
+    "name": "validateDerivedParamsLimits",
+    "outputs": [],
+    "stateMutability": "pure",
+    "type": "function"
+  }
+]

package/src/dex/balancer-v2/scripts/test.test.ts

@@ -0,0 +1,121 @@
+import {
+  GyroEMaths,
+  Gyro2Maths,
+  Gyro3Maths,
+  DerivedGyroEParams,
+} from '@balancer-labs/sor';
+import { Interface } from '@ethersproject/abi';
+import { BigNumber } from 'ethers';
+import abi from './abi.json';
+
+// GyroEMaths.calcOutGivenIn();
+// Gyro2Maths._calcOutGivenIn();
+// Gyro3Maths._calcOutGivenIn();
+
+const iface = new Interface(abi);
+
+iface;
+
+describe('Balancer V2', () => {
+  it('should work', () => {
+    const a = iface.getFunction('calcOutGivenIn');
+    // for (const func of Array.from(Object.values(iface.functions))) {
+    //   console.log(func.name, iface.getSighash(func.name));
+    // }
+    // console.log(iface);
+    const res = iface.decodeFunctionData(
+      'calcOutGivenIn',
+      `0x8e4745e40000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000eb1a9b92135e000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000b469471f8014000000000000000000000000000000000000000000000000000107ad8f556c6c00000000000000000000000000000000000000000000000000009be601cefc3171300000000000000000000000000000000000000000000000009e1cbaaa8d304d10000000000000000000000000000000000000000000000006124fee993bc0000ffffffffffffffffffffffffffffffffd1f35207dbac7faf93327a7968129abd000000000000000000000000000000003b7dd3de71da8605031cc87d4f669e8c00000000000000000000000000000000244588dab51864f925308eeb9a6b692a0000000000000000000000000000000041e90a1db37afb34ed577881bbe62abd0000000000000000000000000000000029280f48cc41e49bf9bdefc1cf627d48000000000000000000000000000000003ebf047daef0e9f1179c2428df5ffb5f000000000000000000000000000000000335863789b949ef74e3639b4ac1cbbdfffffffffffffffffffffffffffffffffa87dce2be9da7c4ab8d70c44b4ee2a5000000000000000000000000000000004b3b4ca85a86c47ad768bf58ebe9bbe800000000000000000000000000000000000000000000000ae1d515a532d75f4200000000000000000000000000000000000000000000000ae1d515a532d75f3c000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000003b2e545742f021f1e000000000000000000000000000000000000000000000000000a14eb28b61c000`,
+    );
+
+    const data = {
+      amountIn: res.amountIn.toString(),
+      // @ts-ignore
+      balances: res.balances.map(t => t.toString()),
+      // @ts-ignore
+      invariant: res.invariant.map(t => t.toString()),
+    };
+
+    // @ts-ignore
+    const balances = res.balances.map(t => BigNumber.from(t));
+    // @ts-ignore
+    const amountIn = BigNumber.from(res.amountIn);
+
+    const res1 = GyroEMaths.calcOutGivenIn(
+      // @ts-ignore
+      balances,
+      // @ts-ignore
+      amountIn,
+      // @ts-ignore
+      res.tokenInIsToken0,
+      // @ts-ignore
+      res.params,
+      // @ts-ignore
+      res.derived,
+      // @ts-ignore
+      res.invariant,
+    );
+    console.log(res);
+  });
+});
+
+const params = {
+  swapRequest: {
+    kind: '0',
+    tokenIn: '0x4200000000000000000000000000000000000006',
+    tokenOut: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+    amount: '16941024000000000000',
+    poolId:
+      '0x1a63b425600d775a1e1bfc212f021273812c3b160002000000000000000001a7',
+    lastChangeBlock: '25583670',
+    from: '0x59c7c832e96d2568bea6db468c1aadcbbda08a52',
+    to: '0x59c7c832e96d2568bea6db468c1aadcbbda08a52',
+    userData: '0x',
+  },
+  balances: ['1091696289517660140000', '45404000000000000'],
+  tokenInIsToken0: true,
+  eclpParams: {
+    alpha: BigNumber.from('812500000000000000'),
+    beta: BigNumber.from('1187500000000000000'),
+    c: BigNumber.from('702104269314266899'),
+    s: BigNumber.from('712074149938529489'),
+    lambda: BigNumber.from('7000000000000000000'),
+  },
+  derivedECLPParams: {
+    tauAlpha: {
+      x: '960',
+      y: '1024',
+    },
+    tauBeta: {
+      x: '54706349705309301454914549190626540872',
+      y: '83403955525945303751187915386843560799',
+    },
+    u: '4265597963916367863499663222916631485',
+    v: '-7269927804137016433476462764480339291',
+    w: '100000000000000000014834466952967732200',
+    z: '-61210323885096690504742396048605799747',
+    dSq: '79077786070941323452088008583454039692',
+  },
+  invariant: {
+    x: '200740377364935434050',
+    y: '200740377364935434044',
+  },
+};
+
+// GyroEMaths.calcOutGivenIn(
+//   params.balances.map(t => BigNumber.from(t)),
+//   BigNumber.from(params.swapRequest.amount),
+//   params.tokenInIsToken0,
+//   params.eclpParams,
+//   params.derivedECLPParams,
+//   params.invariant,
+// );
+
+// const amountOut = GyroEMaths.calcOutGivenIn(
+//   orderedNormalizedBalances,
+//   BigNumber.from(amount),
+//   poolPairData.tokenInIsToken0,
+//   poolPairData.gyroParams,
+//   poolPairData.gyroDerivedParams,
+//   invariant,
+// ).toBigInt();

package/src/generic-swap-transaction-builder.ts

@@ -447,7 +447,7 @@ export class GenericSwapTransactionBuilder {
     uuid: string;
     beneficiary?: Address;
     onlyParams?: boolean;
-  }): Promise<TxObject> {
+  }): Promise<TxObject | (string | string[])[]> {
     // if beneficiary is not defined, then in smart contract it will be replaced to msg.sender
     const _beneficiary =
       beneficiary !== NULL_ADDRESS &&
@@ -494,6 +494,8 @@ export class GenericSwapTransactionBuilder {
       ));
     }
 
+    if (onlyParams) return params;
+
     const value = (
       priceRoute.srcToken.toLowerCase() === ETHER_ADDRESS.toLowerCase()
         ? BigInt(

package/tests/utils-e2e.ts

@@ -214,7 +214,7 @@ class APIParaswapSDK implements IParaSwapSDK {
     const minMaxAmount = _minMaxAmount.toString();
     let deadline = Number((Math.floor(Date.now() / 1000) + 10 * 60).toFixed());
 
-    return await this.transactionBuilder.build({
+    return (await this.transactionBuilder.build({
       priceRoute,
       minMaxAmount: minMaxAmount.toString(),
       userAddress,
@@ -222,7 +222,7 @@ class APIParaswapSDK implements IParaSwapSDK {
       partnerFeePercent: '0',
       deadline: deadline.toString(),
       uuid: uuid(),
-    });
+    })) as TxObject;
   }
 }