@defisaver/sdk 1.3.36 → 1.3.37

package/README.md

@@ -1,16 +1,62 @@
-# DeFi Saver Recipe SDK
+# DeFi Saver SDK
 
-Create complex transactions that interact with multiple DeFi protocols.
+Build actions and combine them into recipes for DeFi Saver smart wallets.
 
----
+## Installation
 
- - [General docs](https://docs.defisaver.com/)
- - [SDK docs](https://github.com/DecenterApps/defisaver-sdk/blob/master/DEV.md)
- - [Available Actions](https://github.com/DecenterApps/defisaver-sdk/blob/master/ACTIONS.md)
- - [Pre-made recipes - TODO](https://github.com/DecenterApps/defisaver-sdk/blob/master/RECIPES.md)
+```sh
+npm install @defisaver/sdk
+```
+
+## Example
+
+Encode a recipe that wraps 0.1 ETH into WETH on Ethereum:
+
+```js
+const { configure, Recipe, actions } = require('@defisaver/sdk');
+
+async function main() {
+  configure({ chainId: 1, testingMode: false });
+
+  const recipe = new Recipe('Wrap ETH', [
+    new actions.basic.WrapEthAction('100000000000000000'),
+  ]);
+
+  const [target, data] = recipe.encodeForDsProxyCall();
+  const value = await recipe.getEthValue();
+  console.log({ target, data, value });
+}
+
+main().catch(console.error);
+```
+
+Amounts use token base units as decimal strings. Here, `value` is the ETH amount in wei. `target` and `data` are arguments for the smart wallet's `execute(address,bytes)` call; encoding does not submit a transaction.
+
+- [Developer guide](docs/DEV.md): recipes, approvals, configuration, and contributing.
+- [Action implementations](src/actions): current constructors and parameter documentation, grouped by protocol.
+- [DeFi Saver documentation](https://docs.defisaver.com/): product and protocol guides.
 
 ## Testing
 
-`npm run test` - Run all tests
+From a local checkout, install dependencies with `npm ci`, then run:
+
+```sh
+# Run offline tests (no RPC required)
+npm run test:unit
+
+# Run all tests, including RPC-dependent wallet tests
+npm test
+
+# Run a single test file (test/Recipe.js)
+npm run test-single --name=Recipe
+```
+
+The full suite requires `RPC` in your environment or a local `.env` file for the wallet tests. Point it at a local or forked test chain.
+
+## Building
+
+```sh
+npm run build
+```
 
-`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
+Builds the package and runs lint with automatic fixes. To check lint without changing files, use `npm run lint-check`.

package/docs/DEV.md

@@ -0,0 +1,63 @@
+# Developer guide
+
+The SDK models a transaction as an `Action`, or a sequence of actions as a `Recipe`. Action constructors describe contract inputs; the shared classes handle encoding and composition. See the [README](../README.md) for installation and a minimal example.
+
+## Configuration and amounts
+
+Call `configure({ chainId: 1, testingMode: false })` before constructing actions or recipes. Addresses are resolved during construction. Configuration is global, including the token library's network: avoid switching chains while working with existing objects or concurrent operations.
+
+Use decimal strings in token base units: `'1000000'` represents 1 token with 6 decimals, and `'1000000000000000000'` represents 1 token with 18 decimals. Avoid JavaScript numbers for large amounts. Special values such as a maximum amount are action-specific; check the constructor documentation.
+
+Supported networks are exported as `networks`. Use `getAddr(name, chainId)` to look up a deployment; it throws when the chain or named deployment is unavailable. Network support does not imply every action is deployed there.
+
+## Composing a recipe
+
+This example encodes pulling 1 WETH from an owner into the wallet and returning the amount received to that owner. Replace the example owner with your address when integrating it.
+
+```js
+const { configure, Recipe, actions } = require('@defisaver/sdk');
+
+async function main() {
+  configure({ chainId: 1, testingMode: false });
+
+  const owner = '0x0000000000000000000000000000000000000001';
+  const weth = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2';
+  const recipe = new Recipe('Pull and return WETH', [
+    new actions.basic.PullTokenAction(weth, owner, '1000000000000000000'),
+    new actions.basic.SendTokenAction(weth, owner, '$1'),
+  ]);
+
+  const approvals = await recipe.getAssetsToApprove();
+  const value = await recipe.getEthValue();
+  const [target, data] = recipe.encodeForDsProxyCall();
+  console.log({ approvals, target, data, value });
+}
+
+main().catch(console.error);
+```
+
+`'$1'` refers to the first action's return value, with numbering starting at **1**. References must point to an earlier action and be used in an input that supports mapping. A return value's meaning depends on the action; it is not necessarily a token amount. Nested inputs can have a custom mapping order, defined by the action's `mappableArgs`.
+
+`getAssetsToApprove()` describes assets and owners requiring approval. For the ERC-20 example above, the owner approves the executing smart wallet to spend WETH before execution. The returned metadata does not perform approvals or check existing allowances. NFT approvals use different fields; inspect the returned type when supporting them.
+
+For a DSProxy, pass `target` and `data` to its `execute(address,bytes)` method and attach `value` to that transaction. Other wallet integrations must use their appropriate execution path. Do not treat the returned target as a standalone user transaction destination.
+
+A single action also exposes `encodeForDsProxyCall()`, `getAssetsToApprove()`, and `getEthValue()`. `ActionWithL2` supports specialized packed calldata; callers should normally use the public encoding methods rather than pack bytes themselves.
+
+## Strategies
+
+`Strategy` describes reusable automation: add subscription slots with `addSubSlot`, triggers with `addTrigger`, and actions with `addAction`. Strategy inputs can refer to named subscription slots such as `'&vaultId'`, or the special addresses `'&proxy'` and `'&eoa'`. Action return references still use `'$1'`, `'$2'`, and so on.
+
+Strategy encoding is separate from recipe execution. See the [strategy example](../test/Strategy.js) and [implementation](../src/Strategy.ts) for the current API.
+
+## Adding an action
+
+1. Add a class under the relevant [protocol directory](../src/actions), extending `Action` or `ActionWithL2`.
+2. Match the contract's action name, ABI types, and argument order in the `super` call. Define `mappableArgs` in the order expected by the contract.
+3. Implement approval metadata and ETH value when needed. Implement packed L2 encoding only when the contract supports it.
+4. Export the class through the protocol index and add its deployments to [addresses.ts](../src/addresses.ts).
+5. Add tests for encoded values, mappings, approvals, and ETH value, including relevant boundary cases. Keep constructor parameter documentation beside the implementation.
+
+[PullTokenAction](../src/actions/basic/PullTokenAction.ts) is a small example. Use existing actions for structure, and the corresponding contract as the source of truth for input semantics.
+
+See the [README](../README.md#testing) for testing commands.

package/esm/src/Action.js

@@ -12,7 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Action_instances, _Action__getArgumentMappingWithSlots, _Action__getPlaceholderForType;
+var _Action_instances, _Action__getReturnValueReference, _Action__getArgumentMappingWithSlots, _Action__getPlaceholderForType;
 import AbiCoder from 'web3-eth-abi';
 import { keccak256, padLeft, toHex } from 'web3-utils';
 import { CONFIG } from './config';
@@ -52,12 +52,12 @@ export class Action {
      */
     _getArgumentMapping() {
         return this.mappableArgs.map(arg => {
-            if (new RegExp(/\$\d+/).test(arg)) {
-                if (Array.isArray(arg))
-                    throw TypeError('Input can\'t be mapped to arrays (tuples/structs). Specify `mappableArgs` array in constructor.');
-                // eslint-disable-next-line
-                return parseInt(arg.substr(1));
+            if (Array.isArray(arg) && /\$\d+/.test(arg.toString())) {
+                throw TypeError('Input can\'t be mapped to arrays (tuples/structs). Specify `mappableArgs` array in constructor.');
             }
+            const reference = __classPrivateFieldGet(this, _Action_instances, "m", _Action__getReturnValueReference).call(this, arg);
+            if (reference !== undefined)
+                return reference;
             return 0;
         });
     }
@@ -100,7 +100,7 @@ export class Action {
         if (Array.isArray(arg))
             return arg.map((_arg, i) => this._replaceWithPlaceholders(_arg, paramTypeParsed[i]));
         if (typeof (paramType) === 'string') {
-            if (new RegExp(/\$\d+/).test(arg))
+            if (__classPrivateFieldGet(this, _Action_instances, "m", _Action__getReturnValueReference).call(this, arg) !== undefined)
                 return __classPrivateFieldGet(this, _Action_instances, "m", _Action__getPlaceholderForType).call(this, paramType);
             if (new RegExp(/&\w+/).test(arg))
                 return __classPrivateFieldGet(this, _Action_instances, "m", _Action__getPlaceholderForType).call(this, paramType);
@@ -196,14 +196,22 @@ export class Action {
         }));
     }
 }
-_Action_instances = new WeakSet(), _Action__getArgumentMappingWithSlots = function _Action__getArgumentMappingWithSlots(subSlots) {
+_Action_instances = new WeakSet(), _Action__getReturnValueReference = function _Action__getReturnValueReference(arg) {
+    if (typeof arg !== 'string' || !/\$\d+/.test(arg))
+        return undefined;
+    const index = Number(arg.slice(1));
+    if (!/^\$\d+$/.test(arg) || !Number.isSafeInteger(index) || index < 1) {
+        throw new Error(`Invalid action return reference: ${arg}`);
+    }
+    return index;
+}, _Action__getArgumentMappingWithSlots = function _Action__getArgumentMappingWithSlots(subSlots) {
     return this.mappableArgs.map(arg => {
-        if (new RegExp(/\$\d+/).test(arg)) {
-            if (Array.isArray(arg))
-                throw TypeError('Input can\'t be mapped to arrays (tuples/structs). Specify `mappableArgs` array in constructor.');
-            // eslint-disable-next-line
-            return parseInt(arg.substr(1));
+        if (Array.isArray(arg) && /\$\d+/.test(arg.toString())) {
+            throw TypeError('Input can\'t be mapped to arrays (tuples/structs). Specify `mappableArgs` array in constructor.');
         }
+        const reference = __classPrivateFieldGet(this, _Action_instances, "m", _Action__getReturnValueReference).call(this, arg);
+        if (reference !== undefined)
+            return reference;
         // Handle SubSlots placeholder values in strategies
         if (new RegExp(/&\w+/).test(arg)) {
             if (arg === '&proxy')

package/esm/src/ActionWithL2.js

@@ -34,10 +34,14 @@ export class ActionWithL2 extends Action {
     }
     numberToBytes2(number) {
         const hexNumber = number.toString(16);
+        if (!/^[0-9a-f]{1,4}$/i.test(hexNumber))
+            throw new RangeError('Value must fit in an unsigned 2-byte integer');
         return hexNumber.padStart(4, '0');
     }
     numberToBytes1(number) {
         const hexNumber = number.toString(16);
+        if (!/^[0-9a-f]{1,2}$/i.test(hexNumber))
+            throw new RangeError('Value must fit in an unsigned 1-byte integer');
         return hexNumber.padStart(2, '0');
     }
     numberToBytes32(number) {

package/esm/src/Recipe.js

@@ -146,7 +146,9 @@ export class Recipe {
             for (const pairsPerAction of assetOwnerPairs) {
                 for (const pair of pairsPerAction) {
                     const isNft = !pair.asset;
-                    if (!uniqueAssetOwnerPairs.find(_pair => _pair.owner === pair.owner && (isNft ? _pair.tokenId === pair.tokenId : _pair.asset === pair.asset))) {
+                    if (!uniqueAssetOwnerPairs.find(_pair => _pair.owner === pair.owner && (isNft
+                        ? 'nft' in _pair && _pair.nft === pair.nft && _pair.tokenId === pair.tokenId
+                        : _pair.asset === pair.asset))) {
                         if (isNft) {
                             uniqueAssetOwnerPairs.push({
                                 owner: pair.owner,
@@ -196,6 +198,8 @@ export class Recipe {
     }
 }
 _Recipe_instances = new WeakSet(), _Recipe__encodeForCall = function _Recipe__encodeForCall() {
+    if (this.actions.length === 0)
+        throw new Error('Cannot encode an empty recipe');
     const encoded = this.actions.map(action => action.encodeForRecipe());
     const transposed = encoded[0].map((_, colIndex) => encoded.map(row => row[colIndex]));
     const taskStruct = [

package/esm/src/addresses.js

@@ -13,8 +13,8 @@ export const actionAddresses = {
         TokenBalance: '0xa92B177950F1460119940436515FD857C24494BC',
         AutomationV2Unsub: '0xe35Fb12fE9796847751076aCf5ee7d124108612C',
         SendTokenAndUnwrap: '0x4155537e6933E59a62deb68f6ad93d237d07242a',
-        ToggleSub: '0x2120ad7b4eE1795C8B027c1592eCB918faAb163A',
-        UpdateSub: '0xF6Cb8f7e61a64075ec8FAC3f298745605E543233',
+        ToggleSub: '0xf247a8525E7486884E7227EB9a161507F0FF46A6',
+        UpdateSub: '0x919c472bFA4B50FcACF9849501344aFDde2E4675',
         TransferNFT: '0x861e893E1796F81248e75F06C0b09Abdc8fe2f6F',
         CreateSub: '0xEB13C96257667cF0A037305A46092bf7C70A61e1',
         ApproveToken: '0xA4161cED7A29F0a3424e464a4a2dBf75888c5BF9',
@@ -356,8 +356,8 @@ export const actionAddresses = {
         SubInputs: '0x60d00020f12dd202eAfDba84e8F69E165a84c64D',
         ApproveToken: '0x842a81d2cfe26d401CD63Cc14e9DEf275c197C1a',
         SendTokenAndUnwrap: '0xd4f69250cb4d1f083Dd372FEace391A16ABbfBDc',
-        ToggleSub: '0xfc19a12e35bb0b5e6a3d3017be9e9022a6486eee',
-        UpdateSub: '0xAe6ea1d13dF2bE60dC7933DB56067Cb89d6A2cDe',
+        ToggleSub: '0xA4Eaad8Fe80d1E47f2b95CED2bcFb648d5929735',
+        UpdateSub: '0xe2c7D66b40e00Dd14844Db8d02142f23D4Da7071',
         CreateSub: '0x2daED8030BFC87B3d27c02E2f044B9CF4841Ff3e',
         TokenBalance: '0xC6FF5b01f7c7b35b6e093fF70D2332B361C5Be5A',
         TokenizedVaultAdapter: '0xdf31669FEd440f5BfF658ca0bBF0D22B8abdeb73',
@@ -418,14 +418,14 @@ export const actionAddresses = {
         SubInputs: '0x8ec14f9568e1d7cf73b68df899808abd7fe6fc8d',
         SendTokenAndUnwrap: '0x009C5B1c7C844Bd662Da3991295b1B3Bd71a430c',
         ApproveToken: '0x01058999F5Ac434EF48DFB5Cd942c57A7661787B',
-        ToggleSub: '0x2eabbab99759c2ab6e9e309d42ee07d3bc7c38fe',
+        ToggleSub: '0x75469d8f96368F87718162e528104B59550CD71E',
         CreateSub: '0xbFD17a0a844b75976585a382a5BcCaFC9EAd731f',
         TokenBalance: '0x483B903E702F60698Dd8124558C6199922737f1F',
         TokenizedVaultAdapter: '0xD05C512bDFf6D3eAc5328807B3bC075F35271167',
         ChangeProxyOwner: '0xacf5bAD9543A98EcAcC620cF6CB989Ec88f1650D',
         PermitToken: '0x2E5E7a691092C158bb8341b936eF24FCcA6c0e00',
         HandleAuth: '0xbfcab1339e1a56a0a836cbca6457eaf71f148fcb',
-        UpdateSub: '0x3511f444362F8cBd185DbF21C9488D16c1306461',
+        UpdateSub: '0x404c3EE602fb4b2D3E36E371bEA36a27B2177107',
         TransferNFT: '0xf73b14cf4bc10509446fc4111407a721f8a81f7d',
         MerklClaim: '0xdab7b1865efa8d1f8fe1602dea9285b4a599c45c',
         // aave v3
@@ -522,9 +522,9 @@ export const actionAddresses = {
         ChangeProxyOwner: '0x7b55d25BfF49Fd62563823570f47E9a35AA39541',
         PermitToken: '0x57c8ae94a5A11dA33e0518054102488b604628D0',
         HandleAuth: '0x18a90e6db79199ace00140631ef931e0bd97837c',
-        ToggleSub: '0x5F16C0a08d52b67fc73706c494F7535Dd3382b58',
+        ToggleSub: '0x8879fF7E7B08cdE2e634F7Cd90219e66FB64F01D',
         CreateSub: '0xeE739937085A716477BCB5b01b0f74e1BE046645',
-        UpdateSub: '0x1601c6ABCDE6e6d8Ad96628AFe20d47908127Aea',
+        UpdateSub: '0xB3598798599d3A22EA667e5557C53c139653c673',
         MerklClaim: '0xa2c6cd875c52bf5c27516fae3b6ba9241790908a',
         TransferNFT: '0xe49c70c673c3ef9019fe9c875ed5ed3dc02f5613',
         GasFeeTakerL2: '0xAEe02caf404332c40Fd7FF8d5c25F91f7c1641d0',
@@ -681,7 +681,7 @@ export const actionAddresses = {
 };
 export const otherAddresses = {
     [NETWORKS.ethereum.chainId]: {
-        RecipeExecutor: '0xbc3Fc959FeF3F12a41738f406c02198cdeE7481F',
+        RecipeExecutor: '0x6e7dEde13E011Eee74E0c731A06c158377fc1Cae',
         DFSRegistry: '0x287778F121F134C66212FB16c9b53eC991D32f5b',
         DFSProxyRegistry: '0x0cCB1F91beb8590949880D2a61C26C11d6280319',
         ProxyRegistry: '0x4678f0a6958e4D2Bc4F1BAF7Bc52E8F3564f3fE4',
@@ -701,7 +701,7 @@ export const otherAddresses = {
         Empty: '0x0000000000000000000000000000000000000000',
     },
     [NETWORKS.optimism.chainId]: {
-        RecipeExecutor: '0xEC891E6b5A93F5f29241De6B234a4e77A5456A1C',
+        RecipeExecutor: '0x3296C0f3Ff67B00306e5Ce251CDfA1E0160F5742',
         DFSRegistry: '0xAf707Ee480204Ed6e2640B53cE86F680D28Afcbd',
         ProxyRegistry: '0x283Cc5C26e53D66ed2Ea252D986F094B37E6e895',
         SFProxyEntryPoint: '0x06299D4A07E8C6D7C1aEc14Ab2F46DF05Dd9588E',
@@ -712,7 +712,7 @@ export const otherAddresses = {
         UniswapV3PositionManager: '0xC36442b4a4522E871399CD717aBDD847Ab11FE88',
     },
     [NETWORKS.arbitrum.chainId]: {
-        RecipeExecutor: '0x667609f05DdC5E9Fb939eC376F07953403745cf3',
+        RecipeExecutor: '0x1674Df46e92A393d6B29139BF8C2d2885F40F7B2',
         DFSRegistry: '0xBF1CaC12DB60819Bfa71A328282ecbc1D40443aA',
         ProxyRegistry: '0x283Cc5C26e53D66ed2Ea252D986F094B37E6e895',
         SFProxyEntryPoint: '0x15D776C062bF292f8F70A81533E49adC7C06Cb69',
@@ -723,7 +723,7 @@ export const otherAddresses = {
         UniswapV3PositionManager: '0xC36442b4a4522E871399CD717aBDD847Ab11FE88',
     },
     [NETWORKS.base.chainId]: {
-        RecipeExecutor: '0xc91305DdE651c899EF8eE1D0C33E7dab1B5ABF0D',
+        RecipeExecutor: '0xB81865b724eF6DAc41DFf125E5445701924ea19D',
         DFSRegistry: '0x347FB634271F666353F23A3362f3935D96F97476',
         ProxyRegistry: '0x425fA97285965E01Cc5F951B62A51F6CDEA5cc0d',
         SFProxyEntryPoint: '0xab6e5cde983fF98Cdb0F61f5F99cb58D40D0c837',

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "@defisaver/sdk",
-  "version": "1.3.36",
+  "version": "1.3.37",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/src/index.js",
   "types": "./esm/src/index.d.ts",
   "scripts": {
     "test": "mocha 'test/**'",
+    "test:unit": "mocha 'test/**/*.js' --exclude test/DfsWeb3.js",
     "test-single": "mocha ./test/$npm_config_name.js",
     "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\"",
     "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
     "build:umd": "rm -rf umd && webpack --config=webpack.umd.js",
     "build": "npm run lint && npm run build:umd && npm run build:esm",
-    "documentMD": "npx typedoc --plugin typedoc-plugin-markdown --out docs/md",
-    "document": "npx typedoc --out docs/default",
     "lint": "eslint . --ext .ts --fix",
     "lint-check": "eslint .",
     "build-test": "npm run build && npm run test"
@@ -74,11 +73,8 @@
     "chai": "^4.2.0",
     "dotenv": "^10.0.0",
     "eslint": "^8.57.0",
-    "jsdoc-to-markdown": "^9.1.3",
     "mocha": "^11.8.0",
     "ts-node": "^10.9.1",
-    "typedoc": "^0.23.20",
-    "typedoc-plugin-markdown": "^3.13.6",
     "typescript": "^4.8.4",
     "webpack": "^5.91.0",
     "webpack-cli": "^4.10.0"

package/src/Action.ts

@@ -49,16 +49,25 @@ export class Action {
     return keccak256(this.name).substr(0, 10);
   }
 
+  #_getReturnValueReference(arg: unknown): number | undefined {
+    if (typeof arg !== 'string' || !/\$\d+/.test(arg)) return undefined;
+    const index = Number(arg.slice(1));
+    if (!/^\$\d+$/.test(arg) || !Number.isSafeInteger(index) || index < 1) {
+      throw new Error(`Invalid action return reference: ${arg}`);
+    }
+    return index;
+  }
+
   /**
    *
    */
   #_getArgumentMappingWithSlots(subSlots: Args) : Array<number> {
     return this.mappableArgs.map(arg => {
-      if (new RegExp(/\$\d+/).test(arg)) {
-        if (Array.isArray(arg)) throw TypeError('Input can\'t be mapped to arrays (tuples/structs). Specify `mappableArgs` array in constructor.');
-        // eslint-disable-next-line
-        return parseInt(arg.substr(1));
+      if (Array.isArray(arg) && /\$\d+/.test(arg.toString())) {
+        throw TypeError('Input can\'t be mapped to arrays (tuples/structs). Specify `mappableArgs` array in constructor.');
       }
+      const reference = this.#_getReturnValueReference(arg);
+      if (reference !== undefined) return reference;
 
       // Handle SubSlots placeholder values in strategies
       if (new RegExp(/&\w+/).test(arg)) {
@@ -77,11 +86,11 @@ export class Action {
    */
   _getArgumentMapping() : Args {
     return this.mappableArgs.map(arg => {
-      if (new RegExp(/\$\d+/).test(arg)) {
-        if (Array.isArray(arg)) throw TypeError('Input can\'t be mapped to arrays (tuples/structs). Specify `mappableArgs` array in constructor.');
-        // eslint-disable-next-line
-        return parseInt(arg.substr(1));
+      if (Array.isArray(arg) && /\$\d+/.test(arg.toString())) {
+        throw TypeError('Input can\'t be mapped to arrays (tuples/structs). Specify `mappableArgs` array in constructor.');
       }
+      const reference = this.#_getReturnValueReference(arg);
+      if (reference !== undefined) return reference;
       return 0;
     });
   }
@@ -136,7 +145,7 @@ export class Action {
     const paramTypeParsed = this._parseParamType(paramType, arg);
     if (Array.isArray(arg)) return arg.map((_arg, i) => this._replaceWithPlaceholders(_arg, paramTypeParsed[i]));
     if (typeof (paramType) === 'string') {
-      if (new RegExp(/\$\d+/).test(arg)) return this.#_getPlaceholderForType(paramType);
+      if (this.#_getReturnValueReference(arg) !== undefined) return this.#_getPlaceholderForType(paramType);
       if (new RegExp(/&\w+/).test(arg)) return this.#_getPlaceholderForType(paramType);
     }
     return arg;

package/src/ActionWithL2.ts

@@ -31,11 +31,13 @@ export class ActionWithL2 extends Action {
 
   numberToBytes2(number:number) {
     const hexNumber = number.toString(16);
+    if (!/^[0-9a-f]{1,4}$/i.test(hexNumber)) throw new RangeError('Value must fit in an unsigned 2-byte integer');
     return hexNumber.padStart(4, '0');
   }
 
   numberToBytes1(number:number) {
     const hexNumber = number.toString(16);
+    if (!/^[0-9a-f]{1,2}$/i.test(hexNumber)) throw new RangeError('Value must fit in an unsigned 1-byte integer');
     return hexNumber.padStart(2, '0');
   }
 

package/src/Recipe.ts

@@ -57,6 +57,7 @@ export class Recipe {
    *
    */
   #_encodeForCall(): Array<string | Array<any>> {
+    if (this.actions.length === 0) throw new Error('Cannot encode an empty recipe');
     const encoded = this.actions.map(action => action.encodeForRecipe());
     const transposed = encoded[0].map((_, colIndex) => encoded.map(row => row[colIndex]));
     const taskStruct = [
@@ -170,7 +171,9 @@ export class Recipe {
     for (const pairsPerAction of assetOwnerPairs) {
       for (const pair of pairsPerAction) {
         const isNft = !pair.asset;
-        if (!uniqueAssetOwnerPairs.find(_pair => _pair.owner === pair.owner && (isNft ? _pair.tokenId === pair.tokenId : _pair.asset === pair.asset))) {
+        if (!uniqueAssetOwnerPairs.find(_pair => _pair.owner === pair.owner && (isNft
+          ? 'nft' in _pair && _pair.nft === pair.nft && _pair.tokenId === pair.tokenId
+          : _pair.asset === pair.asset))) {
           if (isNft) {
             uniqueAssetOwnerPairs.push({
               owner: pair.owner!,

package/src/addresses.ts

@@ -15,8 +15,8 @@ export const actionAddresses = {
     TokenBalance: '0xa92B177950F1460119940436515FD857C24494BC',
     AutomationV2Unsub: '0xe35Fb12fE9796847751076aCf5ee7d124108612C',
     SendTokenAndUnwrap: '0x4155537e6933E59a62deb68f6ad93d237d07242a',
-    ToggleSub: '0x2120ad7b4eE1795C8B027c1592eCB918faAb163A',
-    UpdateSub: '0xF6Cb8f7e61a64075ec8FAC3f298745605E543233',
+    ToggleSub: '0xf247a8525E7486884E7227EB9a161507F0FF46A6',
+    UpdateSub: '0x919c472bFA4B50FcACF9849501344aFDde2E4675',
     TransferNFT: '0x861e893E1796F81248e75F06C0b09Abdc8fe2f6F',
     CreateSub: '0xEB13C96257667cF0A037305A46092bf7C70A61e1',
     ApproveToken: '0xA4161cED7A29F0a3424e464a4a2dBf75888c5BF9',
@@ -430,8 +430,8 @@ export const actionAddresses = {
     SubInputs: '0x60d00020f12dd202eAfDba84e8F69E165a84c64D',
     ApproveToken: '0x842a81d2cfe26d401CD63Cc14e9DEf275c197C1a',
     SendTokenAndUnwrap: '0xd4f69250cb4d1f083Dd372FEace391A16ABbfBDc',
-    ToggleSub: '0xfc19a12e35bb0b5e6a3d3017be9e9022a6486eee',
-    UpdateSub: '0xAe6ea1d13dF2bE60dC7933DB56067Cb89d6A2cDe',
+    ToggleSub: '0xA4Eaad8Fe80d1E47f2b95CED2bcFb648d5929735',
+    UpdateSub: '0xe2c7D66b40e00Dd14844Db8d02142f23D4Da7071',
     CreateSub: '0x2daED8030BFC87B3d27c02E2f044B9CF4841Ff3e',
     TokenBalance: '0xC6FF5b01f7c7b35b6e093fF70D2332B361C5Be5A',
     TokenizedVaultAdapter: '0xdf31669FEd440f5BfF658ca0bBF0D22B8abdeb73',
@@ -500,14 +500,14 @@ export const actionAddresses = {
     SubInputs: '0x8ec14f9568e1d7cf73b68df899808abd7fe6fc8d',
     SendTokenAndUnwrap: '0x009C5B1c7C844Bd662Da3991295b1B3Bd71a430c',
     ApproveToken: '0x01058999F5Ac434EF48DFB5Cd942c57A7661787B',
-    ToggleSub: '0x2eabbab99759c2ab6e9e309d42ee07d3bc7c38fe',
+    ToggleSub: '0x75469d8f96368F87718162e528104B59550CD71E',
     CreateSub: '0xbFD17a0a844b75976585a382a5BcCaFC9EAd731f',
     TokenBalance: '0x483B903E702F60698Dd8124558C6199922737f1F',
     TokenizedVaultAdapter: '0xD05C512bDFf6D3eAc5328807B3bC075F35271167',
     ChangeProxyOwner: '0xacf5bAD9543A98EcAcC620cF6CB989Ec88f1650D',
     PermitToken: '0x2E5E7a691092C158bb8341b936eF24FCcA6c0e00',
     HandleAuth: '0xbfcab1339e1a56a0a836cbca6457eaf71f148fcb',
-    UpdateSub: '0x3511f444362F8cBd185DbF21C9488D16c1306461',
+    UpdateSub: '0x404c3EE602fb4b2D3E36E371bEA36a27B2177107',
     TransferNFT: '0xf73b14cf4bc10509446fc4111407a721f8a81f7d',
     MerklClaim: '0xdab7b1865efa8d1f8fe1602dea9285b4a599c45c',
 
@@ -619,9 +619,9 @@ export const actionAddresses = {
     ChangeProxyOwner: '0x7b55d25BfF49Fd62563823570f47E9a35AA39541',
     PermitToken: '0x57c8ae94a5A11dA33e0518054102488b604628D0',
     HandleAuth: '0x18a90e6db79199ace00140631ef931e0bd97837c',
-    ToggleSub: '0x5F16C0a08d52b67fc73706c494F7535Dd3382b58',
+    ToggleSub: '0x8879fF7E7B08cdE2e634F7Cd90219e66FB64F01D',
     CreateSub: '0xeE739937085A716477BCB5b01b0f74e1BE046645',
-    UpdateSub: '0x1601c6ABCDE6e6d8Ad96628AFe20d47908127Aea',
+    UpdateSub: '0xB3598798599d3A22EA667e5557C53c139653c673',
     MerklClaim: '0xa2c6cd875c52bf5c27516fae3b6ba9241790908a',
     TransferNFT: '0xe49c70c673c3ef9019fe9c875ed5ed3dc02f5613',
 
@@ -798,7 +798,7 @@ export const actionAddresses = {
 
 export const otherAddresses = {
   [NETWORKS.ethereum.chainId]: {
-    RecipeExecutor: '0xbc3Fc959FeF3F12a41738f406c02198cdeE7481F',
+    RecipeExecutor: '0x6e7dEde13E011Eee74E0c731A06c158377fc1Cae',
     DFSRegistry: '0x287778F121F134C66212FB16c9b53eC991D32f5b',
     DFSProxyRegistry: '0x0cCB1F91beb8590949880D2a61C26C11d6280319',
     ProxyRegistry: '0x4678f0a6958e4D2Bc4F1BAF7Bc52E8F3564f3fE4',
@@ -820,7 +820,7 @@ export const otherAddresses = {
     Empty: '0x0000000000000000000000000000000000000000',
   },
   [NETWORKS.optimism.chainId]: {
-    RecipeExecutor: '0xEC891E6b5A93F5f29241De6B234a4e77A5456A1C',
+    RecipeExecutor: '0x3296C0f3Ff67B00306e5Ce251CDfA1E0160F5742',
     DFSRegistry: '0xAf707Ee480204Ed6e2640B53cE86F680D28Afcbd',
     ProxyRegistry: '0x283Cc5C26e53D66ed2Ea252D986F094B37E6e895',
     SFProxyEntryPoint: '0x06299D4A07E8C6D7C1aEc14Ab2F46DF05Dd9588E',
@@ -833,7 +833,7 @@ export const otherAddresses = {
     UniswapV3PositionManager: '0xC36442b4a4522E871399CD717aBDD847Ab11FE88',
   },
   [NETWORKS.arbitrum.chainId]: {
-    RecipeExecutor: '0x667609f05DdC5E9Fb939eC376F07953403745cf3',
+    RecipeExecutor: '0x1674Df46e92A393d6B29139BF8C2d2885F40F7B2',
     DFSRegistry: '0xBF1CaC12DB60819Bfa71A328282ecbc1D40443aA',
     ProxyRegistry: '0x283Cc5C26e53D66ed2Ea252D986F094B37E6e895',
     SFProxyEntryPoint: '0x15D776C062bF292f8F70A81533E49adC7C06Cb69',
@@ -846,7 +846,7 @@ export const otherAddresses = {
     UniswapV3PositionManager: '0xC36442b4a4522E871399CD717aBDD847Ab11FE88',
   },
   [NETWORKS.base.chainId]: {
-    RecipeExecutor: '0xc91305DdE651c899EF8eE1D0C33E7dab1B5ABF0D',
+    RecipeExecutor: '0xB81865b724eF6DAc41DFf125E5445701924ea19D',
     DFSRegistry: '0x347FB634271F666353F23A3362f3935D96F97476',
     ProxyRegistry: '0x425fA97285965E01Cc5F951B62A51F6CDEA5cc0d',
     SFProxyEntryPoint: '0xab6e5cde983fF98Cdb0F61f5F99cb58D40D0c837',

package/test/Action.js

@@ -39,7 +39,8 @@ describe('Action', () => {
     let action;
     it('Constructor', () => {
       action = new dfs.Action('MockSwap', '0x0a80C3C540eEF99811f4579fa7b1A0617294e06f', ['uint256', 'address'], ['$1', '0x6b175474e89094c44da98b954eedeac495271d0f']);
-      action.mappableArgs = [action.args[0][0], action.args[0][1]];
+      action.mappableArgs = [action.args[0], action.args[1]];
+      assert.deepEqual(action.encodeForRecipe()[3], [1, 0]);
     })
     it('encodeForDsProxyCall', () => encodeForDsProxyCall(action));
     it('encodeForRecipe', () => encodeForRecipe(action));
@@ -55,8 +56,87 @@ describe('Action', () => {
       assert.throws(() => encodeForRecipe(action));
     });
     it('encodeForRecipe with custom mappableArgs', () => {
-      action.mappableArgs = [action.args[0][0][0], action.args[0][1]];
-      encodeForRecipe(action)
+      action.mappableArgs = [action.args[0][0], action.args[1]];
+      assert.deepEqual(action.encodeForRecipe()[3], [1, 0]);
     });
   })
 })
+
+
+describe('Action encoding', () => {
+  const AbiCoder = require('web3-eth-abi');
+  const target = '0x0000000000000000000000000000000000000001';
+  const recipient = '0x0000000000000000000000000000000000000002';
+  const zeroWord = '0'.repeat(64);
+
+  it('encodes the target, selector, arguments, ID and unmapped inputs', () => {
+    const action = new dfs.Action('MockSwap', target, ['uint256', 'address'], ['5', recipient]);
+    // Static ABI tuple: one word for the amount, one for the address.
+    const payload = `0x${'5'.padStart(64, '0')}${'2'.padStart(64, '0')}`;
+    assert.deepEqual(action.encodeForRecipe(), [payload, `0x${zeroWord}`, '0xe45f86c0', [0, 0]]);
+    const [address, data] = action.encodeForDsProxyCall();
+    assert.equal(address, target);
+    assert.equal(data.slice(0, 10), '0x389f87ff'); // executeActionDirect(bytes)
+    assert.equal(AbiCoder.decodeParameter('bytes', `0x${data.slice(10)}`), payload);
+  });
+
+  it('replaces mapped inputs with zeros without changing the original arguments', () => {
+    const args = ['$2', recipient];
+    const action = new dfs.Action('MockSwap', target, ['uint256', 'address'], args);
+    const [payload, , , mapping] = action.encodeForRecipe();
+    assert.equal(payload, `0x${zeroWord}${'2'.padStart(64, '0')}`);
+    assert.deepEqual(mapping, [2, 0]);
+    assert.deepEqual(args, ['$2', recipient]);
+  });
+
+  it('preserves nested tuple and array values around mapped inputs', () => {
+    const args = [['7', ['$1', recipient]], ['11', '13']];
+    const action = new dfs.Action('MockSwap', target,
+      [['uint256', ['uint256', 'address']], 'uint256[]'], args);
+    action.mappableArgs = [args[0][1][0], args[0][1][1]];
+    const [payload, , , mapping] = action.encodeForRecipe();
+    const decoded = AbiCoder.decodeParameter('((uint256,(uint256,address)),uint256[])', payload);
+    assert.equal(decoded[0][0], '7');
+    assert.equal(decoded[0][1][0], '0');
+    assert.equal(decoded[0][1][1], recipient);
+    assert.deepEqual(decoded[1], ['11', '13']);
+    assert.deepEqual(mapping, [1, 0]);
+    assert.equal(args[0][1][0], '$1');
+  });
+
+  it('maps strategy slots and special wallet references', () => {
+    const action = new dfs.Action('MockSwap', target,
+      ['uint256', 'uint256', 'address', 'address', 'uint256'],
+      ['$1', '&amount', '&proxy', '&eoa', '9']);
+    assert.deepEqual(action.encodeForStrategy({ '&amount': { index: 128 } }),
+      ['0xe45f86c0', [1, 128, 254, 255, 0]]);
+  });
+
+  it('rejects mismatched argument counts', () => {
+    assert.throws(() => new dfs.Action('MockSwap', target, ['uint256'], []),
+      'Parameters/arguments length mismatch');
+  });
+});
+
+
+describe('Action reference validation', () => {
+  const target = '0x0000000000000000000000000000000000000001';
+
+  for (const reference of ['$0', '$1junk', 'prefix$1', '$1.5', '$9007199254740992']) {
+    it(`rejects malformed reference ${reference} in every encoding path`, () => {
+      const action = new dfs.Action('MockSwap', target, ['uint256'], [reference]);
+      for (const encode of [
+        () => action.encodeForDsProxyCall(),
+        () => action.encodeForRecipe(),
+        () => action.encodeForStrategy({}),
+      ]) {
+        assert.throws(encode, `Invalid action return reference: ${reference}`);
+      }
+    });
+  }
+
+  it('preserves existing leading-zero references and ordinary strings', () => {
+    const action = new dfs.Action('MockSwap', target, ['uint256', 'string'], ['$01', '$price']);
+    assert.deepEqual(action.encodeForRecipe()[3], [1, 0]);
+  });
+});