@1delta/calldatalib 0.0.2 → 0.0.10

package/dist/CalldataLib.d.ts

@@ -114,15 +114,14 @@ export declare function encodeUniswapV4Sync(singleton: Address, asset: Address):
 export declare function encodeUniswapV4Take(singleton: Address, asset: Address, receiver: Address, amount: bigint): Hex;
 export declare function swapHead(amount: bigint, amountOutMin: bigint, assetIn: Address): Hex;
 export declare function attachBranch(data: Hex, hops: bigint, splits: bigint, splitsData: Hex): Hex;
-export declare function uniswapV2StyleSwap(tokenOut: Address, receiver: Address, forkId: bigint, pool: Address, feeDenom: bigint, cfg: any, flashCalldata: Hex): Hex;
-export declare function uniswapV4StyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, manager: Address, fee: number, tickSpacing: number, hooks: Address, hookData: Hex, cfg: any): Hex;
-export declare function balancerV2StyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, poolId: Hex, balancerVault: Address, cfg: any): Hex;
-export declare function lbStyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, pool: Address, swapForY: boolean, cfg: any): Hex;
-export declare function syncSwapStyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, pool: Address, cfg: any): Hex;
-export declare function uniswapV3StyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, forkId: bigint, pool: Address, feeTier: bigint, cfg: any, flashCalldata: Hex): Hex;
-export declare function izumiV3StyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, forkId: bigint, pool: Address, feeTier: bigint, cfg: any, flashCalldata: Hex): Hex;
-export declare function balancerV3StyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, balancerV3Vault: Address, pool: Address, cfg: any, poolUserData: Hex): Hex;
-export declare function encodeIzumiStyleSwap(tokenOut: Address, receiver: Address, forkId: bigint, pool: Address, feeTier: bigint, cfg: any, flashCalldata: Hex): Hex;
+export declare function encodeUniswapV2StyleSwap(tokenOut: Address, receiver: Address, forkId: bigint, pool: Address, feeDenom: bigint, cfg: any, flashCalldata: Hex): Hex;
+export declare function encodeUniswapV4StyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, manager: Address, fee: number, tickSpacing: number, hooks: Address, hookData: Hex, cfg: any): Hex;
+export declare function encodeBalancerV2StyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, poolId: Hex, balancerVault: Address, cfg: any): Hex;
+export declare function encodeLbStyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, pool: Address, swapForY: boolean, cfg: any): Hex;
+export declare function encodeSyncSwapStyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, pool: Address, cfg: any): Hex;
+export declare function encodeUniswapV3StyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, forkId: bigint, pool: Address, feeTier: bigint, cfg: any, flashCalldata: Hex): Hex;
+export declare function encodeIzumiStyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, forkId: bigint, pool: Address, feeTier: bigint, cfg: any, flashCalldata: Hex): Hex;
+export declare function encodeBalancerV3StyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, balancerV3Vault: Address, pool: Address, cfg: any, poolUserData: Hex): Hex;
 export declare function encodeDodoStyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, pool: Address, selector: any, poolId: bigint, cfg: any, flashCalldata: Hex): Hex;
 export declare function encodeWooStyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, pool: Address, cfg: any): Hex;
 export declare function encodeGmxStyleSwap(currentData: Hex, tokenOut: Address, receiver: Address, pool: Address, cfg: any): Hex;
@@ -131,7 +130,7 @@ export declare function encodeCurveStyleSwap(tokenOut: Address, receiver: Addres
 export declare function encodeCurveNGStyleSwap(tokenOut: Address, receiver: Address, pool: Address, indexIn: bigint, indexOut: bigint, selectorId: bigint, cfg: any): Hex;
 export declare function encodeNextGenDexSettle(singleton: Address, nativeAmount: bigint): Hex;
 export declare function encodeNextGenDexSettleBalancer(singleton: Address, asset: Address, amountHint: bigint): Hex;
-export declare function encodeTransferIn(asset: Address, receiver: Address, amount: bigint): Hex;
+export declare function encodeTransferIn(asset: Address, from: Address, amount: bigint): Hex;
 export declare function encodeSweep(asset: Address, receiver: Address, amount: bigint, sweepType: any): Hex;
 export declare function encodeWrap(amount: bigint, wrapTarget: Address): Hex;
 export declare function encodeApprove(asset: Address, target: Address): Hex;

package/dist/CalldataLib.js

@@ -189,7 +189,7 @@ export function attachBranch(data, hops, splits, splitsData) {
         throw new Error("Nosplitsbutsplitdataprovided");
     return encodePacked(["bytes", "uint8", "uint8", "bytes"], [data, uint8(hops), uint8(splits), splitsData]);
 }
-export function uniswapV2StyleSwap(tokenOut, receiver, forkId, pool, feeDenom, cfg, flashCalldata) {
+export function encodeUniswapV2StyleSwap(tokenOut, receiver, forkId, pool, feeDenom, cfg, flashCalldata) {
     if (uint256(cfg) < 2 && flashCalldata.length / 2 - 1 > 2)
         throw new Error("Invalidconfigforv2swap");
     return encodePacked(["address", "address", "uint8", "address", "uint16", "uint8", "uint16", "bytes"], [
@@ -199,11 +199,11 @@ export function uniswapV2StyleSwap(tokenOut, receiver, forkId, pool, feeDenom, c
         pool,
         uint16(feeDenom),
         uint8(forkId),
-        uint16(flashCalldata.length / 2 - 1),
+        uint16(cfg === DexPayConfig.FLASH ? flashCalldata.length / 2 - 1 : uint256(cfg)),
         bytes(cfg === DexPayConfig.FLASH ? flashCalldata : newbytes(0)),
     ]);
 }
-export function uniswapV4StyleSwap(currentData, tokenOut, receiver, manager, fee, tickSpacing, hooks, hookData, cfg) {
+export function encodeUniswapV4StyleSwap(currentData, tokenOut, receiver, manager, fee, tickSpacing, hooks, hookData, cfg) {
     if (cfg === DexPayConfig.FLASH)
         throw new Error("Invalidconfigforv2swap");
     return encodePacked(["bytes", "address", "address", "uint8", "address", "address", "uint24", "uint24", "uint8", "uint16", "bytes"], [
@@ -220,7 +220,7 @@ export function uniswapV4StyleSwap(currentData, tokenOut, receiver, manager, fee
         hookData,
     ]);
 }
-export function balancerV2StyleSwap(currentData, tokenOut, receiver, poolId, balancerVault, cfg) {
+export function encodeBalancerV2StyleSwap(currentData, tokenOut, receiver, poolId, balancerVault, cfg) {
     if (cfg === DexPayConfig.FLASH)
         throw new Error("Invalidconfigforv2swap");
     return encodePacked(["bytes", "address", "address", "uint8", "bytes32", "address", "uint16"], [
@@ -233,7 +233,7 @@ export function balancerV2StyleSwap(currentData, tokenOut, receiver, poolId, bal
         uint16(uint256(cfg)),
     ]);
 }
-export function lbStyleSwap(currentData, tokenOut, receiver, pool, swapForY, cfg) {
+export function encodeLbStyleSwap(currentData, tokenOut, receiver, pool, swapForY, cfg) {
     if (cfg === DexPayConfig.FLASH)
         throw new Error("Invalidconfigforv2swap");
     return encodePacked(["bytes", "address", "address", "uint8", "address", "uint8", "uint16"], [
@@ -246,12 +246,12 @@ export function lbStyleSwap(currentData, tokenOut, receiver, pool, swapForY, cfg
         uint16(uint256(cfg)),
     ]);
 }
-export function syncSwapStyleSwap(currentData, tokenOut, receiver, pool, cfg) {
+export function encodeSyncSwapStyleSwap(currentData, tokenOut, receiver, pool, cfg) {
     if (cfg === DexPayConfig.FLASH)
         throw new Error("Invalidconfigforv2swap");
     return encodePacked(["bytes", "address", "address", "uint8", "address", "uint16"], [currentData, tokenOut, receiver, uint8(DexTypeMappings.SYNC_SWAP_ID), pool, uint16(uint256(cfg))]);
 }
-export function uniswapV3StyleSwap(currentData, tokenOut, receiver, forkId, pool, feeTier, cfg, flashCalldata) {
+export function encodeUniswapV3StyleSwap(currentData, tokenOut, receiver, forkId, pool, feeTier, cfg, flashCalldata) {
     if (uint256(cfg) < 2 && flashCalldata.length / 2 - 1 > 2)
         throw new Error("Invalidconfigforv2swap");
     return encodePacked(["bytes", "address", "address", "uint8", "address", "uint8", "uint16", "uint16", "bytes"], [
@@ -266,7 +266,7 @@ export function uniswapV3StyleSwap(currentData, tokenOut, receiver, forkId, pool
         bytes(cfg === DexPayConfig.FLASH ? flashCalldata : newbytes(0)),
     ]);
 }
-export function izumiV3StyleSwap(currentData, tokenOut, receiver, forkId, pool, feeTier, cfg, flashCalldata) {
+export function encodeIzumiStyleSwap(currentData, tokenOut, receiver, forkId, pool, feeTier, cfg, flashCalldata) {
     if (uint256(cfg) < 2 && flashCalldata.length / 2 - 1 > 2)
         throw new Error("Invalidconfigforv2swap");
     return encodePacked(["bytes", "address", "address", "uint8", "address", "uint8", "uint16", "uint16", "bytes"], [
@@ -281,7 +281,7 @@ export function izumiV3StyleSwap(currentData, tokenOut, receiver, forkId, pool,
         bytes(cfg === DexPayConfig.FLASH ? flashCalldata : newbytes(0)),
     ]);
 }
-export function balancerV3StyleSwap(currentData, tokenOut, receiver, balancerV3Vault, pool, cfg, poolUserData) {
+export function encodeBalancerV3StyleSwap(currentData, tokenOut, receiver, balancerV3Vault, pool, cfg, poolUserData) {
     return encodePacked(["bytes", "address", "address", "uint8", "address", "address", "uint8", "uint16", "bytes"], [
         currentData,
         tokenOut,
@@ -294,20 +294,6 @@ export function balancerV3StyleSwap(currentData, tokenOut, receiver, balancerV3V
         poolUserData,
     ]);
 }
-export function encodeIzumiStyleSwap(tokenOut, receiver, forkId, pool, feeTier, cfg, flashCalldata) {
-    if (uint256(cfg) < 2 && flashCalldata.length / 2 - 1 > 2)
-        throw new Error("Invalidconfigforv2swap");
-    return encodePacked(["address", "address", "uint8", "address", "uint8", "uint16", "uint16", "bytes"], [
-        tokenOut,
-        receiver,
-        uint8(DexTypeMappings.IZI_ID),
-        pool,
-        uint8(forkId),
-        uint16(feeTier),
-        uint16(cfg === DexPayConfig.FLASH ? flashCalldata.length / 2 - 1 : uint256(cfg)),
-        bytes(cfg === DexPayConfig.FLASH ? flashCalldata : newbytes(0)),
-    ]);
-}
 export function encodeDodoStyleSwap(currentData, tokenOut, receiver, pool, selector, poolId, cfg, flashCalldata) {
     return encodePacked(["bytes", "address", "address", "uint8", "address", "uint8", "uint16", "uint16", "bytes"], [
         currentData,
@@ -324,7 +310,7 @@ export function encodeDodoStyleSwap(currentData, tokenOut, receiver, pool, selec
 export function encodeWooStyleSwap(currentData, tokenOut, receiver, pool, cfg) {
     if (cfg === DexPayConfig.FLASH)
         throw new Error("NoflashforWoo");
-    return encodePacked(["bytes", "address", "address", "uint8", "address", "uint16"], [currentData, tokenOut, receiver, uint8(DexTypeMappings.WOO_FI_ID), pool, uint16(uint256(cfg))]);
+    return encodePacked(["bytes", "address", "address", "uint8", "address", "uint8"], [currentData, tokenOut, receiver, uint8(DexTypeMappings.WOO_FI_ID), pool, uint8(uint256(cfg))]);
 }
 export function encodeGmxStyleSwap(currentData, tokenOut, receiver, pool, cfg) {
     if (cfg === DexPayConfig.FLASH)
@@ -381,8 +367,8 @@ export function encodeNextGenDexSettleBalancer(singleton, asset, amountHint) {
         uint128(amountHint >= 0xffffffffffffffffffffffffffffffn ? 0xffffffffffffffffffffffffffffffn : amountHint),
     ]);
 }
-export function encodeTransferIn(asset, receiver, amount) {
-    return encodePacked(["uint8", "uint8", "address", "address", "uint128"], [uint8(ComposerCommands.TRANSFERS), uint8(TransferIds.TRANSFER_FROM), asset, receiver, uint128(amount)]);
+export function encodeTransferIn(asset, from, amount) {
+    return encodePacked(["uint8", "uint8", "address", "address", "uint128"], [uint8(ComposerCommands.TRANSFERS), uint8(TransferIds.TRANSFER_FROM), asset, from, uint128(amount)]);
 }
 export function encodeSweep(asset, receiver, amount, sweepType) {
     return encodePacked(["uint8", "uint8", "address", "address", "uint8", "uint128"], [uint8(ComposerCommands.TRANSFERS), uint8(TransferIds.SWEEP), asset, receiver, sweepType, uint128(amount)]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/calldatalib",
-  "version": "0.0.2",
+  "version": "0.0.10",
   "description": "Generated CalldataLib TypeScript functions for 1delta smart contracts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",