@eco-incorp/sauce 0.99.3 → 0.99.5

package/sdk/src/protocols/fluid/functions.ts

@@ -1,35 +1,37 @@
 export const deposit = `
-import { FluidLendingABI as IFluidLending } from "./abis";
+import { FluidLendingABI as IFToken } from "./abis";
 
-function main(liquidityAddress: Address, token: Address, amount: Uint256, to: Address): Uint256 {
-  const lending = IFluidLending.at(liquidityAddress);
-  return lending.deposit(token, amount, to);
+function main(fTokenAddress: Address, amount: Uint256, to: Address): Uint256 {
+  const fToken = IFToken.at(fTokenAddress);
+  return fToken.deposit(amount, to);
 }
 `;
 
 export const withdraw = `
-import { FluidLendingABI as IFluidLending } from "./abis";
+import { FluidLendingABI as IFToken } from "./abis";
 
-function main(liquidityAddress: Address, token: Address, amount: Uint256, to: Address): Uint256 {
-  const lending = IFluidLending.at(liquidityAddress);
-  return lending.withdraw(token, amount, to);
+function main(fTokenAddress: Address, amount: Uint256, to: Address, owner: Address): Uint256 {
+  const fToken = IFToken.at(fTokenAddress);
+  return fToken.withdraw(amount, to, owner);
 }
 `;
 
 export const borrow = `
-import { FluidLendingABI as IFluidLending } from "./abis";
+import { FluidVaultABI as IFluidVault } from "./abis";
 
-function main(liquidityAddress: Address, token: Address, amount: Uint256, to: Address): Uint256 {
-  const lending = IFluidLending.at(liquidityAddress);
-  return lending.borrow(token, amount, to);
+function main(vaultAddress: Address, nftId: Uint256, amount: Uint256, to: Address): Uint256 {
+  const vault = IFluidVault.at(vaultAddress);
+  vault.operate(nftId, 0, amount, to);
+  return 1;
 }
 `;
 
 export const repay = `
-import { FluidLendingABI as IFluidLending } from "./abis";
+import { FluidVaultABI as IFluidVault } from "./abis";
 
-function main(liquidityAddress: Address, token: Address, amount: Uint256, onBehalfOf: Address): Uint256 {
-  const lending = IFluidLending.at(liquidityAddress);
-  return lending.repay(token, amount, onBehalfOf);
+function main(vaultAddress: Address, nftId: Uint256, negativeDebtDelta: Uint256, to: Address): Uint256 {
+  const vault = IFluidVault.at(vaultAddress);
+  vault.operate(nftId, 0, negativeDebtDelta, to);
+  return 1;
 }
 `;

package/sdk/src/protocols/gains-network/DiamondABI.json

@@ -6,58 +6,78 @@
       "stateMutability": "nonpayable",
       "inputs": [
         {
-          "name": "t",
+          "name": "trade",
           "type": "tuple",
           "components": [
             {
-              "name": "trader",
+              "name": "user",
               "type": "address"
             },
+            {
+              "name": "index",
+              "type": "uint32"
+            },
             {
               "name": "pairIndex",
-              "type": "uint256"
+              "type": "uint16"
             },
             {
-              "name": "index",
-              "type": "uint256"
+              "name": "leverage",
+              "type": "uint24"
             },
             {
-              "name": "initialPosToken",
-              "type": "uint256"
+              "name": "long",
+              "type": "bool"
             },
             {
-              "name": "positionSizeDai",
-              "type": "uint256"
+              "name": "isOpen",
+              "type": "bool"
             },
             {
-              "name": "openPrice",
-              "type": "uint256"
+              "name": "collateralIndex",
+              "type": "uint8"
             },
             {
-              "name": "buy",
-              "type": "bool"
+              "name": "tradeType",
+              "type": "uint8"
             },
             {
-              "name": "leverage",
-              "type": "uint256"
+              "name": "collateralAmount",
+              "type": "uint120"
+            },
+            {
+              "name": "openPrice",
+              "type": "uint64"
             },
             {
               "name": "tp",
-              "type": "uint256"
+              "type": "uint64"
             },
             {
               "name": "sl",
-              "type": "uint256"
+              "type": "uint64"
+            },
+            {
+              "name": "isCounterTrade",
+              "type": "bool"
+            },
+            {
+              "name": "positionSizeToken",
+              "type": "uint160"
+            },
+            {
+              "name": "__placeholder",
+              "type": "uint24"
             }
           ]
         },
         {
-          "name": "orderType",
-          "type": "uint8"
+          "name": "maxSlippageP",
+          "type": "uint16"
         },
         {
-          "name": "slippageP",
-          "type": "uint256"
+          "name": "referrer",
+          "type": "address"
         }
       ],
       "outputs": []
@@ -68,12 +88,12 @@
       "stateMutability": "nonpayable",
       "inputs": [
         {
-          "name": "pairIndex",
-          "type": "uint256"
+          "name": "index",
+          "type": "uint32"
         },
         {
-          "name": "index",
-          "type": "uint256"
+          "name": "expectedPrice",
+          "type": "uint64"
         }
       ],
       "outputs": []
@@ -83,17 +103,13 @@
       "type": "function",
       "stateMutability": "nonpayable",
       "inputs": [
-        {
-          "name": "pairIndex",
-          "type": "uint256"
-        },
         {
           "name": "index",
-          "type": "uint256"
+          "type": "uint32"
         },
         {
           "name": "newSl",
-          "type": "uint256"
+          "type": "uint64"
         }
       ],
       "outputs": []
@@ -103,17 +119,13 @@
       "type": "function",
       "stateMutability": "nonpayable",
       "inputs": [
-        {
-          "name": "pairIndex",
-          "type": "uint256"
-        },
         {
           "name": "index",
-          "type": "uint256"
+          "type": "uint32"
         },
         {
           "name": "newTp",
-          "type": "uint256"
+          "type": "uint64"
         }
       ],
       "outputs": []

package/sdk/src/protocols/gains-network/abis.ts

@@ -1,3 +1,5 @@
+// gTrade's multi-collateral Diamond (GNSMultiCollatDiamond, v8+): trades are addressed by the
+// trader's per-user `index`, not by (pairIndex, index), and prices/levels are packed integers.
 export const DiamondABI = [
   {
     name: "openTrade",
@@ -5,23 +7,28 @@ export const DiamondABI = [
     stateMutability: "nonpayable",
     inputs: [
       {
-        name: "t",
+        name: "trade",
         type: "tuple",
         components: [
-          { name: "trader", type: "address" },
-          { name: "pairIndex", type: "uint256" },
-          { name: "index", type: "uint256" },
-          { name: "initialPosToken", type: "uint256" },
-          { name: "positionSizeDai", type: "uint256" },
-          { name: "openPrice", type: "uint256" },
-          { name: "buy", type: "bool" },
-          { name: "leverage", type: "uint256" },
-          { name: "tp", type: "uint256" },
-          { name: "sl", type: "uint256" },
+          { name: "user", type: "address" },
+          { name: "index", type: "uint32" },
+          { name: "pairIndex", type: "uint16" },
+          { name: "leverage", type: "uint24" },
+          { name: "long", type: "bool" },
+          { name: "isOpen", type: "bool" },
+          { name: "collateralIndex", type: "uint8" },
+          { name: "tradeType", type: "uint8" },
+          { name: "collateralAmount", type: "uint120" },
+          { name: "openPrice", type: "uint64" },
+          { name: "tp", type: "uint64" },
+          { name: "sl", type: "uint64" },
+          { name: "isCounterTrade", type: "bool" },
+          { name: "positionSizeToken", type: "uint160" },
+          { name: "__placeholder", type: "uint24" },
         ],
       },
-      { name: "orderType", type: "uint8" },
-      { name: "slippageP", type: "uint256" },
+      { name: "maxSlippageP", type: "uint16" },
+      { name: "referrer", type: "address" },
     ],
     outputs: [],
   },
@@ -30,8 +37,8 @@ export const DiamondABI = [
     type: "function",
     stateMutability: "nonpayable",
     inputs: [
-      { name: "pairIndex", type: "uint256" },
-      { name: "index", type: "uint256" },
+      { name: "index", type: "uint32" },
+      { name: "expectedPrice", type: "uint64" },
     ],
     outputs: [],
   },
@@ -40,9 +47,8 @@ export const DiamondABI = [
     type: "function",
     stateMutability: "nonpayable",
     inputs: [
-      { name: "pairIndex", type: "uint256" },
-      { name: "index", type: "uint256" },
-      { name: "newSl", type: "uint256" },
+      { name: "index", type: "uint32" },
+      { name: "newSl", type: "uint64" },
     ],
     outputs: [],
   },
@@ -51,9 +57,8 @@ export const DiamondABI = [
     type: "function",
     stateMutability: "nonpayable",
     inputs: [
-      { name: "pairIndex", type: "uint256" },
-      { name: "index", type: "uint256" },
-      { name: "newTp", type: "uint256" },
+      { name: "index", type: "uint32" },
+      { name: "newTp", type: "uint64" },
     ],
     outputs: [],
   },

package/sdk/src/protocols/gains-network/functions.ts

@@ -1,9 +1,9 @@
 export const closeTradeMarket = `
 import { DiamondABI as IDiamond } from "./abis";
 
-function main(diamondAddress: Address, pairIndex: Uint256, index: Uint256): Uint256 {
+function main(diamondAddress: Address, index: Uint256, expectedPrice: Uint256): Uint256 {
   const diamond = IDiamond.at(diamondAddress);
-  diamond.closeTradeMarket(pairIndex, index);
+  diamond.closeTradeMarket(index, expectedPrice);
   return 1;
 }
 `;
@@ -11,9 +11,9 @@ function main(diamondAddress: Address, pairIndex: Uint256, index: Uint256): Uint
 export const updateStopLoss = `
 import { DiamondABI as IDiamond } from "./abis";
 
-function main(diamondAddress: Address, pairIndex: Uint256, index: Uint256, newSl: Uint256): Uint256 {
+function main(diamondAddress: Address, index: Uint256, newSl: Uint256): Uint256 {
   const diamond = IDiamond.at(diamondAddress);
-  diamond.updateSl(pairIndex, index, newSl);
+  diamond.updateSl(index, newSl);
   return 1;
 }
 `;
@@ -21,9 +21,9 @@ function main(diamondAddress: Address, pairIndex: Uint256, index: Uint256, newSl
 export const updateTakeProfit = `
 import { DiamondABI as IDiamond } from "./abis";
 
-function main(diamondAddress: Address, pairIndex: Uint256, index: Uint256, newTp: Uint256): Uint256 {
+function main(diamondAddress: Address, index: Uint256, newTp: Uint256): Uint256 {
   const diamond = IDiamond.at(diamondAddress);
-  diamond.updateTp(pairIndex, index, newTp);
+  diamond.updateTp(index, newTp);
   return 1;
 }
 `;

package/sdk/src/protocols/gamma/UniProxyLegacyABI.json

@@ -0,0 +1,62 @@
+{
+  "abi": [
+    {
+      "name": "deposit",
+      "type": "function",
+      "stateMutability": "nonpayable",
+      "inputs": [
+        {
+          "name": "deposit0",
+          "type": "uint256"
+        },
+        {
+          "name": "deposit1",
+          "type": "uint256"
+        },
+        {
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "name": "pos",
+          "type": "address"
+        }
+      ],
+      "outputs": [
+        {
+          "name": "shares",
+          "type": "uint256"
+        }
+      ]
+    },
+    {
+      "name": "getDepositAmount",
+      "type": "function",
+      "stateMutability": "view",
+      "inputs": [
+        {
+          "name": "pos",
+          "type": "address"
+        },
+        {
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "name": "_deposit",
+          "type": "uint256"
+        }
+      ],
+      "outputs": [
+        {
+          "name": "amountStart",
+          "type": "uint256"
+        },
+        {
+          "name": "amountEnd",
+          "type": "uint256"
+        }
+      ]
+    }
+  ]
+}

package/sdk/src/protocols/gamma/abis.ts

@@ -28,6 +28,37 @@ export const UniProxyABI = [
   },
 ] as const;
 
+// The UniProxy the Ethereum entry lists (0xf5bfa20f…d599) is an earlier release: its `deposit` has
+// no `minIn` slippage argument. UniProxyABI above is the current release's, as on Polygon.
+export const UniProxyLegacyABI = [
+  {
+    name: "deposit",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [
+      { name: "deposit0", type: "uint256" },
+      { name: "deposit1", type: "uint256" },
+      { name: "to", type: "address" },
+      { name: "pos", type: "address" },
+    ],
+    outputs: [{ name: "shares", type: "uint256" }],
+  },
+  {
+    name: "getDepositAmount",
+    type: "function",
+    stateMutability: "view",
+    inputs: [
+      { name: "pos", type: "address" },
+      { name: "token", type: "address" },
+      { name: "_deposit", type: "uint256" },
+    ],
+    outputs: [
+      { name: "amountStart", type: "uint256" },
+      { name: "amountEnd", type: "uint256" },
+    ],
+  },
+] as const;
+
 export const HypervisorABI = [
   {
     name: "withdraw",

package/sdk/src/protocols/gamma/addresses.ts

@@ -1,5 +1,7 @@
 import type { ChainDeployment } from "../../core/types.js";
 
+// No Arbitrum entry: the address listed there before is an old Visor hypervisor (xUSDC-ETH.05),
+// not a UniProxy. Gamma runs a separate UniProxy per DEX integration on Arbitrum.
 export const deployments: ChainDeployment[] = [
   {
     chainId: 1,
@@ -15,11 +17,4 @@ export const deployments: ChainDeployment[] = [
       uniProxy: "0xA42d55074869491D60Ac05490376B74cF19B00e6",
     },
   },
-  {
-    chainId: 42161,
-    chainName: "Arbitrum",
-    addresses: {
-      uniProxy: "0xf5bfa20f4a77933fee0c7bb7f39e7642a070d599",
-    },
-  },
 ];

package/sdk/src/protocols/gamma/functions.ts

@@ -7,6 +7,16 @@ function main(uniProxyAddress: Address, deposit0: Uint256, deposit1: Uint256, to
 }
 `;
 
+// For the Ethereum UniProxy, an earlier release whose deposit takes no minIn.
+export const depositLegacy = `
+import { UniProxyLegacyABI as IUniProxy } from "./abis";
+
+function main(uniProxyAddress: Address, deposit0: Uint256, deposit1: Uint256, to: Address, pos: Address): Uint256 {
+  const proxy = IUniProxy.at(uniProxyAddress);
+  return proxy.deposit(deposit0, deposit1, to, pos);
+}
+`;
+
 export const withdraw = `
 import { HypervisorABI as IHypervisor } from "./abis";
 

package/sdk/src/protocols/gelato/GelatoAutomateABI.json

@@ -35,7 +35,7 @@
       "outputs": [
         {
           "name": "taskId",
-          "type": "uint256"
+          "type": "bytes32"
         }
       ]
     },
@@ -46,7 +46,7 @@
       "inputs": [
         {
           "name": "taskId",
-          "type": "uint256"
+          "type": "bytes32"
         }
       ],
       "outputs": []

package/sdk/src/protocols/gelato/abis.ts

@@ -16,13 +16,13 @@ export const GelatoAutomateABI = [
       },
       { name: "feeToken", type: "address" },
     ],
-    outputs: [{ name: "taskId", type: "uint256" }],
+    outputs: [{ name: "taskId", type: "bytes32" }],
   },
   {
     name: "cancelTask",
     type: "function",
     stateMutability: "nonpayable",
-    inputs: [{ name: "taskId", type: "uint256" }],
+    inputs: [{ name: "taskId", type: "bytes32" }],
     outputs: [],
   },
 ] as const;

package/sdk/src/protocols/gmx-v1/PositionRouterABI.json

@@ -39,10 +39,19 @@
         },
         {
           "name": "_referralCode",
-          "type": "uint256"
+          "type": "bytes32"
+        },
+        {
+          "name": "_callbackTarget",
+          "type": "address"
         }
       ],
-      "outputs": []
+      "outputs": [
+        {
+          "name": "requestKey",
+          "type": "bytes32"
+        }
+      ]
     },
     {
       "name": "createDecreasePosition",
@@ -88,9 +97,18 @@
         {
           "name": "_withdrawETH",
           "type": "bool"
+        },
+        {
+          "name": "_callbackTarget",
+          "type": "address"
         }
       ],
-      "outputs": []
+      "outputs": [
+        {
+          "name": "requestKey",
+          "type": "bytes32"
+        }
+      ]
     }
   ]
 }

package/sdk/src/protocols/gmx-v1/abis.ts

@@ -54,9 +54,10 @@ export const PositionRouterABI = [
       { name: "_isLong", type: "bool" },
       { name: "_acceptablePrice", type: "uint256" },
       { name: "_executionFee", type: "uint256" },
-      { name: "_referralCode", type: "uint256" },
+      { name: "_referralCode", type: "bytes32" },
+      { name: "_callbackTarget", type: "address" },
     ],
-    outputs: [],
+    outputs: [{ name: "requestKey", type: "bytes32" }],
   },
   {
     name: "createDecreasePosition",
@@ -73,8 +74,9 @@ export const PositionRouterABI = [
       { name: "_minOut", type: "uint256" },
       { name: "_executionFee", type: "uint256" },
       { name: "_withdrawETH", type: "bool" },
+      { name: "_callbackTarget", type: "address" },
     ],
-    outputs: [],
+    outputs: [{ name: "requestKey", type: "bytes32" }],
   },
 ] as const;
 

package/sdk/src/protocols/gmx-v1/functions.ts

@@ -3,7 +3,7 @@ import { PositionRouterABI as IPositionRouter } from "./abis";
 
 function main(positionRouterAddress: Address, path: Address[], indexToken: Address, amountIn: Uint256, sizeDelta: Uint256, isLong: bool): Uint256 {
   const positionRouter = IPositionRouter.at(positionRouterAddress);
-  positionRouter.createIncreasePosition(path, indexToken, amountIn, 0, sizeDelta, isLong, 0, 200000000000000, 0x0000000000000000000000000000000000000000000000000000000000000000);
+  positionRouter.createIncreasePosition(path, indexToken, amountIn, 0, sizeDelta, isLong, 0, 200000000000000, 0x0000000000000000000000000000000000000000000000000000000000000000, 0x0000000000000000000000000000000000000000);
   return 1;
 }
 `;
@@ -13,7 +13,7 @@ import { PositionRouterABI as IPositionRouter } from "./abis";
 
 function main(positionRouterAddress: Address, path: Address[], indexToken: Address, collateralDelta: Uint256, sizeDelta: Uint256, isLong: bool, receiver: Address): Uint256 {
   const positionRouter = IPositionRouter.at(positionRouterAddress);
-  positionRouter.createDecreasePosition(path, indexToken, collateralDelta, sizeDelta, isLong, receiver, 0, 0, 200000000000000, false);
+  positionRouter.createDecreasePosition(path, indexToken, collateralDelta, sizeDelta, isLong, receiver, 0, 0, 200000000000000, false, 0x0000000000000000000000000000000000000000);
   return 1;
 }
 `;

package/sdk/src/protocols/gmx-v2/ExchangeRouterABI.json

@@ -74,6 +74,10 @@
                 {
                   "name": "minOutputAmount",
                   "type": "uint256"
+                },
+                {
+                  "name": "validFromTime",
+                  "type": "uint256"
                 }
               ]
             },
@@ -99,26 +103,30 @@
             },
             {
               "name": "referralCode",
-              "type": "uint256"
+              "type": "bytes32"
+            },
+            {
+              "name": "dataList",
+              "type": "bytes32[]"
             }
           ]
         }
       ],
       "outputs": [
         {
-          "name": "",
-          "type": "uint256"
+          "name": "orderKey",
+          "type": "bytes32"
         }
       ]
     },
     {
       "name": "cancelOrder",
       "type": "function",
-      "stateMutability": "nonpayable",
+      "stateMutability": "payable",
       "inputs": [
         {
           "name": "key",
-          "type": "uint256"
+          "type": "bytes32"
         }
       ],
       "outputs": []

package/sdk/src/protocols/gmx-v2/abis.ts

@@ -1,3 +1,4 @@
+// GMX v2 ExchangeRouter (the one RoleStore currently grants CONTROLLER; see addresses.ts).
 export const ExchangeRouterABI = [
   {
     name: "createOrder",
@@ -32,6 +33,7 @@ export const ExchangeRouterABI = [
               { name: "executionFee", type: "uint256" },
               { name: "callbackGasLimit", type: "uint256" },
               { name: "minOutputAmount", type: "uint256" },
+              { name: "validFromTime", type: "uint256" },
             ],
           },
           { name: "orderType", type: "uint8" },
@@ -39,17 +41,18 @@ export const ExchangeRouterABI = [
           { name: "isLong", type: "bool" },
           { name: "shouldUnwrapNativeToken", type: "bool" },
           { name: "autoCancel", type: "bool" },
-          { name: "referralCode", type: "uint256" },
+          { name: "referralCode", type: "bytes32" },
+          { name: "dataList", type: "bytes32[]" },
         ],
       },
     ],
-    outputs: [{ name: "", type: "uint256" }],
+    outputs: [{ name: "orderKey", type: "bytes32" }],
   },
   {
     name: "cancelOrder",
     type: "function",
-    stateMutability: "nonpayable",
-    inputs: [{ name: "key", type: "uint256" }],
+    stateMutability: "payable",
+    inputs: [{ name: "key", type: "bytes32" }],
     outputs: [],
   },
   {