damm-sdk 1.1.28 → 1.1.29-alpha.1

package/src/integrations/uniswapV3/uniswap.v3.ts

@@ -1,37 +1,44 @@
 import type { Address } from "viem";
 import { Wallet, ethers } from "ethers";
-import type { Call, HexString } from "../../types";
-import UniswapRouter from "./swap.router.abi";
-import PositionManager from "./position.manager.abi";
+import { type Call, createCall, type HexString, type Unwrapable } from "../../types";
+import UniswapV3Router01Abi from "./swap.router.01.abi.ts";
+import UniswapV3Router02Abi from "./swap.router.02.abi.ts";
+import UniswapV3PositionManagerAbi from "./position.manager.abi.ts";
 import type { FeeAmount } from "@uniswap/v3-sdk";
 
-const swapRouterInterface = new ethers.utils.Interface(UniswapRouter);
-const positionManagerInterface = new ethers.utils.Interface(PositionManager);
+const swapRouter01Interface = new ethers.utils.Interface(UniswapV3Router01Abi);
+const swapRouter02Interface = new ethers.utils.Interface(UniswapV3Router02Abi);
+const positionManagerInterface = new ethers.utils.Interface(UniswapV3PositionManagerAbi);
 
-export type UniswapV3SwapArgs = Readonly<{
+export type UniswapV3BaseSwapArgs = Readonly<{
     tokenIn: Address;
     tokenOut: Address;
     fee: FeeAmount;
     recipient: Address | Wallet;
-    deadline: bigint;
     sqrtPriceLimitX96: bigint;
 }>;
 
-export type UniswapV3ExactInputSingleArgs = Readonly<
+export type UniswapV3Router01ExactInputSingleArgs = Readonly<
     {
         amountIn: bigint;
         amountOutMinimum: bigint;
-    } & UniswapV3SwapArgs
+        deadline: bigint;
+    } & UniswapV3BaseSwapArgs
 >;
 
-export type UniswapV3ExactOutputSingleArgs = Readonly<
+export type UniswapV3Router01ExactOutputSingleArgs = Readonly<
     {
         amountOut: bigint;
         amountInMaximum: bigint;
-    } & UniswapV3SwapArgs
+        deadline: bigint;
+    } & UniswapV3BaseSwapArgs
 >;
 
-export const SwapExactInputSingleCalldata = ({
+export type UniswapV3Router02ExactInputSingleArgs = Readonly<Omit<UniswapV3Router01ExactInputSingleArgs, "deadline">>;
+
+export type UniswapV3Router02ExactOutputSingleArgs = Readonly<Omit<UniswapV3Router01ExactOutputSingleArgs, "deadline">>;
+
+export const Router01SwapExactInputSingleCalldata = ({
     tokenIn,
     tokenOut,
     fee,
@@ -40,13 +47,13 @@ export const SwapExactInputSingleCalldata = ({
     amountIn,
     amountOutMinimum,
     sqrtPriceLimitX96,
-}: UniswapV3ExactInputSingleArgs): HexString => {
-    return swapRouterInterface.encodeFunctionData("exactInputSingle", [
+}: UniswapV3Router01ExactInputSingleArgs): HexString => {
+    return swapRouter01Interface.encodeFunctionData("exactInputSingle", [
         [tokenIn, tokenOut, fee, recipient, deadline, amountIn, amountOutMinimum, sqrtPriceLimitX96],
     ]) as HexString;
 };
 
-export const SwapExactOutputSingleCalldata = ({
+export const Router01SwapExactOutputSingleCalldata = ({
     tokenIn,
     tokenOut,
     fee,
@@ -55,28 +62,74 @@ export const SwapExactOutputSingleCalldata = ({
     amountOut,
     amountInMaximum,
     sqrtPriceLimitX96,
-}: UniswapV3ExactOutputSingleArgs): HexString => {
-    return swapRouterInterface.encodeFunctionData("exactOutputSingle", [
+}: UniswapV3Router01ExactOutputSingleArgs): HexString => {
+    return swapRouter01Interface.encodeFunctionData("exactOutputSingle", [
         [tokenIn, tokenOut, fee, recipient, deadline, amountOut, amountInMaximum, sqrtPriceLimitX96],
     ]) as HexString;
 };
 
-export const swapTrx = ({
+export const Router02SwapExactOutputSingleCalldata = ({
+    tokenIn,
+    tokenOut,
+    fee,
+    recipient,
+    amountOut,
+    amountInMaximum,
+    sqrtPriceLimitX96,
+}: UniswapV3Router02ExactOutputSingleArgs): HexString => {
+    return swapRouter02Interface.encodeFunctionData("exactOutputSingle", [
+        [tokenIn, tokenOut, fee, recipient, amountOut, amountInMaximum, sqrtPriceLimitX96],
+    ]) as HexString;
+};
+
+export const Router02SwapExactInputCalldata = ({
+    tokenIn,
+    tokenOut,
+    fee,
+    recipient,
+    amountIn,
+    amountOutMinimum,
+    sqrtPriceLimitX96,
+}: UniswapV3Router02ExactInputSingleArgs): HexString => {
+    return swapRouter02Interface.encodeFunctionData("exactInputSingle", [
+        [tokenIn, tokenOut, fee, recipient, amountIn, amountOutMinimum, sqrtPriceLimitX96],
+    ]) as HexString;
+};
+
+export const swapExactInputSingleTrx = ({
+    swapParams,
+    swapRouter,
+}: {
+    swapParams: UniswapV3Router01ExactInputSingleArgs | UniswapV3Router02ExactInputSingleArgs;
+    swapRouter: Address;
+}): Unwrapable<Call> => {
+    return createCall({
+        to: swapRouter,
+        data:
+            "deadline" in swapParams
+                ? Router01SwapExactInputSingleCalldata(swapParams)
+                : Router02SwapExactInputCalldata(swapParams),
+        value: 0n,
+        operation: 0,
+    });
+};
+
+export const swapExactOutputSingleTrx = ({
     swapParams,
     swapRouter,
 }: {
-    swapParams: UniswapV3ExactInputSingleArgs | UniswapV3ExactOutputSingleArgs;
+    swapParams: UniswapV3Router01ExactOutputSingleArgs | UniswapV3Router02ExactOutputSingleArgs;
     swapRouter: Address;
-}): Call => {
-    return {
+}): Unwrapable<Call> => {
+    return createCall({
         to: swapRouter,
         data:
-            "amountIn" in swapParams
-                ? SwapExactInputSingleCalldata(swapParams as UniswapV3ExactInputSingleArgs)
-                : SwapExactOutputSingleCalldata(swapParams as UniswapV3ExactOutputSingleArgs),
+            "deadline" in swapParams
+                ? Router01SwapExactOutputSingleCalldata(swapParams)
+                : Router02SwapExactOutputSingleCalldata(swapParams),
         value: 0n,
         operation: 0,
-    };
+    });
 };
 
 export type UniswapMintPositionArgs = Readonly<{
@@ -129,13 +182,13 @@ export const mintPositionTrx = ({
 }: {
     mintParams: UniswapMintPositionArgs;
     positionManager: Address;
-}): Call => {
-    return {
+}): Unwrapable<Call> => {
+    return createCall({
         to: positionManager,
         data: MintPositionCalldata(mintParams),
         value: 0n,
         operation: 0,
-    };
+    });
 };
 
 export type UniswapIncreaseLiquidityArgs = Readonly<{
@@ -166,13 +219,13 @@ export const increaseLiquidityTrx = ({
 }: {
     increaseParams: UniswapIncreaseLiquidityArgs;
     positionManager: Address;
-}): Call => {
-    return {
+}): Unwrapable<Call> => {
+    return createCall({
         to: positionManager,
         data: IncreaseLiquidityCalldata(increaseParams),
         value: 0n,
         operation: 0,
-    };
+    });
 };
 
 export type UniswapDecreaseLiquidityArgs = Readonly<{
@@ -201,13 +254,13 @@ export const decreaseLiquidityTrx = ({
 }: {
     decreaseParams: UniswapDecreaseLiquidityArgs;
     positionManager: Address;
-}): Call => {
-    return {
+}): Unwrapable<Call> => {
+    return createCall({
         to: positionManager,
         data: DecreaseLiquidityCalldata(decreaseParams),
         value: 0n,
         operation: 0,
-    };
+    });
 };
 
 export type UniswapBurnPositionArgs = Readonly<{
@@ -224,13 +277,13 @@ export const burnPositionTrx = ({
 }: {
     burnParams: UniswapBurnPositionArgs;
     positionManager: Address;
-}): Call => {
-    return {
+}): Unwrapable<Call> => {
+    return createCall({
         to: positionManager,
         data: BurnPositionCalldata(burnParams),
         value: 0n,
         operation: 0,
-    };
+    });
 };
 
 export type UniswapCollectFeesArgs = Readonly<{
@@ -257,11 +310,11 @@ export const collectFeesTrx = ({
 }: {
     collectParams: UniswapCollectFeesArgs;
     positionManager: Address;
-}): Call => {
-    return {
+}): Unwrapable<Call> => {
+    return createCall({
         to: positionManager,
         data: CollectFeesCalldata(collectParams),
         value: 0n,
         operation: 0,
-    };
+    });
 };

package/src/integrations/uniswapV4/index.ts

@@ -1,5 +1,5 @@
 export * from "./uniswap.v4";
 export * from "./types";
-export { default as UniswapV4PositionManager } from "./position.manager.abi";
-export { default as UniswapV4Router } from "./swap.router.abi";
-export { default as UniswapV4Pool } from "./pool.manager.abi";
+export { default as UniswapV4PositionManagerAbi } from "./position.manager.abi";
+export { default as UniswapV4RouterAbi } from "./swap.router.abi";
+export { default as UniswapV4PoolAbi } from "./pool.manager.abi";

package/src/integrations/uniswapV4/uniswap.v4.ts

@@ -1,7 +1,7 @@
 import type { Address } from "viem";
 import { ethers } from "ethers";
-import type { Call, HexString } from "../../types";
-import UniswapRouter from "./swap.router.abi";
+import { type Call, type HexString, type Unwrapable, createCall } from "../../types";
+import UniswapV4RouterAbi from "./swap.router.abi.ts";
 import { toHex } from "@uniswap/v3-sdk";
 import { V4PositionManager, V4Planner, toAddress, Pool } from "@uniswap/v4-sdk";
 import type { Hex } from "viem";
@@ -16,7 +16,7 @@ import {
     type CollectInputV4,
 } from "./types";
 
-const swapRouterInterface = new ethers.utils.Interface(UniswapRouter);
+const swapRouterInterface = new ethers.utils.Interface(UniswapV4RouterAbi);
 
 /*
  * this is the calldata for the swap exact input single
@@ -111,13 +111,13 @@ export function finalizeActionsV4(
     deadline: number,
     positionManagerAddress: Address,
     value: bigint,
-): Call {
-    return {
+): Unwrapable<Call> {
+    return createCall({
         to: positionManagerAddress,
         data: V4PositionManager.encodeModifyLiquidities(planner.finalize(), deadline) as Hex,
         value: value,
         operation: 0,
-    };
+    });
 }
 
 /**
@@ -194,11 +194,11 @@ export const swapTrxV4 = ({
     swapParams: UniswapExactInputSingleParamsV4;
     swapRouter: Address;
     value?: bigint;
-}): Call => {
-    return {
+}): Unwrapable<Call> => {
+    return createCall({
         to: swapRouter,
         data: SwapExactInputSingleCalldataV4(swapParams),
         value: value,
         operation: 0,
-    };
+    });
 };

package/src/integrations/zodiac/delay/index.ts

@@ -1,2 +1,2 @@
-export * from "./zodiac.delay.abi";
+export { default as ZodiacDelayAbi } from "./zodiac.delay.abi";
 export * from "./zodiac.delay";

package/src/integrations/zodiac/delay/zodiac.delay.ts

@@ -1,9 +1,9 @@
 import { ethers } from "ethers";
-import ZodiacDelay from "./zodiac.delay.abi";
-import type { HexString, Call } from "damm-sdk";
+import ZodiacDelayAbi from "./zodiac.delay.abi.ts";
+import { type Call, type HexString, type Unwrapable, createCall } from "../../../types";
 import type { Address } from "viem";
 
-const zodiacDelayInterface = new ethers.utils.Interface(ZodiacDelay);
+const zodiacDelayInterface = new ethers.utils.Interface(ZodiacDelayAbi);
 
 export type DelayedTransactionArgs = Readonly<{
     to: Address;
@@ -27,15 +27,15 @@ export const execTransactionWithDelay = ({
 }: {
     args: DelayedTransactionArgs;
     delayModuleAddress: Address;
-}): Call => {
+}): Unwrapable<Call> => {
     const data = DelayedTransactionCalldata(args);
 
-    return {
+    return createCall({
         operation: 0,
         to: delayModuleAddress,
         value: 0n,
         data,
-    };
+    });
 };
 
 export const NextTxCalldata = ({ to, value, data, operation }: DelayedTransactionArgs): HexString => {
@@ -48,13 +48,13 @@ export const executeNextTx = ({
 }: {
     args: DelayedTransactionArgs;
     delayModuleAddress: Address;
-}): Call => {
+}): Unwrapable<Call> => {
     const data = NextTxCalldata(args);
 
-    return {
+    return createCall({
         operation: 0,
         to: delayModuleAddress,
         value: 0n,
         data,
-    };
+    });
 };

package/src/integrations/zodiac/roles/index.ts

@@ -1,2 +1,2 @@
 export * from "./zodiac.roles.ts";
-export { default as ZodiacRoles } from "./zodiac.roles.abi.ts";
+export { default as ZodiacRolesAbi } from "./zodiac.roles.abi.ts";

package/src/integrations/zodiac/roles/zodiac.roles.ts

@@ -1,9 +1,9 @@
 import { ethers } from "ethers";
-import ZodiacRoles from "./zodiac.roles.abi.ts";
-import type { HexString, Call } from "damm-sdk";
+import ZodiacRolesAbi from "./zodiac.roles.abi.ts";
+import { type HexString, type Call, createCall, type Unwrapable } from "../../../types";
 import type { Address } from "viem";
 
-const zodiacRolesInterface = new ethers.utils.Interface(ZodiacRoles);
+const zodiacRolesInterface = new ethers.utils.Interface(ZodiacRolesAbi);
 
 export type ExecWithRoleArgs = Readonly<{
     to: Address;
@@ -32,21 +32,60 @@ export const TransactionWithRoleCalldata = ({
     ]) as HexString;
 };
 
+export const setUpTransactionUnwrapperCalldata = ({
+    multisendAddress,
+    multisendUnwrapperAddress,
+    multisendSelector,
+}: {
+    multisendAddress: Address;
+    multisendUnwrapperAddress: Address;
+    multisendSelector: HexString;
+}): HexString => {
+    return zodiacRolesInterface.encodeFunctionData("setTransactionUnwrapper", [
+        multisendAddress,
+        multisendSelector,
+        multisendUnwrapperAddress,
+    ]) as HexString;
+};
+
+export const setUpTransactionUnwrapper = ({
+    rolesModAddress,
+    multisendAddress,
+    multisendUnwrapperAddress,
+    multisendSelector,
+}: {
+    rolesModAddress: Address;
+    multisendAddress: Address;
+    multisendUnwrapperAddress: Address;
+    multisendSelector: HexString;
+}): Unwrapable<Call> => {
+    return createCall({
+        to: rolesModAddress,
+        data: setUpTransactionUnwrapperCalldata({
+            multisendAddress,
+            multisendUnwrapperAddress,
+            multisendSelector,
+        }),
+        value: 0n,
+        operation: 0,
+    });
+};
+
 export const execWithRoleTrx = ({
     args,
     rolesModAddress,
 }: {
     args: ExecWithRoleArgs;
     rolesModAddress: Address;
-}): Call => {
+}): Unwrapable<Call> => {
     const data = TransactionWithRoleCalldata(args);
 
-    return {
+    return createCall({
         operation: 0,
         to: rolesModAddress,
         value: 0n,
         data,
-    };
+    });
 };
 
 export type ExecWithRoleReturnDataArgs = Readonly<{
@@ -82,15 +121,15 @@ export const execWithRoleReturnDataTrx = ({
 }: {
     args: ExecWithRoleReturnDataArgs;
     rolesModAddress: Address;
-}): Call => {
+}): Unwrapable<Call> => {
     const data = TransactionWithRoleReturnDataCalldata(args);
 
-    return {
+    return createCall({
         operation: 0,
         to: rolesModAddress,
         value: 0n,
         data,
-    };
+    });
 };
 
 export type ExecTransactionFromModuleArgs = Readonly<{
@@ -120,13 +159,13 @@ export const execTransactionFromModuleTrx = ({
 }: {
     args: ExecTransactionFromModuleArgs;
     rolesModAddress: Address;
-}): Call => {
+}): Unwrapable<Call> => {
     const data = TransactionFromModuleCalldata(args);
 
-    return {
+    return createCall({
         operation: 0,
         to: rolesModAddress,
         value: 0n,
         data,
-    };
+    });
 };

package/src/lib/contractsRegistry.json

@@ -40,7 +40,8 @@
         "zodiac": {
             "rolesModule": "0x9646fDAD06d3e24444381f44362a3B0eB343D337",
             "moduleProxyFactory": "0x000000000000aDdB49795b0f9bA5BC298cDda236",
-            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b"
+            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b",
+            "multisendUnwrapper": "0x93B7fCbc63ED8a3a24B59e1C3e6649D50B7427c0"
         },
         "multicall3": "0xcA11bde05977b3631167028862bE2a173976CA11",
         "permit2": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
@@ -100,7 +101,8 @@
         "zodiac": {
             "rolesModule": "0x9646fDAD06d3e24444381f44362a3B0eB343D337",
             "moduleProxyFactory": "0x000000000000aDdB49795b0f9bA5BC298cDda236",
-            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b"
+            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b",
+            "multisendUnwrapper": "0x93B7fCbc63ED8a3a24B59e1C3e6649D50B7427c0"
         },
         "1inch": {
             "aggregatorV6": "0x111111125421cA6dc452d289314280a0f8842A65"
@@ -135,7 +137,8 @@
         "zodiac": {
             "rolesModule": "0x9646fDAD06d3e24444381f44362a3B0eB343D337",
             "moduleProxyFactory": "0x000000000000aDdB49795b0f9bA5BC298cDda236",
-            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b"
+            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b",
+            "multisendUnwrapper": "0x93B7fCbc63ED8a3a24B59e1C3e6649D50B7427c0"
         },
         "1inch": {
             "aggregatorV6": "0x111111125421cA6dc452d289314280a0f8842A65"
@@ -168,7 +171,8 @@
         "zodiac": {
             "rolesModule": "0x9646fDAD06d3e24444381f44362a3B0eB343D337",
             "moduleProxyFactory": "0x000000000000aDdB49795b0f9bA5BC298cDda236",
-            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b"
+            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b",
+            "multisendUnwrapper": "0x93B7fCbc63ED8a3a24B59e1C3e6649D50B7427c0"
         },
         "1inch": {
             "aggregatorV6": "0x111111125421cA6dc452d289314280a0f8842A65"
@@ -176,9 +180,14 @@
         "wrappedNativeToken": "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c"
     },
     "optimism": {
+        "aaveV3": {
+            "pool": "0x794a61358D6845594F94dc1DB02A252b5b4814aD"
+        },
         "tokens": {
             "usdc": "0x0b2c639c533813f4aa9d7837caf62653d097ff85",
-            "usdt": "0x94b008aA00579c1307B0EF2c499aD98a8ce58e58"
+            "usdt": "0x94b008aA00579c1307B0EF2c499aD98a8ce58e58",
+            "velo": "0x3c8B650257cFb5f272f799F5e2b4e65093a11a05",
+            "weth": "0x4200000000000000000000000000000000000006"
         },
         "gnosisSafe": {
             "v1_4_1": {
@@ -190,7 +199,11 @@
         },
         "zodiac": {
             "rolesModule": "0x9646fDAD06d3e24444381f44362a3B0eB343D337",
-            "moduleProxyFactory": "0x000000000000aDdB49795b0f9bA5BC298cDda236"
+            "moduleProxyFactory": "0x000000000000aDdB49795b0f9bA5BC298cDda236",
+            "multisendUnwrapper": "0x93B7fCbc63ED8a3a24B59e1C3e6649D50B7427c0"
+        },
+        "enso": {
+            "routerV2": "0xF75584eF6673aD213a685a1B58Cc0330B8eA22Cf"
         },
         "permit2": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
         "multicall3": "0xcA11bde05977b3631167028862bE2a173976CA11",
@@ -200,7 +213,12 @@
         "morpho": {
             "morphoBlue": "0xce95AfbB8EA029495c66020883F87aaE8864AF92"
         },
-        "poster": "0x000000000000cd17345801aa8147b8D3950260FF"
+        "poster": "0x000000000000cd17345801aa8147b8D3950260FF",
+        "wrappedNativeToken": "0x4200000000000000000000000000000000000006",
+        "slipstream": {
+            "router": "0x0792a633F0c19c351081CF4B211F68F79bCc9676",
+            "positionManager": "0x416b433906b1B72FA758e166e239c43d68dC6F29"
+        }
     },
     "mainnet": {
         "uniswapV3": {
@@ -236,7 +254,8 @@
         },
         "zodiac": {
             "rolesModule": "0x9646fDAD06d3e24444381f44362a3B0eB343D337",
-            "moduleProxyFactory": "0x000000000000aDdB49795b0f9bA5BC298cDda236"
+            "moduleProxyFactory": "0x000000000000aDdB49795b0f9bA5BC298cDda236",
+            "multisendUnwrapper": "0x93B7fCbc63ED8a3a24B59e1C3e6649D50B7427c0"
         },
         "morpho": {
             "morphoBlue": "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb"
@@ -272,7 +291,8 @@
         "zodiac": {
             "rolesModule": "0x9646fDAD06d3e24444381f44362a3B0eB343D337",
             "moduleProxyFactory": "0x000000000000aDdB49795b0f9bA5BC298cDda236",
-            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b"
+            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b",
+            "multisendUnwrapper": "0x93B7fCbc63ED8a3a24B59e1C3e6649D50B7427c0"
         },
         "gnosisSafe": {
             "v1_4_1": {
@@ -310,7 +330,8 @@
         "zodiac": {
             "rolesModule": "0x9646fDAD06d3e24444381f44362a3B0eB343D337",
             "moduleProxyFactory": "0x000000000000aDdB49795b0f9bA5BC298cDda236",
-            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b"
+            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b",
+            "multisendUnwrapper": "0x93B7fCbc63ED8a3a24B59e1C3e6649D50B7427c0"
         },
         "tokens": {
             "ausd": "0x00000000eFE302BEAA2b3e6e1b18d08D69a9012a",
@@ -349,7 +370,8 @@
         "zodiac": {
             "rolesModule": "0x9646fDAD06d3e24444381f44362a3B0eB343D337",
             "moduleProxyFactory": "0x000000000000aDdB49795b0f9bA5BC298cDda236",
-            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b"
+            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b",
+            "multisendUnwrapper": "0x93B7fCbc63ED8a3a24B59e1C3e6649D50B7427c0"
         },
         "morpho": {
             "morphoBlue": "0xE741BC7c34758b4caE05062794E8Ae24978AF432"
@@ -383,7 +405,8 @@
         "zodiac": {
             "rolesModule": "0x9646fDAD06d3e24444381f44362a3B0eB343D337",
             "moduleProxyFactory": "0x000000000000aDdB49795b0f9bA5BC298cDda236",
-            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b"
+            "delayModule": "0x01F8cabB808D7dE0dF4202D4B60C8310d2f1339b",
+            "multisendUnwrapper": "0x93B7fCbc63ED8a3a24B59e1C3e6649D50B7427c0"
         },
         "gnosisSafe": {
             "v1_4_1": {

package/src/lib/index.ts

@@ -1,5 +1,4 @@
 export * from "./constants";
-export * from "./erc20";
 export * from "./utils";
 export * from "./native.eth";
 export * from "./transaction.simulation";

package/src/lib/native.eth.ts

@@ -1,11 +1,11 @@
 import type { Address } from "viem";
-import type { Call } from "..";
+import { type Call, type Unwrapable, createCall } from "../types";
 
-export const transferNativeEth = ({ to, amount }: { to: Address; amount: bigint }): Call => {
-    return {
+export const transferNativeEth = ({ to, amount }: { to: Address; amount: bigint }): Unwrapable<Call> => {
+    return createCall({
         to,
         operation: 0,
         value: amount,
         data: "0x",
-    };
+    });
 };

package/src/types/primitives.ts

@@ -2,13 +2,37 @@ import type { Address } from "viem";
 
 export type HexString = `0x${string}`;
 
-export type ExternalCall = Readonly<{
-    operation: 0 | 1;
+export type Operation = 0 | 1;
+
+export type Transaction = Readonly<{
     to: Address;
     value: bigint;
     data: HexString;
 }>;
 
-export type DelegateCall = Readonly<{ operation: 1 } & ExternalCall>;
+export type ExternalCall<T extends Operation> = Readonly<
+    {
+        operation: T;
+    } & Transaction
+>;
+
+export type DelegateCall = ExternalCall<1>;
+
+export type Call = ExternalCall<0>;
+
+export type Unwrapable<T extends ExternalCall<Operation>> = T & {
+    unwrap: () => Transaction;
+};
 
-export type Call = Readonly<{ operation: 0 } & ExternalCall>;
+export const createCall = <T extends Operation>(call: ExternalCall<T>): Unwrapable<ExternalCall<T>> => {
+    return {
+        ...call,
+        unwrap: () => {
+            return {
+                to: call.to,
+                value: call.value,
+                data: call.data,
+            };
+        },
+    };
+};

package/dist/abi/erc20.abi.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"erc20.abi.d.ts","sourceRoot":"","sources":["../../src/abi/erc20.abi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBA6NW"}

package/dist/lib/erc20.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"erc20.d.ts","sourceRoot":"","sources":["../../src/lib/erc20.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAIhD,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACrC,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH,eAAO,MAAM,gBAAgB,0BAA2B,KAAK,iBAAiB,EAAE,OAAO,CAAC,KAAG,SAE1F,CAAC;AAEF,eAAO,MAAM,gBAAgB,iCAAkC,iBAAiB,KAAG,IAOlF,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACpC,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH,eAAO,MAAM,eAAe,wBAAyB,KAAK,gBAAgB,EAAE,OAAO,CAAC,KAAG,SAEtF,CAAC;AAEF,eAAO,MAAM,eAAe,+BAAgC,gBAAgB,KAAG,IAO9E,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC;IACzC,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH,eAAO,MAAM,oBAAoB,oCAI9B,KAAK,qBAAqB,EAAE,OAAO,CAAC,KAAG,SAEzC,CAAC;AAEF,eAAO,MAAM,oBAAoB,0CAA2C,qBAAqB,KAAG,IAOnG,CAAC"}