@1delta/calldatalib 0.0.42 → 0.0.46

package/dist/cjs/CalldataLib.js

@@ -1,8 +1,10 @@
 "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.encodeExternalCallWithReplace = encodeExternalCallWithReplace;
+exports.encodeTryExternalCallWithReplace = encodeTryExternalCallWithReplace;
 exports.encodeStargateV2Bridge = encodeStargateV2Bridge;
 exports.encodePermit = encodePermit;
 exports.encodeStargateV2BridgePartial = encodeStargateV2BridgePartial;
@@ -74,9 +76,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");
@@ -125,6 +131,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) {
@@ -161,6 +168,8 @@ var ComposerCommands;
     ComposerCommands[ComposerCommands["SWAPS"] = 16] = "SWAPS";
     ComposerCommands[ComposerCommands["EXT_CALL"] = 32] = "EXT_CALL";
     ComposerCommands[ComposerCommands["EXT_TRY_CALL"] = 33] = "EXT_TRY_CALL";
+    ComposerCommands[ComposerCommands["EXT_CALL_WITH_REPLACE"] = 34] = "EXT_CALL_WITH_REPLACE";
+    ComposerCommands[ComposerCommands["EXT_TRY_CALL_WITH_REPLACE"] = 35] = "EXT_TRY_CALL_WITH_REPLACE";
     ComposerCommands[ComposerCommands["LENDING"] = 48] = "LENDING";
     ComposerCommands[ComposerCommands["TRANSFERS"] = 64] = "TRANSFERS";
     ComposerCommands[ComposerCommands["PERMIT"] = 80] = "PERMIT";
@@ -176,6 +185,18 @@ var BridgeIds;
     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";
@@ -228,6 +249,31 @@ function encodeTryExternalCall(target, value, useSelfBalance, rOnFailure, data,
         catchData,
     ]);
 }
+function encodeExternalCallWithReplace(target, value, useSelfBalance, token, replaceOffset, data) {
+    return (0, utils_js_1.encodePacked)(["uint8", "address", "uint128", "address", "uint16", "uint16", "bytes"], [
+        (0, utils_js_1.uint8)(ComposerCommands.EXT_CALL_WITH_REPLACE),
+        target,
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(value), false, useSelfBalance),
+        token,
+        replaceOffset,
+        (0, utils_js_1.uint16)(data.length / 2 - 1),
+        data,
+    ]);
+}
+function encodeTryExternalCallWithReplace(target, value, useSelfBalance, token, replaceOffset, data, rOnFailure, catchData) {
+    return (0, utils_js_1.encodePacked)(["uint8", "address", "uint128", "address", "uint16", "uint16", "uint8", "uint16", "bytes", "bytes"], [
+        (0, utils_js_1.uint8)(ComposerCommands.EXT_TRY_CALL_WITH_REPLACE),
+        target,
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(value), false, useSelfBalance),
+        token,
+        replaceOffset,
+        (0, utils_js_1.uint16)(data.length / 2 - 1),
+        (0, utils_js_1.uint8)(rOnFailure ? 0 : 1),
+        (0, utils_js_1.uint16)(catchData.length / 2 - 1),
+        data,
+        catchData,
+    ]);
+}
 function encodeStargateV2Bridge(asset, stargatePool, dstEid, receiver, refundReceiver, amount, slippage, fee, isBusMode, isNative, composeMsg, extraOptions) {
     const partialData = encodeStargateV2BridgePartial(amount, slippage, fee, isBusMode, isNative, composeMsg, extraOptions);
     return (0, utils_js_1.encodePacked)(["uint8", "uint8", "address", "address", "uint32", "bytes32", "address", "bytes"], [
@@ -656,7 +702,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,
@@ -670,7 +716,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,
@@ -703,7 +749,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,
@@ -714,7 +760,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,
@@ -725,7 +771,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,
@@ -737,7 +783,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,
@@ -893,18 +939,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),
@@ -928,14 +996,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

@@ -17,6 +17,8 @@ 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;
@@ -79,3 +81,9 @@ function newbytes(length) {
 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, rightPadZero, } 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) {
@@ -82,6 +83,8 @@ export var ComposerCommands;
     ComposerCommands[ComposerCommands["SWAPS"] = 16] = "SWAPS";
     ComposerCommands[ComposerCommands["EXT_CALL"] = 32] = "EXT_CALL";
     ComposerCommands[ComposerCommands["EXT_TRY_CALL"] = 33] = "EXT_TRY_CALL";
+    ComposerCommands[ComposerCommands["EXT_CALL_WITH_REPLACE"] = 34] = "EXT_CALL_WITH_REPLACE";
+    ComposerCommands[ComposerCommands["EXT_TRY_CALL_WITH_REPLACE"] = 35] = "EXT_TRY_CALL_WITH_REPLACE";
     ComposerCommands[ComposerCommands["LENDING"] = 48] = "LENDING";
     ComposerCommands[ComposerCommands["TRANSFERS"] = 64] = "TRANSFERS";
     ComposerCommands[ComposerCommands["PERMIT"] = 80] = "PERMIT";
@@ -97,6 +100,18 @@ export var BridgeIds;
     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";
@@ -149,6 +164,31 @@ export function encodeTryExternalCall(target, value, useSelfBalance, rOnFailure,
         catchData,
     ]);
 }
+export function encodeExternalCallWithReplace(target, value, useSelfBalance, token, replaceOffset, data) {
+    return encodePacked(["uint8", "address", "uint128", "address", "uint16", "uint16", "bytes"], [
+        uint8(ComposerCommands.EXT_CALL_WITH_REPLACE),
+        target,
+        generateAmountBitmap(uint128(value), false, useSelfBalance),
+        token,
+        replaceOffset,
+        uint16(data.length / 2 - 1),
+        data,
+    ]);
+}
+export function encodeTryExternalCallWithReplace(target, value, useSelfBalance, token, replaceOffset, data, rOnFailure, catchData) {
+    return encodePacked(["uint8", "address", "uint128", "address", "uint16", "uint16", "uint8", "uint16", "bytes", "bytes"], [
+        uint8(ComposerCommands.EXT_TRY_CALL_WITH_REPLACE),
+        target,
+        generateAmountBitmap(uint128(value), false, useSelfBalance),
+        token,
+        replaceOffset,
+        uint16(data.length / 2 - 1),
+        uint8(rOnFailure ? 0 : 1),
+        uint16(catchData.length / 2 - 1),
+        data,
+        catchData,
+    ]);
+}
 export function encodeStargateV2Bridge(asset, stargatePool, dstEid, receiver, refundReceiver, amount, slippage, fee, isBusMode, isNative, composeMsg, extraOptions) {
     const partialData = encodeStargateV2BridgePartial(amount, slippage, fee, isBusMode, isNative, composeMsg, extraOptions);
     return encodePacked(["uint8", "uint8", "address", "address", "uint32", "bytes32", "address", "bytes"], [
@@ -577,7 +617,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,
@@ -591,7 +631,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,
@@ -624,7 +664,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,
@@ -635,7 +675,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,
@@ -646,7 +686,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,
@@ -658,7 +698,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,
@@ -814,18 +854,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),
@@ -849,14 +911,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

@@ -60,3 +60,9 @@ export function newbytes(length) {
 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,
@@ -68,6 +69,8 @@ export declare enum ComposerCommands {
     SWAPS = 16,
     EXT_CALL = 32,
     EXT_TRY_CALL = 33,
+    EXT_CALL_WITH_REPLACE = 34,
+    EXT_TRY_CALL_WITH_REPLACE = 35,
     LENDING = 48,
     TRANSFERS = 64,
     PERMIT = 80,
@@ -82,6 +85,16 @@ export declare enum BridgeIds {
     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,
     UNISWAP_V2_ID = 1,
@@ -113,6 +126,8 @@ export declare enum DexForkMappings {
 }
 export declare function encodeExternalCall(target: Address, value: bigint, useSelfBalance: boolean, data: Hex): Hex;
 export declare function encodeTryExternalCall(target: Address, value: bigint, useSelfBalance: boolean, rOnFailure: boolean, data: Hex, catchData: Hex): Hex;
+export declare function encodeExternalCallWithReplace(target: Address, value: bigint, useSelfBalance: boolean, token: Address, replaceOffset: number, data: Hex): Hex;
+export declare function encodeTryExternalCallWithReplace(target: Address, value: bigint, useSelfBalance: boolean, token: Address, replaceOffset: number, data: Hex, rOnFailure: boolean, catchData: Hex): Hex;
 export declare function encodeStargateV2Bridge(asset: Address, stargatePool: Address, dstEid: number, receiver: Hex, refundReceiver: Address, amount: bigint, slippage: number, fee: bigint, isBusMode: boolean, isNative: boolean, composeMsg: Hex, extraOptions: Hex): Hex;
 export declare function encodePermit(permitId: bigint, target: Address, data: Hex): Hex;
 export declare function encodeStargateV2BridgePartial(amount: bigint, slippage: number, fee: bigint, isBusMode: boolean, isNative: boolean, composeMsg: Hex, extraOptions: Hex): Hex;
@@ -183,7 +198,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

@@ -18,3 +18,5 @@ 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.42",
+  "version": "0.0.46",
   "description": "Generated CalldataLib TypeScript functions for 1delta smart contracts",
   "type": "module",
   "main": "./dist/cjs/index.js",