@1delta/calldatalib 0.0.38 → 0.0.42

package/dist/cjs/CalldataLib.js

@@ -10,6 +10,12 @@ exports.encodeStargateV2BridgeSimpleTaxi = encodeStargateV2BridgeSimpleTaxi;
 exports.encodeStargateV2BridgeSimpleBus = encodeStargateV2BridgeSimpleBus;
 exports.encodeAcrossBridgeToken = encodeAcrossBridgeToken;
 exports.encodeAcrossBridgeNative = encodeAcrossBridgeNative;
+exports.encodeAcrossHeader = encodeAcrossHeader;
+exports.encodeAcrossParams = encodeAcrossParams;
+exports.encodeSquidRouterCall = encodeSquidRouterCall;
+exports.encodeSquidRouterCallPartial = encodeSquidRouterCallPartial;
+exports.encodeGasZipBridge = encodeGasZipBridge;
+exports.encodeGasZipEvmBridge = encodeGasZipEvmBridge;
 exports.encodePermit2TransferFrom = encodePermit2TransferFrom;
 exports.encodeNextGenDexUnlock = encodeNextGenDexUnlock;
 exports.encodeBalancerV3FlashLoan = encodeBalancerV3FlashLoan;
@@ -167,6 +173,8 @@ var BridgeIds;
 (function (BridgeIds) {
     BridgeIds[BridgeIds["STARGATE_V2"] = 0] = "STARGATE_V2";
     BridgeIds[BridgeIds["ACROSS"] = 10] = "ACROSS";
+    BridgeIds[BridgeIds["SQUID_ROUTER"] = 20] = "SQUID_ROUTER";
+    BridgeIds[BridgeIds["GASZIP"] = 30] = "GASZIP";
 })(BridgeIds || (exports.BridgeIds = BridgeIds = {}));
 var DexTypeMappings;
 (function (DexTypeMappings) {
@@ -254,69 +262,87 @@ function encodeStargateV2BridgeSimpleTaxi(asset, stargatePool, dstEid, receiver,
 function encodeStargateV2BridgeSimpleBus(asset, stargatePool, dstEid, receiver, refundReceiver, amount, isNative, slippage, fee) {
     return encodeStargateV2Bridge(asset, stargatePool, dstEid, receiver, refundReceiver, amount, slippage, fee, true, isNative, (0, utils_js_1.newbytes)(0), (0, utils_js_1.newbytes)(0));
 }
-function encodeAcrossBridgeToken(spokePool, depositor, sendingAssetId, receivingAssetId, amount, fixedFee, feePercentage, destinationChainId, receiver, message) {
-    const bridgeData = (0, utils_js_1.encodePacked)([
-        "uint8",
-        "uint8",
-        "address",
-        "address",
-        "address",
-        "bytes32",
-        "uint128",
-        "uint128",
-        "uint32",
-        "uint32",
-        "bytes32",
-        "uint16",
-        "bytes",
-    ], [
+function encodeAcrossBridgeToken(spokePool, depositor, sendingAssetId, receivingAssetId, amount, fixedFee, feePercentage, destinationChainId, fromTokenDecimals, toTokenDecimals, receiver, deadline, message) {
+    return (0, utils_js_1.encodePacked)(["bytes", "bytes"], [
+        encodeAcrossHeader(spokePool, depositor, sendingAssetId, receivingAssetId, amount, false),
+        encodeAcrossParams(fixedFee, feePercentage, destinationChainId, fromTokenDecimals, toTokenDecimals, receiver, deadline, message),
+    ]);
+}
+function encodeAcrossBridgeNative(spokePool, depositor, sendingAssetId, receivingAssetId, amount, fixedFee, feePercentage, destinationChainId, fromTokenDecimals, toTokenDecimals, receiver, deadline, message) {
+    return (0, utils_js_1.encodePacked)(["bytes", "bytes"], [
+        encodeAcrossHeader(spokePool, depositor, sendingAssetId, receivingAssetId, amount, true),
+        encodeAcrossParams(fixedFee, feePercentage, destinationChainId, fromTokenDecimals, toTokenDecimals, receiver, deadline, message),
+    ]);
+}
+function encodeAcrossHeader(spokePool, depositor, sendingAssetId, receivingAssetId, amount, isNative) {
+    return (0, utils_js_1.encodePacked)(["uint8", "uint8", "address", "address", "address", "bytes32", "uint128"], [
         (0, utils_js_1.uint8)(ComposerCommands.BRIDGING),
         (0, utils_js_1.uint8)(BridgeIds.ACROSS),
         spokePool,
         depositor,
         sendingAssetId,
         receivingAssetId,
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(amount), false, false),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(amount), false, isNative),
+    ]);
+}
+function encodeAcrossParams(fixedFee, feePercentage, destinationChainId, fromTokenDecimals, toTokenDecimals, receiver, deadline, message) {
+    return (0, utils_js_1.encodePacked)(["uint128", "uint32", "uint32", "uint8", "uint8", "bytes32", "uint32", "uint16", "bytes"], [
         fixedFee,
         feePercentage,
         destinationChainId,
+        fromTokenDecimals,
+        toTokenDecimals,
         receiver,
+        deadline,
         (0, utils_js_1.uint16)(message.length / 2 - 1),
         message,
     ]);
-    return bridgeData;
-}
-function encodeAcrossBridgeNative(spokePool, depositor, sendingAssetId, receivingAssetId, amount, fixedFee, feePercentage, destinationChainId, receiver, message) {
-    const bridgeData = (0, utils_js_1.encodePacked)([
-        "uint8",
-        "uint8",
-        "address",
-        "address",
-        "address",
-        "bytes32",
-        "uint128",
-        "uint128",
-        "uint32",
-        "uint32",
-        "bytes32",
-        "uint16",
-        "bytes",
-    ], [
+}
+function encodeSquidRouterCall(asset, gateway, bridgedTokenSymbol, amount, destinationChain, destinationAddress, payload, gasRefundRecipient, enableExpress, nativeAmount) {
+    const partialData = encodeSquidRouterCallPartial(asset, gateway, bridgedTokenSymbol, amount, destinationChain, destinationAddress, payload);
+    return (0, utils_js_1.encodePacked)(["bytes", "uint128", "address", "uint8", "bytes", "bytes", "bytes", "bytes"], [
+        partialData,
+        (0, utils_js_1.uint128)(nativeAmount),
+        gasRefundRecipient,
+        (0, utils_js_1.uint8)(enableExpress ? 1 : 0),
+        bridgedTokenSymbol,
+        destinationChain,
+        destinationAddress,
+        payload,
+    ]);
+}
+function encodeSquidRouterCallPartial(asset, gateway, bridgedTokenSymbol, amount, destinationChain, destinationAddress, payload) {
+    return (0, utils_js_1.encodePacked)(["uint8", "uint8", "address", "address", "uint16", "uint16", "uint16", "uint16", "uint128"], [
         (0, utils_js_1.uint8)(ComposerCommands.BRIDGING),
-        (0, utils_js_1.uint8)(BridgeIds.ACROSS),
-        spokePool,
-        depositor,
-        sendingAssetId,
-        receivingAssetId,
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(amount), false, true),
-        fixedFee,
-        feePercentage,
-        destinationChainId,
+        (0, utils_js_1.uint8)(BridgeIds.SQUID_ROUTER),
+        gateway,
+        asset,
+        (0, utils_js_1.uint16)(bridgedTokenSymbol.length / 2 - 1),
+        (0, utils_js_1.uint16)(destinationChain.length / 2 - 1),
+        (0, utils_js_1.uint16)(destinationAddress.length / 2 - 1),
+        (0, utils_js_1.uint16)(payload.length / 2 - 1),
+        (0, utils_js_1.uint128)(amount),
+    ]);
+}
+function encodeGasZipBridge(gasZipRouter, receiver, amount, destinationChainId) {
+    return (0, utils_js_1.encodePacked)(["uint8", "uint8", "address", "bytes32", "uint128", "uint256"], [
+        (0, utils_js_1.uint8)(ComposerCommands.BRIDGING),
+        (0, utils_js_1.uint8)(BridgeIds.GASZIP),
+        gasZipRouter,
         receiver,
-        (0, utils_js_1.uint16)(message.length / 2 - 1),
-        message,
+        (0, utils_js_1.uint128)(amount),
+        destinationChainId,
+    ]);
+}
+function encodeGasZipEvmBridge(gasZipRouter, receiver, amount, destinationChainId) {
+    return (0, utils_js_1.encodePacked)(["uint8", "uint8", "address", "bytes32", "uint128", "uint256"], [
+        (0, utils_js_1.uint8)(ComposerCommands.BRIDGING),
+        (0, utils_js_1.uint8)(BridgeIds.GASZIP),
+        gasZipRouter,
+        (0, utils_js_1.rightPadZero)(receiver),
+        (0, utils_js_1.uint128)(amount),
+        destinationChainId,
     ]);
-    return bridgeData;
 }
 function encodePermit2TransferFrom(token, receiver, amount) {
     return (0, utils_js_1.encodePacked)(["uint8", "uint8", "address", "address", "uint128"], [(0, utils_js_1.uint8)(ComposerCommands.TRANSFERS), (0, utils_js_1.uint8)(TransferIds.PERMIT2_TRANSFER_FROM), token, receiver, (0, utils_js_1.uint128)(amount)]);

package/dist/cjs/utils.js

@@ -14,6 +14,7 @@ exports.encodePacked = encodePacked;
 exports.generateAmountBitmap = generateAmountBitmap;
 exports.getMorphoCollateral = getMorphoCollateral;
 exports.getMorphoLoanAsset = getMorphoLoanAsset;
+exports.rightPadZero = rightPadZero;
 exports.newbytes = newbytes;
 exports.bytes = bytes;
 const viem_1 = require("viem");
@@ -69,6 +70,9 @@ function getMorphoLoanAsset(market) {
     const slice = market.slice(2, 42);
     return `0x${slice}`;
 }
+function rightPadZero(address) {
+    return (address.toLowerCase() + "0".repeat(24));
+}
 function newbytes(length) {
     return ("0x" + "0".repeat(length * 2));
 }

package/dist/esm/CalldataLib.js

@@ -1,6 +1,6 @@
 // @ts-nocheck
 import { zeroAddress } from "viem";
-import { encodePacked, uint128, uint8, uint16, uint256, generateAmountBitmap, newbytes, bytes, getMorphoCollateral, getMorphoLoanAsset, } from "./utils.js";
+import { encodePacked, uint128, uint8, uint16, uint256, generateAmountBitmap, newbytes, bytes, getMorphoCollateral, getMorphoLoanAsset, rightPadZero, } from "./utils.js";
 export var SweepType;
 (function (SweepType) {
     SweepType[SweepType["VALIDATE"] = 0] = "VALIDATE";
@@ -94,6 +94,8 @@ export var BridgeIds;
 (function (BridgeIds) {
     BridgeIds[BridgeIds["STARGATE_V2"] = 0] = "STARGATE_V2";
     BridgeIds[BridgeIds["ACROSS"] = 10] = "ACROSS";
+    BridgeIds[BridgeIds["SQUID_ROUTER"] = 20] = "SQUID_ROUTER";
+    BridgeIds[BridgeIds["GASZIP"] = 30] = "GASZIP";
 })(BridgeIds || (BridgeIds = {}));
 export var DexTypeMappings;
 (function (DexTypeMappings) {
@@ -181,69 +183,87 @@ export function encodeStargateV2BridgeSimpleTaxi(asset, stargatePool, dstEid, re
 export function encodeStargateV2BridgeSimpleBus(asset, stargatePool, dstEid, receiver, refundReceiver, amount, isNative, slippage, fee) {
     return encodeStargateV2Bridge(asset, stargatePool, dstEid, receiver, refundReceiver, amount, slippage, fee, true, isNative, newbytes(0), newbytes(0));
 }
-export function encodeAcrossBridgeToken(spokePool, depositor, sendingAssetId, receivingAssetId, amount, fixedFee, feePercentage, destinationChainId, receiver, message) {
-    const bridgeData = encodePacked([
-        "uint8",
-        "uint8",
-        "address",
-        "address",
-        "address",
-        "bytes32",
-        "uint128",
-        "uint128",
-        "uint32",
-        "uint32",
-        "bytes32",
-        "uint16",
-        "bytes",
-    ], [
+export function encodeAcrossBridgeToken(spokePool, depositor, sendingAssetId, receivingAssetId, amount, fixedFee, feePercentage, destinationChainId, fromTokenDecimals, toTokenDecimals, receiver, deadline, message) {
+    return encodePacked(["bytes", "bytes"], [
+        encodeAcrossHeader(spokePool, depositor, sendingAssetId, receivingAssetId, amount, false),
+        encodeAcrossParams(fixedFee, feePercentage, destinationChainId, fromTokenDecimals, toTokenDecimals, receiver, deadline, message),
+    ]);
+}
+export function encodeAcrossBridgeNative(spokePool, depositor, sendingAssetId, receivingAssetId, amount, fixedFee, feePercentage, destinationChainId, fromTokenDecimals, toTokenDecimals, receiver, deadline, message) {
+    return encodePacked(["bytes", "bytes"], [
+        encodeAcrossHeader(spokePool, depositor, sendingAssetId, receivingAssetId, amount, true),
+        encodeAcrossParams(fixedFee, feePercentage, destinationChainId, fromTokenDecimals, toTokenDecimals, receiver, deadline, message),
+    ]);
+}
+export function encodeAcrossHeader(spokePool, depositor, sendingAssetId, receivingAssetId, amount, isNative) {
+    return encodePacked(["uint8", "uint8", "address", "address", "address", "bytes32", "uint128"], [
         uint8(ComposerCommands.BRIDGING),
         uint8(BridgeIds.ACROSS),
         spokePool,
         depositor,
         sendingAssetId,
         receivingAssetId,
-        generateAmountBitmap(uint128(amount), false, false),
+        generateAmountBitmap(uint128(amount), false, isNative),
+    ]);
+}
+export function encodeAcrossParams(fixedFee, feePercentage, destinationChainId, fromTokenDecimals, toTokenDecimals, receiver, deadline, message) {
+    return encodePacked(["uint128", "uint32", "uint32", "uint8", "uint8", "bytes32", "uint32", "uint16", "bytes"], [
         fixedFee,
         feePercentage,
         destinationChainId,
+        fromTokenDecimals,
+        toTokenDecimals,
         receiver,
+        deadline,
         uint16(message.length / 2 - 1),
         message,
     ]);
-    return bridgeData;
-}
-export function encodeAcrossBridgeNative(spokePool, depositor, sendingAssetId, receivingAssetId, amount, fixedFee, feePercentage, destinationChainId, receiver, message) {
-    const bridgeData = encodePacked([
-        "uint8",
-        "uint8",
-        "address",
-        "address",
-        "address",
-        "bytes32",
-        "uint128",
-        "uint128",
-        "uint32",
-        "uint32",
-        "bytes32",
-        "uint16",
-        "bytes",
-    ], [
+}
+export function encodeSquidRouterCall(asset, gateway, bridgedTokenSymbol, amount, destinationChain, destinationAddress, payload, gasRefundRecipient, enableExpress, nativeAmount) {
+    const partialData = encodeSquidRouterCallPartial(asset, gateway, bridgedTokenSymbol, amount, destinationChain, destinationAddress, payload);
+    return encodePacked(["bytes", "uint128", "address", "uint8", "bytes", "bytes", "bytes", "bytes"], [
+        partialData,
+        uint128(nativeAmount),
+        gasRefundRecipient,
+        uint8(enableExpress ? 1 : 0),
+        bridgedTokenSymbol,
+        destinationChain,
+        destinationAddress,
+        payload,
+    ]);
+}
+export function encodeSquidRouterCallPartial(asset, gateway, bridgedTokenSymbol, amount, destinationChain, destinationAddress, payload) {
+    return encodePacked(["uint8", "uint8", "address", "address", "uint16", "uint16", "uint16", "uint16", "uint128"], [
         uint8(ComposerCommands.BRIDGING),
-        uint8(BridgeIds.ACROSS),
-        spokePool,
-        depositor,
-        sendingAssetId,
-        receivingAssetId,
-        generateAmountBitmap(uint128(amount), false, true),
-        fixedFee,
-        feePercentage,
-        destinationChainId,
+        uint8(BridgeIds.SQUID_ROUTER),
+        gateway,
+        asset,
+        uint16(bridgedTokenSymbol.length / 2 - 1),
+        uint16(destinationChain.length / 2 - 1),
+        uint16(destinationAddress.length / 2 - 1),
+        uint16(payload.length / 2 - 1),
+        uint128(amount),
+    ]);
+}
+export function encodeGasZipBridge(gasZipRouter, receiver, amount, destinationChainId) {
+    return encodePacked(["uint8", "uint8", "address", "bytes32", "uint128", "uint256"], [
+        uint8(ComposerCommands.BRIDGING),
+        uint8(BridgeIds.GASZIP),
+        gasZipRouter,
         receiver,
-        uint16(message.length / 2 - 1),
-        message,
+        uint128(amount),
+        destinationChainId,
+    ]);
+}
+export function encodeGasZipEvmBridge(gasZipRouter, receiver, amount, destinationChainId) {
+    return encodePacked(["uint8", "uint8", "address", "bytes32", "uint128", "uint256"], [
+        uint8(ComposerCommands.BRIDGING),
+        uint8(BridgeIds.GASZIP),
+        gasZipRouter,
+        rightPadZero(receiver),
+        uint128(amount),
+        destinationChainId,
     ]);
-    return bridgeData;
 }
 export function encodePermit2TransferFrom(token, receiver, amount) {
     return encodePacked(["uint8", "uint8", "address", "address", "uint128"], [uint8(ComposerCommands.TRANSFERS), uint8(TransferIds.PERMIT2_TRANSFER_FROM), token, receiver, uint128(amount)]);

package/dist/esm/utils.js

@@ -51,6 +51,9 @@ export function getMorphoLoanAsset(market) {
     const slice = market.slice(2, 42);
     return `0x${slice}`;
 }
+export function rightPadZero(address) {
+    return (address.toLowerCase() + "0".repeat(24));
+}
 export function newbytes(length) {
     return ("0x" + "0".repeat(length * 2));
 }

package/dist/types/CalldataLib.d.ts

@@ -78,7 +78,9 @@ export declare enum ComposerCommands {
 }
 export declare enum BridgeIds {
     STARGATE_V2 = 0,
-    ACROSS = 10
+    ACROSS = 10,
+    SQUID_ROUTER = 20,
+    GASZIP = 30
 }
 export declare enum DexTypeMappings {
     UNISWAP_V3_ID = 0,
@@ -116,8 +118,14 @@ export declare function encodePermit(permitId: bigint, target: Address, data: He
 export declare function encodeStargateV2BridgePartial(amount: bigint, slippage: number, fee: bigint, isBusMode: boolean, isNative: boolean, composeMsg: Hex, extraOptions: Hex): Hex;
 export declare function encodeStargateV2BridgeSimpleTaxi(asset: Address, stargatePool: Address, dstEid: number, receiver: Hex, refundReceiver: Address, amount: bigint, isNative: boolean, slippage: number, fee: bigint): Hex;
 export declare function encodeStargateV2BridgeSimpleBus(asset: Address, stargatePool: Address, dstEid: number, receiver: Hex, refundReceiver: Address, amount: bigint, isNative: boolean, slippage: number, fee: bigint): Hex;
-export declare function encodeAcrossBridgeToken(spokePool: Address, depositor: Address, sendingAssetId: Address, receivingAssetId: Hex, amount: bigint, fixedFee: bigint, feePercentage: number, destinationChainId: number, receiver: Hex, message: Hex): Hex;
-export declare function encodeAcrossBridgeNative(spokePool: Address, depositor: Address, sendingAssetId: Address, receivingAssetId: Hex, amount: bigint, fixedFee: bigint, feePercentage: number, destinationChainId: number, receiver: Hex, message: Hex): Hex;
+export declare function encodeAcrossBridgeToken(spokePool: Address, depositor: Address, sendingAssetId: Address, receivingAssetId: Hex, amount: bigint, fixedFee: bigint, feePercentage: number, destinationChainId: number, fromTokenDecimals: number, toTokenDecimals: number, receiver: Hex, deadline: number, message: Hex): Hex;
+export declare function encodeAcrossBridgeNative(spokePool: Address, depositor: Address, sendingAssetId: Address, receivingAssetId: Hex, amount: bigint, fixedFee: bigint, feePercentage: number, destinationChainId: number, fromTokenDecimals: number, toTokenDecimals: number, receiver: Hex, deadline: number, message: Hex): Hex;
+export declare function encodeAcrossHeader(spokePool: Address, depositor: Address, sendingAssetId: Address, receivingAssetId: Hex, amount: bigint, isNative: boolean): Hex;
+export declare function encodeAcrossParams(fixedFee: bigint, feePercentage: number, destinationChainId: number, fromTokenDecimals: number, toTokenDecimals: number, receiver: Hex, deadline: number, message: Hex): Hex;
+export declare function encodeSquidRouterCall(asset: Address, gateway: Address, bridgedTokenSymbol: Hex, amount: bigint, destinationChain: Hex, destinationAddress: Hex, payload: Hex, gasRefundRecipient: Address, enableExpress: boolean, nativeAmount: bigint): Hex;
+export declare function encodeSquidRouterCallPartial(asset: Address, gateway: Address, bridgedTokenSymbol: Hex, amount: bigint, destinationChain: Hex, destinationAddress: Hex, payload: Hex): Hex;
+export declare function encodeGasZipBridge(gasZipRouter: Address, receiver: Hex, amount: bigint, destinationChainId: bigint): Hex;
+export declare function encodeGasZipEvmBridge(gasZipRouter: Address, receiver: Address, amount: bigint, destinationChainId: bigint): Hex;
 export declare function encodePermit2TransferFrom(token: Address, receiver: Address, amount: bigint): Hex;
 export declare function encodeNextGenDexUnlock(singleton: Address, id: bigint, d: Hex): Hex;
 export declare function encodeBalancerV3FlashLoan(singleton: Address, poolId: bigint, asset: Address, receiver: Address, amount: bigint, flashData: Hex): Hex;

package/dist/types/utils.d.ts

@@ -15,5 +15,6 @@ export declare function encodePacked(types: string[], values: any[]): Hex;
 export declare function generateAmountBitmap(amount: bigint, useShares: boolean, native: boolean): bigint;
 export declare function getMorphoCollateral(market: Hex): Address;
 export declare function getMorphoLoanAsset(market: Hex): Address;
+export declare function rightPadZero(address: Address): Hex;
 export declare function newbytes(length: number): Hex;
 export declare function bytes(value: Hex): Hex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/calldatalib",
-  "version": "0.0.38",
+  "version": "0.0.42",
   "description": "Generated CalldataLib TypeScript functions for 1delta smart contracts",
   "type": "module",
   "main": "./dist/cjs/index.js",