@1delta/calldatalib 0.0.39 → 0.0.45

package/dist/cjs/CalldataLib.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DexForkMappings = exports.DexTypeMappings = exports.BridgeIds = exports.ComposerCommands = exports.Gen2025ActionIds = exports.ERC4626Ids = exports.FlashLoanIds = exports.LenderOps = exports.LenderIds = exports.PermitIds = exports.TransferIds = exports.WrapOperation = exports.DodoSelector = exports.DexPayConfig = exports.SweepType = void 0;
+exports.DexForkMappings = exports.DexTypeMappings = exports.SiloV2CollateralType = exports.CompoundV2Selector = exports.BridgeIds = exports.ComposerCommands = exports.Gen2025ActionIds = exports.ERC4626Ids = exports.FlashLoanIds = exports.LenderOps = exports.LenderIds = exports.PermitIds = exports.TransferIds = exports.WrapOperation = exports.DodoSelector = exports.DexPayConfig = exports.SweepType = void 0;
 exports.encodeExternalCall = encodeExternalCall;
 exports.encodeTryExternalCall = encodeTryExternalCall;
 exports.encodeStargateV2Bridge = encodeStargateV2Bridge;
@@ -10,8 +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;
@@ -70,9 +74,13 @@ exports.encodeCompoundV3Borrow = encodeCompoundV3Borrow;
 exports.encodeCompoundV3Repay = encodeCompoundV3Repay;
 exports.encodeCompoundV3Withdraw = encodeCompoundV3Withdraw;
 exports.encodeCompoundV2Deposit = encodeCompoundV2Deposit;
+exports.encodeSiloV2Deposit = encodeSiloV2Deposit;
+exports.encodeSiloV2Borrow = encodeSiloV2Borrow;
 exports.encodeCompoundV2Borrow = encodeCompoundV2Borrow;
 exports.encodeCompoundV2Repay = encodeCompoundV2Repay;
 exports.encodeCompoundV2Withdraw = encodeCompoundV2Withdraw;
+exports.encodeSiloV2Withdraw = encodeSiloV2Withdraw;
+exports.encodeSiloV2Repay = encodeSiloV2Repay;
 // @ts-nocheck
 const viem_1 = require("viem");
 const utils_js_1 = require("./utils.js");
@@ -121,6 +129,7 @@ var LenderIds;
     LenderIds[LenderIds["UP_TO_COMPOUND_V3"] = 3000] = "UP_TO_COMPOUND_V3";
     LenderIds[LenderIds["UP_TO_COMPOUND_V2"] = 4000] = "UP_TO_COMPOUND_V2";
     LenderIds[LenderIds["UP_TO_MORPHO"] = 5000] = "UP_TO_MORPHO";
+    LenderIds[LenderIds["UP_TO_SILO_V2"] = 6000] = "UP_TO_SILO_V2";
 })(LenderIds || (exports.LenderIds = LenderIds = {}));
 var LenderOps;
 (function (LenderOps) {
@@ -170,7 +179,20 @@ var 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 CompoundV2Selector;
+(function (CompoundV2Selector) {
+    CompoundV2Selector[CompoundV2Selector["MINT_BEHALF"] = 0] = "MINT_BEHALF";
+    CompoundV2Selector[CompoundV2Selector["MINT"] = 1] = "MINT";
+    CompoundV2Selector[CompoundV2Selector["REDEEM"] = 0] = "REDEEM";
+    CompoundV2Selector[CompoundV2Selector["REDEEM_BEHALF"] = 1] = "REDEEM_BEHALF";
+})(CompoundV2Selector || (exports.CompoundV2Selector = CompoundV2Selector = {}));
+var SiloV2CollateralType;
+(function (SiloV2CollateralType) {
+    SiloV2CollateralType[SiloV2CollateralType["PROTECTED"] = 0] = "PROTECTED";
+    SiloV2CollateralType[SiloV2CollateralType["COLLATERAL"] = 1] = "COLLATERAL";
+})(SiloV2CollateralType || (exports.SiloV2CollateralType = SiloV2CollateralType = {}));
 var DexTypeMappings;
 (function (DexTypeMappings) {
     DexTypeMappings[DexTypeMappings["UNISWAP_V3_ID"] = 0] = "UNISWAP_V3_ID";
@@ -257,69 +279,41 @@ 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",
-    ], [
-        (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),
-        fixedFee,
-        feePercentage,
-        destinationChainId,
-        receiver,
-        (0, utils_js_1.uint16)(message.length / 2 - 1),
-        message,
+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),
     ]);
-    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 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, true),
+        (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 encodeSquidRouterCall(asset, gateway, bridgedTokenSymbol, amount, destinationChain, destinationAddress, payload, gasRefundRecipient, enableExpress, nativeAmount) {
     const partialData = encodeSquidRouterCallPartial(asset, gateway, bridgedTokenSymbol, amount, destinationChain, destinationAddress, payload);
@@ -347,6 +341,26 @@ function encodeSquidRouterCallPartial(asset, gateway, bridgedTokenSymbol, amount
         (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.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,
+    ]);
+}
 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)]);
 }
@@ -659,7 +673,7 @@ function encodeMorphoDepositCollateral(market, assets, receiver, data, morphoB,
         encodeApprove((0, utils_js_1.getMorphoCollateral)(market), morphoB),
         (0, utils_js_1.uint8)(ComposerCommands.LENDING),
         (0, utils_js_1.uint8)(LenderOps.DEPOSIT),
-        (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO),
+        (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO - 1),
         market,
         (0, utils_js_1.uint128)(assets),
         receiver,
@@ -673,7 +687,7 @@ function encodeMorphoDeposit(market, isShares, assets, receiver, data, morphoB,
         encodeApprove((0, utils_js_1.getMorphoLoanAsset)(market), morphoB),
         (0, utils_js_1.uint8)(ComposerCommands.LENDING),
         (0, utils_js_1.uint8)(LenderOps.DEPOSIT_LENDING_TOKEN),
-        (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO),
+        (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO - 1),
         market,
         (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false),
         receiver,
@@ -706,7 +720,7 @@ function encodeMorphoWithdraw(market, isShares, assets, receiver, morphoB) {
     return (0, utils_js_1.encodePacked)(["uint8", "uint8", "uint16", "bytes", "uint128", "address", "address"], [
         (0, utils_js_1.uint8)(ComposerCommands.LENDING),
         (0, utils_js_1.uint8)(LenderOps.WITHDRAW_LENDING_TOKEN),
-        (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO),
+        (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO - 1),
         market,
         (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false),
         receiver,
@@ -717,7 +731,7 @@ function encodeMorphoWithdrawCollateral(market, assets, receiver, morphoB) {
     return (0, utils_js_1.encodePacked)(["uint8", "uint8", "uint16", "bytes", "uint128", "address", "address"], [
         (0, utils_js_1.uint8)(ComposerCommands.LENDING),
         (0, utils_js_1.uint8)(LenderOps.WITHDRAW),
-        (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO),
+        (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO - 1),
         market,
         (0, utils_js_1.uint128)(assets),
         receiver,
@@ -728,7 +742,7 @@ function encodeMorphoBorrow(market, isShares, assets, receiver, morphoB) {
     return (0, utils_js_1.encodePacked)(["uint8", "uint8", "uint16", "bytes", "uint128", "address", "address"], [
         (0, utils_js_1.uint8)(ComposerCommands.LENDING),
         (0, utils_js_1.uint8)(LenderOps.BORROW),
-        (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO),
+        (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO - 1),
         market,
         (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false),
         receiver,
@@ -740,7 +754,7 @@ function encodeMorphoRepay(market, isShares, assets, receiver, data, morphoB, pI
         encodeApprove((0, utils_js_1.getMorphoLoanAsset)(market), morphoB),
         (0, utils_js_1.uint8)(ComposerCommands.LENDING),
         (0, utils_js_1.uint8)(LenderOps.REPAY),
-        (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO),
+        (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO - 1),
         market,
         (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false),
         receiver,
@@ -896,18 +910,40 @@ function encodeCompoundV3Withdraw(token, amount, receiver, comet, isBase) {
         comet,
     ]);
 }
-function encodeCompoundV2Deposit(token, amount, receiver, cToken) {
+function encodeCompoundV2Deposit(token, amount, receiver, cToken, selectorId) {
     return (0, utils_js_1.encodePacked)(["bytes", "uint8", "uint8", "uint16", "address", "uint128", "address", "address"], [
         token === viem_1.zeroAddress ? (0, utils_js_1.newbytes)(0) : encodeApprove(token, cToken),
         (0, utils_js_1.uint8)(ComposerCommands.LENDING),
         (0, utils_js_1.uint8)(LenderOps.DEPOSIT),
         (0, utils_js_1.uint16)(LenderIds.UP_TO_COMPOUND_V2 - 1),
         token,
-        (0, utils_js_1.uint128)(amount),
+        (0, utils_js_1.encodeCompoundV2SelectorId)((0, utils_js_1.uint128)(amount), selectorId),
         receiver,
         cToken,
     ]);
 }
+function encodeSiloV2Deposit(token, amount, receiver, silo, collateralMode) {
+    return (0, utils_js_1.encodePacked)(["bytes", "uint8", "uint8", "uint16", "address", "uint128", "address", "address"], [
+        token === viem_1.zeroAddress ? (0, utils_js_1.newbytes)(0) : encodeApprove(token, silo),
+        (0, utils_js_1.uint8)(ComposerCommands.LENDING),
+        (0, utils_js_1.uint8)(LenderOps.DEPOSIT),
+        (0, utils_js_1.uint16)(LenderIds.UP_TO_SILO_V2 - 1),
+        token,
+        (0, utils_js_1.encodeSiloV2CollateralMode)((0, utils_js_1.uint128)(amount), collateralMode),
+        receiver,
+        silo,
+    ]);
+}
+function encodeSiloV2Borrow(amount, receiver, silo) {
+    return (0, utils_js_1.encodePacked)(["uint8", "uint8", "uint16", "uint128", "address", "address"], [
+        (0, utils_js_1.uint8)(ComposerCommands.LENDING),
+        (0, utils_js_1.uint8)(LenderOps.BORROW),
+        (0, utils_js_1.uint16)(LenderIds.UP_TO_SILO_V2 - 1),
+        (0, utils_js_1.uint128)(amount),
+        receiver,
+        silo,
+    ]);
+}
 function encodeCompoundV2Borrow(token, amount, receiver, cToken) {
     return (0, utils_js_1.encodePacked)(["uint8", "uint8", "uint16", "address", "uint128", "address", "address"], [
         (0, utils_js_1.uint8)(ComposerCommands.LENDING),
@@ -931,14 +967,36 @@ function encodeCompoundV2Repay(token, amount, receiver, cToken) {
         cToken,
     ]);
 }
-function encodeCompoundV2Withdraw(token, amount, receiver, cToken) {
+function encodeCompoundV2Withdraw(token, amount, receiver, cToken, selectorId) {
     return (0, utils_js_1.encodePacked)(["uint8", "uint8", "uint16", "address", "uint128", "address", "address"], [
         (0, utils_js_1.uint8)(ComposerCommands.LENDING),
         (0, utils_js_1.uint8)(LenderOps.WITHDRAW),
         (0, utils_js_1.uint16)(LenderIds.UP_TO_COMPOUND_V2 - 1),
         token,
-        (0, utils_js_1.uint128)(amount),
+        (0, utils_js_1.encodeCompoundV2SelectorId)((0, utils_js_1.uint128)(amount), selectorId),
         receiver,
         cToken,
     ]);
 }
+function encodeSiloV2Withdraw(amount, receiver, silo, collateralMode) {
+    return (0, utils_js_1.encodePacked)(["uint8", "uint8", "uint16", "uint128", "address", "address"], [
+        (0, utils_js_1.uint8)(ComposerCommands.LENDING),
+        (0, utils_js_1.uint8)(LenderOps.WITHDRAW),
+        (0, utils_js_1.uint16)(LenderIds.UP_TO_SILO_V2 - 1),
+        (0, utils_js_1.encodeSiloV2CollateralMode)((0, utils_js_1.uint128)(amount), collateralMode),
+        receiver,
+        silo,
+    ]);
+}
+function encodeSiloV2Repay(token, amount, receiver, silo) {
+    return (0, utils_js_1.encodePacked)(["bytes", "uint8", "uint8", "uint16", "address", "uint128", "address", "address"], [
+        token === viem_1.zeroAddress ? (0, utils_js_1.newbytes)(0) : encodeApprove(token, silo),
+        (0, utils_js_1.uint8)(ComposerCommands.LENDING),
+        (0, utils_js_1.uint8)(LenderOps.REPAY),
+        (0, utils_js_1.uint16)(LenderIds.UP_TO_SILO_V2 - 1),
+        token,
+        (0, utils_js_1.uint128)(amount),
+        receiver,
+        silo,
+    ]);
+}

package/dist/cjs/utils.js

@@ -14,8 +14,11 @@ exports.encodePacked = encodePacked;
 exports.generateAmountBitmap = generateAmountBitmap;
 exports.getMorphoCollateral = getMorphoCollateral;
 exports.getMorphoLoanAsset = getMorphoLoanAsset;
+exports.rightPadZero = rightPadZero;
 exports.newbytes = newbytes;
 exports.bytes = bytes;
+exports.encodeCompoundV2SelectorId = encodeCompoundV2SelectorId;
+exports.encodeSiloV2CollateralMode = encodeSiloV2CollateralMode;
 const viem_1 = require("viem");
 exports._NATIVE_FLAG = 1n << 127n;
 exports._SHARES_MASK = 1n << 126n;
@@ -69,9 +72,18 @@ 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));
 }
 function bytes(value) {
     return value;
 }
+function encodeCompoundV2SelectorId(amount, selectorId) {
+    return uint128(amount) | (uint128(selectorId) << 120n);
+}
+function encodeSiloV2CollateralMode(amount, mode) {
+    return uint128(amount) | (uint128(mode) << 120n);
+}

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, encodeCompoundV2SelectorId, encodeSiloV2CollateralMode, } from "./utils.js";
 export var SweepType;
 (function (SweepType) {
     SweepType[SweepType["VALIDATE"] = 0] = "VALIDATE";
@@ -46,6 +46,7 @@ export var LenderIds;
     LenderIds[LenderIds["UP_TO_COMPOUND_V3"] = 3000] = "UP_TO_COMPOUND_V3";
     LenderIds[LenderIds["UP_TO_COMPOUND_V2"] = 4000] = "UP_TO_COMPOUND_V2";
     LenderIds[LenderIds["UP_TO_MORPHO"] = 5000] = "UP_TO_MORPHO";
+    LenderIds[LenderIds["UP_TO_SILO_V2"] = 6000] = "UP_TO_SILO_V2";
 })(LenderIds || (LenderIds = {}));
 export var LenderOps;
 (function (LenderOps) {
@@ -95,7 +96,20 @@ export var 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 CompoundV2Selector;
+(function (CompoundV2Selector) {
+    CompoundV2Selector[CompoundV2Selector["MINT_BEHALF"] = 0] = "MINT_BEHALF";
+    CompoundV2Selector[CompoundV2Selector["MINT"] = 1] = "MINT";
+    CompoundV2Selector[CompoundV2Selector["REDEEM"] = 0] = "REDEEM";
+    CompoundV2Selector[CompoundV2Selector["REDEEM_BEHALF"] = 1] = "REDEEM_BEHALF";
+})(CompoundV2Selector || (CompoundV2Selector = {}));
+export var SiloV2CollateralType;
+(function (SiloV2CollateralType) {
+    SiloV2CollateralType[SiloV2CollateralType["PROTECTED"] = 0] = "PROTECTED";
+    SiloV2CollateralType[SiloV2CollateralType["COLLATERAL"] = 1] = "COLLATERAL";
+})(SiloV2CollateralType || (SiloV2CollateralType = {}));
 export var DexTypeMappings;
 (function (DexTypeMappings) {
     DexTypeMappings[DexTypeMappings["UNISWAP_V3_ID"] = 0] = "UNISWAP_V3_ID";
@@ -182,69 +196,41 @@ 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",
-    ], [
-        uint8(ComposerCommands.BRIDGING),
-        uint8(BridgeIds.ACROSS),
-        spokePool,
-        depositor,
-        sendingAssetId,
-        receivingAssetId,
-        generateAmountBitmap(uint128(amount), false, false),
-        fixedFee,
-        feePercentage,
-        destinationChainId,
-        receiver,
-        uint16(message.length / 2 - 1),
-        message,
+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),
     ]);
-    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 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, true),
+        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 encodeSquidRouterCall(asset, gateway, bridgedTokenSymbol, amount, destinationChain, destinationAddress, payload, gasRefundRecipient, enableExpress, nativeAmount) {
     const partialData = encodeSquidRouterCallPartial(asset, gateway, bridgedTokenSymbol, amount, destinationChain, destinationAddress, payload);
@@ -272,6 +258,26 @@ export function encodeSquidRouterCallPartial(asset, gateway, bridgedTokenSymbol,
         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,
+        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,
+    ]);
+}
 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)]);
 }
@@ -584,7 +590,7 @@ export function encodeMorphoDepositCollateral(market, assets, receiver, data, mo
         encodeApprove(getMorphoCollateral(market), morphoB),
         uint8(ComposerCommands.LENDING),
         uint8(LenderOps.DEPOSIT),
-        uint16(LenderIds.UP_TO_MORPHO),
+        uint16(LenderIds.UP_TO_MORPHO - 1),
         market,
         uint128(assets),
         receiver,
@@ -598,7 +604,7 @@ export function encodeMorphoDeposit(market, isShares, assets, receiver, data, mo
         encodeApprove(getMorphoLoanAsset(market), morphoB),
         uint8(ComposerCommands.LENDING),
         uint8(LenderOps.DEPOSIT_LENDING_TOKEN),
-        uint16(LenderIds.UP_TO_MORPHO),
+        uint16(LenderIds.UP_TO_MORPHO - 1),
         market,
         generateAmountBitmap(uint128(assets), isShares, false),
         receiver,
@@ -631,7 +637,7 @@ export function encodeMorphoWithdraw(market, isShares, assets, receiver, morphoB
     return encodePacked(["uint8", "uint8", "uint16", "bytes", "uint128", "address", "address"], [
         uint8(ComposerCommands.LENDING),
         uint8(LenderOps.WITHDRAW_LENDING_TOKEN),
-        uint16(LenderIds.UP_TO_MORPHO),
+        uint16(LenderIds.UP_TO_MORPHO - 1),
         market,
         generateAmountBitmap(uint128(assets), isShares, false),
         receiver,
@@ -642,7 +648,7 @@ export function encodeMorphoWithdrawCollateral(market, assets, receiver, morphoB
     return encodePacked(["uint8", "uint8", "uint16", "bytes", "uint128", "address", "address"], [
         uint8(ComposerCommands.LENDING),
         uint8(LenderOps.WITHDRAW),
-        uint16(LenderIds.UP_TO_MORPHO),
+        uint16(LenderIds.UP_TO_MORPHO - 1),
         market,
         uint128(assets),
         receiver,
@@ -653,7 +659,7 @@ export function encodeMorphoBorrow(market, isShares, assets, receiver, morphoB)
     return encodePacked(["uint8", "uint8", "uint16", "bytes", "uint128", "address", "address"], [
         uint8(ComposerCommands.LENDING),
         uint8(LenderOps.BORROW),
-        uint16(LenderIds.UP_TO_MORPHO),
+        uint16(LenderIds.UP_TO_MORPHO - 1),
         market,
         generateAmountBitmap(uint128(assets), isShares, false),
         receiver,
@@ -665,7 +671,7 @@ export function encodeMorphoRepay(market, isShares, assets, receiver, data, morp
         encodeApprove(getMorphoLoanAsset(market), morphoB),
         uint8(ComposerCommands.LENDING),
         uint8(LenderOps.REPAY),
-        uint16(LenderIds.UP_TO_MORPHO),
+        uint16(LenderIds.UP_TO_MORPHO - 1),
         market,
         generateAmountBitmap(uint128(assets), isShares, false),
         receiver,
@@ -821,18 +827,40 @@ export function encodeCompoundV3Withdraw(token, amount, receiver, comet, isBase)
         comet,
     ]);
 }
-export function encodeCompoundV2Deposit(token, amount, receiver, cToken) {
+export function encodeCompoundV2Deposit(token, amount, receiver, cToken, selectorId) {
     return encodePacked(["bytes", "uint8", "uint8", "uint16", "address", "uint128", "address", "address"], [
         token === zeroAddress ? newbytes(0) : encodeApprove(token, cToken),
         uint8(ComposerCommands.LENDING),
         uint8(LenderOps.DEPOSIT),
         uint16(LenderIds.UP_TO_COMPOUND_V2 - 1),
         token,
-        uint128(amount),
+        encodeCompoundV2SelectorId(uint128(amount), selectorId),
         receiver,
         cToken,
     ]);
 }
+export function encodeSiloV2Deposit(token, amount, receiver, silo, collateralMode) {
+    return encodePacked(["bytes", "uint8", "uint8", "uint16", "address", "uint128", "address", "address"], [
+        token === zeroAddress ? newbytes(0) : encodeApprove(token, silo),
+        uint8(ComposerCommands.LENDING),
+        uint8(LenderOps.DEPOSIT),
+        uint16(LenderIds.UP_TO_SILO_V2 - 1),
+        token,
+        encodeSiloV2CollateralMode(uint128(amount), collateralMode),
+        receiver,
+        silo,
+    ]);
+}
+export function encodeSiloV2Borrow(amount, receiver, silo) {
+    return encodePacked(["uint8", "uint8", "uint16", "uint128", "address", "address"], [
+        uint8(ComposerCommands.LENDING),
+        uint8(LenderOps.BORROW),
+        uint16(LenderIds.UP_TO_SILO_V2 - 1),
+        uint128(amount),
+        receiver,
+        silo,
+    ]);
+}
 export function encodeCompoundV2Borrow(token, amount, receiver, cToken) {
     return encodePacked(["uint8", "uint8", "uint16", "address", "uint128", "address", "address"], [
         uint8(ComposerCommands.LENDING),
@@ -856,14 +884,36 @@ export function encodeCompoundV2Repay(token, amount, receiver, cToken) {
         cToken,
     ]);
 }
-export function encodeCompoundV2Withdraw(token, amount, receiver, cToken) {
+export function encodeCompoundV2Withdraw(token, amount, receiver, cToken, selectorId) {
     return encodePacked(["uint8", "uint8", "uint16", "address", "uint128", "address", "address"], [
         uint8(ComposerCommands.LENDING),
         uint8(LenderOps.WITHDRAW),
         uint16(LenderIds.UP_TO_COMPOUND_V2 - 1),
         token,
-        uint128(amount),
+        encodeCompoundV2SelectorId(uint128(amount), selectorId),
         receiver,
         cToken,
     ]);
 }
+export function encodeSiloV2Withdraw(amount, receiver, silo, collateralMode) {
+    return encodePacked(["uint8", "uint8", "uint16", "uint128", "address", "address"], [
+        uint8(ComposerCommands.LENDING),
+        uint8(LenderOps.WITHDRAW),
+        uint16(LenderIds.UP_TO_SILO_V2 - 1),
+        encodeSiloV2CollateralMode(uint128(amount), collateralMode),
+        receiver,
+        silo,
+    ]);
+}
+export function encodeSiloV2Repay(token, amount, receiver, silo) {
+    return encodePacked(["bytes", "uint8", "uint8", "uint16", "address", "uint128", "address", "address"], [
+        token === zeroAddress ? newbytes(0) : encodeApprove(token, silo),
+        uint8(ComposerCommands.LENDING),
+        uint8(LenderOps.REPAY),
+        uint16(LenderIds.UP_TO_SILO_V2 - 1),
+        token,
+        uint128(amount),
+        receiver,
+        silo,
+    ]);
+}

package/dist/esm/utils.js

@@ -51,9 +51,18 @@ 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));
 }
 export function bytes(value) {
     return value;
 }
+export function encodeCompoundV2SelectorId(amount, selectorId) {
+    return uint128(amount) | (uint128(selectorId) << 120n);
+}
+export function encodeSiloV2CollateralMode(amount, mode) {
+    return uint128(amount) | (uint128(mode) << 120n);
+}

package/dist/types/CalldataLib.d.ts

@@ -36,7 +36,8 @@ export declare enum LenderIds {
     UP_TO_AAVE_V2 = 2000,
     UP_TO_COMPOUND_V3 = 3000,
     UP_TO_COMPOUND_V2 = 4000,
-    UP_TO_MORPHO = 5000
+    UP_TO_MORPHO = 5000,
+    UP_TO_SILO_V2 = 6000
 }
 export declare enum LenderOps {
     DEPOSIT = 0,
@@ -79,7 +80,18 @@ export declare enum ComposerCommands {
 export declare enum BridgeIds {
     STARGATE_V2 = 0,
     ACROSS = 10,
-    SQUID_ROUTER = 20
+    SQUID_ROUTER = 20,
+    GASZIP = 30
+}
+export declare enum CompoundV2Selector {
+    MINT_BEHALF = 0,
+    MINT = 1,
+    REDEEM = 0,
+    REDEEM_BEHALF = 1
+}
+export declare enum SiloV2CollateralType {
+    PROTECTED = 0,
+    COLLATERAL = 1
 }
 export declare enum DexTypeMappings {
     UNISWAP_V3_ID = 0,
@@ -117,10 +129,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;
@@ -178,7 +194,11 @@ export declare function encodeCompoundV3Deposit(token: Address, amount: bigint,
 export declare function encodeCompoundV3Borrow(token: Address, amount: bigint, receiver: Address, comet: Address): Hex;
 export declare function encodeCompoundV3Repay(token: Address, amount: bigint, receiver: Address, comet: Address): Hex;
 export declare function encodeCompoundV3Withdraw(token: Address, amount: bigint, receiver: Address, comet: Address, isBase: boolean): Hex;
-export declare function encodeCompoundV2Deposit(token: Address, amount: bigint, receiver: Address, cToken: Address): Hex;
+export declare function encodeCompoundV2Deposit(token: Address, amount: bigint, receiver: Address, cToken: Address, selectorId: number): Hex;
+export declare function encodeSiloV2Deposit(token: Address, amount: bigint, receiver: Address, silo: Address, collateralMode: number): Hex;
+export declare function encodeSiloV2Borrow(amount: bigint, receiver: Address, silo: Address): Hex;
 export declare function encodeCompoundV2Borrow(token: Address, amount: bigint, receiver: Address, cToken: Address): Hex;
 export declare function encodeCompoundV2Repay(token: Address, amount: bigint, receiver: Address, cToken: Address): Hex;
-export declare function encodeCompoundV2Withdraw(token: Address, amount: bigint, receiver: Address, cToken: Address): Hex;
+export declare function encodeCompoundV2Withdraw(token: Address, amount: bigint, receiver: Address, cToken: Address, selectorId: number): Hex;
+export declare function encodeSiloV2Withdraw(amount: bigint, receiver: Address, silo: Address, collateralMode: number): Hex;
+export declare function encodeSiloV2Repay(token: Address, amount: bigint, receiver: Address, silo: Address): Hex;

package/dist/types/utils.d.ts

@@ -15,5 +15,8 @@ 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;
+export declare function encodeCompoundV2SelectorId(amount: bigint, selectorId: number): bigint;
+export declare function encodeSiloV2CollateralMode(amount: bigint, mode: number): bigint;

package/package.json

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