@1delta/calldatalib 0.0.35 → 0.0.38

package/dist/cjs/CalldataLib.js

@@ -203,7 +203,7 @@ function encodeExternalCall(target, value, useSelfBalance, data) {
     return (0, utils_js_1.encodePacked)(["uint8", "address", "uint128", "uint16", "bytes"], [
         (0, utils_js_1.uint8)(ComposerCommands.EXT_CALL),
         target,
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(value), false, false, useSelfBalance),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(value), false, useSelfBalance),
         (0, utils_js_1.uint16)(data.length / 2 - 1),
         data,
     ]);
@@ -212,7 +212,7 @@ function encodeTryExternalCall(target, value, useSelfBalance, rOnFailure, data,
     return (0, utils_js_1.encodePacked)(["uint8", "address", "uint128", "uint16", "bytes", "uint8", "uint16", "bytes"], [
         (0, utils_js_1.uint8)(ComposerCommands.EXT_TRY_CALL),
         target,
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(value), false, false, useSelfBalance),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(value), false, useSelfBalance),
         (0, utils_js_1.uint16)(data.length / 2 - 1),
         data,
         (0, utils_js_1.uint8)(rOnFailure ? 0 : 1),
@@ -238,7 +238,7 @@ function encodePermit(permitId, target, data) {
 }
 function encodeStargateV2BridgePartial(amount, slippage, fee, isBusMode, isNative, composeMsg, extraOptions) {
     return (0, utils_js_1.encodePacked)(["uint128", "uint32", "uint128", "uint8", "uint16", "uint16", "bytes", "bytes"], [
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(amount), false, false, isNative),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(amount), false, isNative),
         slippage,
         (0, utils_js_1.uint128)(fee),
         (0, utils_js_1.uint8)(isBusMode ? 1 : 0),
@@ -276,7 +276,7 @@ function encodeAcrossBridgeToken(spokePool, depositor, sendingAssetId, receiving
         depositor,
         sendingAssetId,
         receivingAssetId,
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(amount), false, false, false),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(amount), false, false),
         fixedFee,
         feePercentage,
         destinationChainId,
@@ -308,7 +308,7 @@ function encodeAcrossBridgeNative(spokePool, depositor, sendingAssetId, receivin
         depositor,
         sendingAssetId,
         receivingAssetId,
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(amount), false, false, true),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(amount), false, true),
         fixedFee,
         feePercentage,
         destinationChainId,
@@ -376,7 +376,7 @@ function encodeUniswapV4Take(singleton, asset, receiver, amount) {
 function swapHead(amount, amountOutMin, assetIn) {
     return (0, utils_js_1.encodePacked)(["uint8", "uint128", "uint128", "address"], [
         (0, utils_js_1.uint8)(ComposerCommands.SWAPS),
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(amount), false, false, false),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(amount), false, false),
         (0, utils_js_1.uint128)(amountOutMin),
         assetIn,
     ]);
@@ -646,7 +646,7 @@ function encodeMorphoDeposit(market, isShares, assets, receiver, data, morphoB,
         (0, utils_js_1.uint8)(LenderOps.DEPOSIT_LENDING_TOKEN),
         (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO),
         market,
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false, false),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false),
         receiver,
         morphoB,
         (0, utils_js_1.uint16)(data.length / 2 - 1 > 0 ? data.length / 2 - 1 + 1 : 0),
@@ -660,7 +660,7 @@ function encodeErc4646Deposit(asset, vault, isShares, assets, receiver) {
         (0, utils_js_1.uint8)(0),
         asset,
         vault,
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false, false),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false),
         receiver,
     ]);
 }
@@ -669,7 +669,7 @@ function encodeErc4646Withdraw(vault, isShares, assets, receiver) {
         (0, utils_js_1.uint8)(ComposerCommands.ERC4626),
         (0, utils_js_1.uint8)(1),
         vault,
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false, false),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false),
         receiver,
     ]);
 }
@@ -679,7 +679,7 @@ function encodeMorphoWithdraw(market, isShares, assets, receiver, morphoB) {
         (0, utils_js_1.uint8)(LenderOps.WITHDRAW_LENDING_TOKEN),
         (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO),
         market,
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false, false),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false),
         receiver,
         morphoB,
     ]);
@@ -701,19 +701,19 @@ function encodeMorphoBorrow(market, isShares, assets, receiver, morphoB) {
         (0, utils_js_1.uint8)(LenderOps.BORROW),
         (0, utils_js_1.uint16)(LenderIds.UP_TO_MORPHO),
         market,
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false, false),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false),
         receiver,
         morphoB,
     ]);
 }
-function encodeMorphoRepay(market, isShares, unsafe, assets, receiver, data, morphoB, pId) {
+function encodeMorphoRepay(market, isShares, assets, receiver, data, morphoB, pId) {
     return (0, utils_js_1.encodePacked)(["bytes", "uint8", "uint8", "uint16", "bytes", "uint128", "address", "address", "uint16", "bytes"], [
         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),
         market,
-        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, unsafe, false),
+        (0, utils_js_1.generateAmountBitmap)((0, utils_js_1.uint128)(assets), isShares, false),
         receiver,
         morphoB,
         (0, utils_js_1.uint16)(data.length / 2 - 1 > 0 ? data.length / 2 - 1 + 1 : 0),

package/dist/cjs/utils.js

@@ -53,14 +53,12 @@ function encodePacked(types, values) {
     }
     return (0, viem_1.encodePacked)(types, values);
 }
-function generateAmountBitmap(amount, useShares, unsafe, native) {
+function generateAmountBitmap(amount, useShares, native) {
     let am = amount;
-    if (useShares)
-        am = uint128((am & ~BigInt(exports._SHARES_MASK)) | exports._SHARES_MASK);
-    if (unsafe)
-        am = uint128((am & ~BigInt(exports._UNSAFE_AMOUNT)) | exports._UNSAFE_AMOUNT);
     if (native)
         am = uint128((am & ~BigInt(exports._NATIVE_FLAG)) | exports._NATIVE_FLAG);
+    if (useShares)
+        am = uint128((am & ~BigInt(exports._SHARES_MASK)) | exports._SHARES_MASK);
     return am;
 }
 function getMorphoCollateral(market) {

package/dist/esm/CalldataLib.js

@@ -130,7 +130,7 @@ export function encodeExternalCall(target, value, useSelfBalance, data) {
     return encodePacked(["uint8", "address", "uint128", "uint16", "bytes"], [
         uint8(ComposerCommands.EXT_CALL),
         target,
-        generateAmountBitmap(uint128(value), false, false, useSelfBalance),
+        generateAmountBitmap(uint128(value), false, useSelfBalance),
         uint16(data.length / 2 - 1),
         data,
     ]);
@@ -139,7 +139,7 @@ export function encodeTryExternalCall(target, value, useSelfBalance, rOnFailure,
     return encodePacked(["uint8", "address", "uint128", "uint16", "bytes", "uint8", "uint16", "bytes"], [
         uint8(ComposerCommands.EXT_TRY_CALL),
         target,
-        generateAmountBitmap(uint128(value), false, false, useSelfBalance),
+        generateAmountBitmap(uint128(value), false, useSelfBalance),
         uint16(data.length / 2 - 1),
         data,
         uint8(rOnFailure ? 0 : 1),
@@ -165,7 +165,7 @@ export function encodePermit(permitId, target, data) {
 }
 export function encodeStargateV2BridgePartial(amount, slippage, fee, isBusMode, isNative, composeMsg, extraOptions) {
     return encodePacked(["uint128", "uint32", "uint128", "uint8", "uint16", "uint16", "bytes", "bytes"], [
-        generateAmountBitmap(uint128(amount), false, false, isNative),
+        generateAmountBitmap(uint128(amount), false, isNative),
         slippage,
         uint128(fee),
         uint8(isBusMode ? 1 : 0),
@@ -203,7 +203,7 @@ export function encodeAcrossBridgeToken(spokePool, depositor, sendingAssetId, re
         depositor,
         sendingAssetId,
         receivingAssetId,
-        generateAmountBitmap(uint128(amount), false, false, false),
+        generateAmountBitmap(uint128(amount), false, false),
         fixedFee,
         feePercentage,
         destinationChainId,
@@ -235,7 +235,7 @@ export function encodeAcrossBridgeNative(spokePool, depositor, sendingAssetId, r
         depositor,
         sendingAssetId,
         receivingAssetId,
-        generateAmountBitmap(uint128(amount), false, false, true),
+        generateAmountBitmap(uint128(amount), false, true),
         fixedFee,
         feePercentage,
         destinationChainId,
@@ -303,7 +303,7 @@ export function encodeUniswapV4Take(singleton, asset, receiver, amount) {
 export function swapHead(amount, amountOutMin, assetIn) {
     return encodePacked(["uint8", "uint128", "uint128", "address"], [
         uint8(ComposerCommands.SWAPS),
-        generateAmountBitmap(uint128(amount), false, false, false),
+        generateAmountBitmap(uint128(amount), false, false),
         uint128(amountOutMin),
         assetIn,
     ]);
@@ -573,7 +573,7 @@ export function encodeMorphoDeposit(market, isShares, assets, receiver, data, mo
         uint8(LenderOps.DEPOSIT_LENDING_TOKEN),
         uint16(LenderIds.UP_TO_MORPHO),
         market,
-        generateAmountBitmap(uint128(assets), isShares, false, false),
+        generateAmountBitmap(uint128(assets), isShares, false),
         receiver,
         morphoB,
         uint16(data.length / 2 - 1 > 0 ? data.length / 2 - 1 + 1 : 0),
@@ -587,7 +587,7 @@ export function encodeErc4646Deposit(asset, vault, isShares, assets, receiver) {
         uint8(0),
         asset,
         vault,
-        generateAmountBitmap(uint128(assets), isShares, false, false),
+        generateAmountBitmap(uint128(assets), isShares, false),
         receiver,
     ]);
 }
@@ -596,7 +596,7 @@ export function encodeErc4646Withdraw(vault, isShares, assets, receiver) {
         uint8(ComposerCommands.ERC4626),
         uint8(1),
         vault,
-        generateAmountBitmap(uint128(assets), isShares, false, false),
+        generateAmountBitmap(uint128(assets), isShares, false),
         receiver,
     ]);
 }
@@ -606,7 +606,7 @@ export function encodeMorphoWithdraw(market, isShares, assets, receiver, morphoB
         uint8(LenderOps.WITHDRAW_LENDING_TOKEN),
         uint16(LenderIds.UP_TO_MORPHO),
         market,
-        generateAmountBitmap(uint128(assets), isShares, false, false),
+        generateAmountBitmap(uint128(assets), isShares, false),
         receiver,
         morphoB,
     ]);
@@ -628,19 +628,19 @@ export function encodeMorphoBorrow(market, isShares, assets, receiver, morphoB)
         uint8(LenderOps.BORROW),
         uint16(LenderIds.UP_TO_MORPHO),
         market,
-        generateAmountBitmap(uint128(assets), isShares, false, false),
+        generateAmountBitmap(uint128(assets), isShares, false),
         receiver,
         morphoB,
     ]);
 }
-export function encodeMorphoRepay(market, isShares, unsafe, assets, receiver, data, morphoB, pId) {
+export function encodeMorphoRepay(market, isShares, assets, receiver, data, morphoB, pId) {
     return encodePacked(["bytes", "uint8", "uint8", "uint16", "bytes", "uint128", "address", "address", "uint16", "bytes"], [
         encodeApprove(getMorphoLoanAsset(market), morphoB),
         uint8(ComposerCommands.LENDING),
         uint8(LenderOps.REPAY),
         uint16(LenderIds.UP_TO_MORPHO),
         market,
-        generateAmountBitmap(uint128(assets), isShares, unsafe, false),
+        generateAmountBitmap(uint128(assets), isShares, false),
         receiver,
         morphoB,
         uint16(data.length / 2 - 1 > 0 ? data.length / 2 - 1 + 1 : 0),

package/dist/esm/utils.js

@@ -35,14 +35,12 @@ export function encodePacked(types, values) {
     }
     return abiEncodePacked(types, values);
 }
-export function generateAmountBitmap(amount, useShares, unsafe, native) {
+export function generateAmountBitmap(amount, useShares, native) {
     let am = amount;
-    if (useShares)
-        am = uint128((am & ~BigInt(_SHARES_MASK)) | _SHARES_MASK);
-    if (unsafe)
-        am = uint128((am & ~BigInt(_UNSAFE_AMOUNT)) | _UNSAFE_AMOUNT);
     if (native)
         am = uint128((am & ~BigInt(_NATIVE_FLAG)) | _NATIVE_FLAG);
+    if (useShares)
+        am = uint128((am & ~BigInt(_SHARES_MASK)) | _SHARES_MASK);
     return am;
 }
 export function getMorphoCollateral(market) {

package/dist/types/CalldataLib.d.ts

@@ -162,7 +162,7 @@ export declare function encodeErc4646Withdraw(vault: Address, isShares: boolean,
 export declare function encodeMorphoWithdraw(market: Hex, isShares: boolean, assets: bigint, receiver: Address, morphoB: Address): Hex;
 export declare function encodeMorphoWithdrawCollateral(market: Hex, assets: bigint, receiver: Address, morphoB: Address): Hex;
 export declare function encodeMorphoBorrow(market: Hex, isShares: boolean, assets: bigint, receiver: Address, morphoB: Address): Hex;
-export declare function encodeMorphoRepay(market: Hex, isShares: boolean, unsafe: boolean, assets: bigint, receiver: Address, data: Hex, morphoB: Address, pId: bigint): Hex;
+export declare function encodeMorphoRepay(market: Hex, isShares: boolean, assets: bigint, receiver: Address, data: Hex, morphoB: Address, pId: bigint): Hex;
 export declare function encodeAaveDeposit(token: Address, amount: bigint, receiver: Address, pool: Address): Hex;
 export declare function encodeAaveBorrow(token: Address, amount: bigint, receiver: Address, mode: bigint, pool: Address): Hex;
 export declare function encodeAaveRepay(token: Address, amount: bigint, receiver: Address, mode: bigint, dToken: Address, pool: Address): Hex;

package/dist/types/utils.d.ts

@@ -12,7 +12,7 @@ export declare function uint112(value: number | bigint): bigint;
 export declare function uint128(value: number | bigint): bigint;
 export declare function uint256(value: number | bigint): bigint;
 export declare function encodePacked(types: string[], values: any[]): Hex;
-export declare function generateAmountBitmap(amount: bigint, useShares: boolean, unsafe: boolean, native: boolean): bigint;
+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 newbytes(length: number): Hex;

package/package.json

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