@uniswap/universal-router-sdk 4.3.2 → 4.4.1

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { SwapRouter, MigrateV3ToV4Options } from './swapRouter';
 export * from './entities';
 export * from './utils/routerTradeAdapter';
-export { RoutePlanner, CommandType } from './utils/routerCommands';
+export { RoutePlanner, CommandType, COMMAND_DEFINITION, CommandDefinition, Parser, Subparser, ParamType, } from './utils/routerCommands';
 export { UNIVERSAL_ROUTER_CREATION_BLOCK, UNIVERSAL_ROUTER_ADDRESS, ROUTER_AS_RECIPIENT, WETH_ADDRESS, UniversalRouterVersion, } from './utils/constants';
-export { CommandParser, UniversalRouterCommand, UniversalRouterCall, Param } from './utils/commandParser';
+export { CommandParser, UniversalRouterCommand, UniversalRouterCall, Param, CommandsDefinition, } from './utils/commandParser';

package/dist/universal-router-sdk.cjs.development.js

@@ -102,17 +102,15 @@ var _COMMAND_DEFINITION;
   CommandType[CommandType["V4_POSITION_CALL"] = 19] = "V4_POSITION_CALL";
   CommandType[CommandType["EXECUTE_SUB_PLAN"] = 33] = "EXECUTE_SUB_PLAN";
 })(exports.CommandType || (exports.CommandType = {}));
-var Subparser;
 (function (Subparser) {
   Subparser[Subparser["V3PathExactIn"] = 0] = "V3PathExactIn";
   Subparser[Subparser["V3PathExactOut"] = 1] = "V3PathExactOut";
-})(Subparser || (Subparser = {}));
-var Parser;
+})(exports.Subparser || (exports.Subparser = {}));
 (function (Parser) {
   Parser[Parser["Abi"] = 0] = "Abi";
   Parser[Parser["V4Actions"] = 1] = "V4Actions";
   Parser[Parser["V3Actions"] = 2] = "V3Actions";
-})(Parser || (Parser = {}));
+})(exports.Parser || (exports.Parser = {}));
 var ALLOW_REVERT_FLAG = 0x80;
 var REVERTIBLE_COMMANDS = /*#__PURE__*/new Set([exports.CommandType.EXECUTE_SUB_PLAN]);
 var PERMIT_STRUCT = '((address token,uint160 amount,uint48 expiration,uint48 nonce) details,address spender,uint256 sigDeadline)';
@@ -120,7 +118,7 @@ var PERMIT_BATCH_STRUCT = '((address token,uint160 amount,uint48 expiration,uint
 var PERMIT2_TRANSFER_FROM_STRUCT = '(address from,address to,uint160 amount,address token)';
 var PERMIT2_TRANSFER_FROM_BATCH_STRUCT = PERMIT2_TRANSFER_FROM_STRUCT + '[]';
 var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.CommandType.EXECUTE_SUB_PLAN] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'commands',
     type: 'bytes'
@@ -129,7 +127,7 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'bytes[]'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.PERMIT2_PERMIT] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'permit',
     type: PERMIT_STRUCT
@@ -138,7 +136,7 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'bytes'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.PERMIT2_PERMIT_BATCH] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'permit',
     type: PERMIT_BATCH_STRUCT
@@ -147,7 +145,7 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'bytes'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.PERMIT2_TRANSFER_FROM] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'token',
     type: 'address'
@@ -159,13 +157,13 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'uint160'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.PERMIT2_TRANSFER_FROM_BATCH] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'transferFrom',
     type: PERMIT2_TRANSFER_FROM_BATCH_STRUCT
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.V3_SWAP_EXACT_IN] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'recipient',
     type: 'address'
@@ -177,14 +175,14 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'uint256'
   }, {
     name: 'path',
-    subparser: Subparser.V3PathExactIn,
+    subparser: exports.Subparser.V3PathExactIn,
     type: 'bytes'
   }, {
     name: 'payerIsUser',
     type: 'bool'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.V3_SWAP_EXACT_OUT] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'recipient',
     type: 'address'
@@ -196,14 +194,14 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'uint256'
   }, {
     name: 'path',
-    subparser: Subparser.V3PathExactOut,
+    subparser: exports.Subparser.V3PathExactOut,
     type: 'bytes'
   }, {
     name: 'payerIsUser',
     type: 'bool'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.V2_SWAP_EXACT_IN] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'recipient',
     type: 'address'
@@ -221,7 +219,7 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'bool'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.V2_SWAP_EXACT_OUT] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'recipient',
     type: 'address'
@@ -239,9 +237,9 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'bool'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.V4_SWAP] = {
-  parser: Parser.V4Actions
+  parser: exports.Parser.V4Actions
 }, _COMMAND_DEFINITION[exports.CommandType.WRAP_ETH] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'recipient',
     type: 'address'
@@ -250,7 +248,7 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'uint256'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.UNWRAP_WETH] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'recipient',
     type: 'address'
@@ -259,7 +257,7 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'uint256'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.SWEEP] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'token',
     type: 'address'
@@ -271,7 +269,7 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'uint256'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.TRANSFER] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'token',
     type: 'address'
@@ -283,7 +281,7 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'uint256'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.PAY_PORTION] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'token',
     type: 'address'
@@ -295,7 +293,7 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'uint256'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.BALANCE_CHECK_ERC20] = {
-  parser: Parser.Abi,
+  parser: exports.Parser.Abi,
   params: [{
     name: 'owner',
     type: 'address'
@@ -307,11 +305,11 @@ var COMMAND_DEFINITION = (_COMMAND_DEFINITION = {}, _COMMAND_DEFINITION[exports.
     type: 'uint256'
   }]
 }, _COMMAND_DEFINITION[exports.CommandType.V3_POSITION_MANAGER_PERMIT] = {
-  parser: Parser.V3Actions
+  parser: exports.Parser.V3Actions
 }, _COMMAND_DEFINITION[exports.CommandType.V3_POSITION_MANAGER_CALL] = {
-  parser: Parser.V3Actions
+  parser: exports.Parser.V3Actions
 }, _COMMAND_DEFINITION[exports.CommandType.V4_POSITION_CALL] = {
-  parser: Parser.V4Actions
+  parser: exports.Parser.V4Actions
 }, _COMMAND_DEFINITION);
 var RoutePlanner = /*#__PURE__*/function () {
   function RoutePlanner() {
@@ -343,7 +341,7 @@ var RoutePlanner = /*#__PURE__*/function () {
 function createCommand(type, parameters) {
   var commandDef = COMMAND_DEFINITION[type];
   switch (commandDef.parser) {
-    case Parser.Abi:
+    case exports.Parser.Abi:
       var encodedInput = utils.defaultAbiCoder.encode(commandDef.params.map(function (abi) {
         return abi.type;
       }), parameters);
@@ -351,13 +349,13 @@ function createCommand(type, parameters) {
         type: type,
         encodedInput: encodedInput
       };
-    case Parser.V4Actions:
+    case exports.Parser.V4Actions:
       // v4 swap data comes pre-encoded at index 0
       return {
         type: type,
         encodedInput: parameters[0]
       };
-    case Parser.V3Actions:
+    case exports.Parser.V3Actions:
       // v4 swap data comes pre-encoded at index 0
       return {
         type: type,
@@ -366,6 +364,27 @@ function createCommand(type, parameters) {
   }
 }
 
+function getPathCurrency(currency, pool) {
+  // return currency if the currency matches a currency of the pool
+  if (pool.involvesToken(currency)) {
+    return currency;
+    // return if currency.wrapped if pool involves wrapped currency
+  } else if (pool.involvesToken(currency.wrapped)) {
+    return currency.wrapped;
+    // return native currency if pool involves native version of wrapped currency (only applies to V4)
+  } else if (pool instanceof v4Sdk.Pool) {
+    if (pool.token0.wrapped.equals(currency)) {
+      return pool.token0;
+    } else if (pool.token1.wrapped.equals(currency)) {
+      return pool.token1;
+    }
+    // otherwise the token is invalid
+  } else {
+    throw new Error("Expected currency " + currency.symbol + " to be either " + pool.token0.symbol + " or " + pool.token1.symbol);
+  }
+  return currency; // this line needed for typescript to compile
+}
+
 (function (RouterActionType) {
   RouterActionType["UniswapTrade"] = "UniswapTrade";
   RouterActionType["UnwrapWETH"] = "UnwrapWETH";
@@ -619,7 +638,7 @@ var UniswapTrade = /*#__PURE__*/function () {
           addV3Swap(planner, swap, this.trade.tradeType, this.options, this.payerIsUser, routerMustCustody);
           break;
         case routerSdk.Protocol.V4:
-          addV4Swap(planner, swap, this.trade.tradeType, this.options, this.payerIsUser, routerMustCustody, performAggregatedSlippageCheck);
+          addV4Swap(planner, swap, this.trade.tradeType, this.options, this.payerIsUser, routerMustCustody);
           break;
         case routerSdk.Protocol.MIXED:
           addMixedSwap(planner, swap, this.trade.tradeType, this.options, this.payerIsUser, routerMustCustody);
@@ -741,7 +760,7 @@ function addV3Swap(planner, _ref2, tradeType, options, payerIsUser, routerMustCu
     planner.addCommand(exports.CommandType.V3_SWAP_EXACT_OUT, [routerMustCustody ? ROUTER_AS_RECIPIENT : options.recipient, trade.minimumAmountOut(options.slippageTolerance).quotient.toString(), trade.maximumAmountIn(options.slippageTolerance).quotient.toString(), path, payerIsUser]);
   }
 }
-function addV4Swap(planner, _ref3, tradeType, options, payerIsUser, routerMustCustody, performAggregatedSlippageCheck) {
+function addV4Swap(planner, _ref3, tradeType, options, payerIsUser, routerMustCustody) {
   var _options$recipient;
   var route = _ref3.route,
     inputAmount = _ref3.inputAmount,
@@ -752,7 +771,7 @@ function addV4Swap(planner, _ref3, tradeType, options, payerIsUser, routerMustCu
     outputAmount: outputAmount,
     tradeType: tradeType
   });
-  var slippageToleranceOnSwap = performAggregatedSlippageCheck ? undefined : options.slippageTolerance;
+  var slippageToleranceOnSwap = routerMustCustody && tradeType == sdkCore.TradeType.EXACT_INPUT ? undefined : options.slippageTolerance;
   var inputWethFromRouter = inputAmount.currency.isNative && !route.input.isNative;
   if (inputWethFromRouter && !payerIsUser) throw new Error('Inconsistent payer');
   var v4Planner = new v4Sdk.V4Planner();
@@ -764,13 +783,16 @@ function addV4Swap(planner, _ref3, tradeType, options, payerIsUser, routerMustCu
 }
 // encode a mixed route swap, i.e. including both v2 and v3 pools
 function addMixedSwap(planner, swap, tradeType, options, payerIsUser, routerMustCustody) {
-  var route = swap.route,
-    inputAmount = swap.inputAmount,
-    outputAmount = swap.outputAmount;
-  var tradeRecipient = routerMustCustody ? ROUTER_AS_RECIPIENT : options.recipient;
-  // single hop, so it can be reduced to plain v2 or v3 swap logic
+  var _options$recipient2;
+  var route = swap.route;
+  var inputAmount = swap.inputAmount;
+  var outputAmount = swap.outputAmount;
+  var tradeRecipient = routerMustCustody ? ROUTER_AS_RECIPIENT : (_options$recipient2 = options.recipient) != null ? _options$recipient2 : SENDER_AS_RECIPIENT;
+  // single hop, so it can be reduced to plain swap logic for one protocol version
   if (route.pools.length === 1) {
-    if (route.pools[0] instanceof v3Sdk.Pool) {
+    if (route.pools[0] instanceof v4Sdk.Pool) {
+      return addV4Swap(planner, swap, tradeType, options, payerIsUser, routerMustCustody);
+    } else if (route.pools[0] instanceof v3Sdk.Pool) {
       return addV3Swap(planner, swap, tradeType, options, payerIsUser, routerMustCustody);
     } else if (route.pools[0] instanceof v2Sdk.Pair) {
       return addV2Swap(planner, swap, tradeType, options, payerIsUser, routerMustCustody);
@@ -792,32 +814,53 @@ function addMixedSwap(planner, swap, tradeType, options, payerIsUser, routerMust
   var isLastSectionInRoute = function isLastSectionInRoute(i) {
     return i === sections.length - 1;
   };
-  var outputToken;
-  var inputToken = route.input.wrapped;
+  var inputToken = route.pathInput;
   for (var i = 0; i < sections.length; i++) {
     var section = sections[i];
-    /// Now, we get output of this section
-    outputToken = routerSdk.getOutputOfPools(section, inputToken);
-    var newRouteOriginal = new routerSdk.MixedRouteSDK([].concat(section), section[0].token0.equals(inputToken) ? section[0].token0 : section[0].token1, outputToken);
-    var newRoute = new routerSdk.MixedRoute(newRouteOriginal);
-    /// Previous output is now input
-    inputToken = outputToken.wrapped;
-    var mixedRouteIsAllV3 = function mixedRouteIsAllV3(route) {
-      return route.pools.every(function (pool) {
-        return pool instanceof v3Sdk.Pool;
-      });
-    };
-    if (mixedRouteIsAllV3(newRoute)) {
-      var path = routerSdk.encodeMixedRouteToPath(newRoute);
-      planner.addCommand(exports.CommandType.V3_SWAP_EXACT_IN, [
-      // if not last section: send tokens directly to the first v2 pair of the next section
-      // note: because of the partitioning function we can be sure that the next section is v2
-      isLastSectionInRoute(i) ? tradeRecipient : sections[i + 1][0].liquidityToken.address, i == 0 ? amountIn : CONTRACT_BALANCE, !isLastSectionInRoute(i) ? 0 : amountOut, path, payerIsUser && i === 0]);
+    var routePool = section[0];
+    var outputToken = routerSdk.getOutputOfPools(section, inputToken);
+    var subRoute = new routerSdk.MixedRoute(new routerSdk.MixedRouteSDK([].concat(section), inputToken, outputToken));
+    var nextInputToken = void 0;
+    var swapRecipient = void 0;
+    if (isLastSectionInRoute(i)) {
+      nextInputToken = outputToken;
+      swapRecipient = tradeRecipient;
     } else {
-      planner.addCommand(exports.CommandType.V2_SWAP_EXACT_IN, [isLastSectionInRoute(i) ? tradeRecipient : ROUTER_AS_RECIPIENT, i === 0 ? amountIn : CONTRACT_BALANCE, !isLastSectionInRoute(i) ? 0 : amountOut, newRoute.path.map(function (token) {
+      var nextPool = sections[i + 1][0];
+      nextInputToken = getPathCurrency(outputToken, nextPool);
+      var v2PoolIsSwapRecipient = nextPool instanceof v2Sdk.Pair && outputToken.equals(nextInputToken);
+      swapRecipient = v2PoolIsSwapRecipient ? nextPool.liquidityToken.address : ROUTER_AS_RECIPIENT;
+    }
+    if (routePool instanceof v4Sdk.Pool) {
+      var v4Planner = new v4Sdk.V4Planner();
+      var v4SubRoute = new v4Sdk.Route(section, subRoute.input, subRoute.output);
+      v4Planner.addSettle(inputToken, payerIsUser && i === 0, i == 0 ? amountIn : CONTRACT_BALANCE);
+      v4Planner.addAction(v4Sdk.Actions.SWAP_EXACT_IN, [{
+        currencyIn: inputToken.isNative ? ETH_ADDRESS : inputToken.address,
+        path: v4Sdk.encodeRouteToPath(v4SubRoute),
+        amountIn: 0,
+        amountOutMinimum: !isLastSectionInRoute(i) ? 0 : amountOut
+      }]);
+      v4Planner.addTake(outputToken, swapRecipient);
+      planner.addCommand(exports.CommandType.V4_SWAP, [v4Planner.finalize()]);
+    } else if (routePool instanceof v3Sdk.Pool) {
+      planner.addCommand(exports.CommandType.V3_SWAP_EXACT_IN, [swapRecipient, i == 0 ? amountIn : CONTRACT_BALANCE, !isLastSectionInRoute(i) ? 0 : amountOut, routerSdk.encodeMixedRouteToPath(subRoute), payerIsUser && i === 0]);
+    } else if (routePool instanceof v2Sdk.Pair) {
+      planner.addCommand(exports.CommandType.V2_SWAP_EXACT_IN, [swapRecipient, i === 0 ? amountIn : CONTRACT_BALANCE, !isLastSectionInRoute(i) ? 0 : amountOut, subRoute.path.map(function (token) {
         return token.wrapped.address;
       }), payerIsUser && i === 0]);
+    } else {
+      throw new Error('Unexpected Pool Type');
+    }
+    // perform a token transition (wrap/unwrap if necessary)
+    if (!isLastSectionInRoute(i)) {
+      if (outputToken.isNative && !nextInputToken.isNative) {
+        planner.addCommand(exports.CommandType.WRAP_ETH, [ROUTER_AS_RECIPIENT, CONTRACT_BALANCE]);
+      } else if (!outputToken.isNative && nextInputToken.isNative) {
+        planner.addCommand(exports.CommandType.UNWRAP_WETH, [ROUTER_AS_RECIPIENT, 0]);
+      }
     }
+    inputToken = nextInputToken;
   }
 }
 // if price impact is very high, there's a chance of hitting max/min prices resulting in a partial fill of the swap
@@ -974,6 +1017,7 @@ var UnwrapWETH = /*#__PURE__*/function () {
 (function (PoolType) {
   PoolType["V2Pool"] = "v2-pool";
   PoolType["V3Pool"] = "v3-pool";
+  PoolType["V4Pool"] = "v4-pool";
 })(exports.PoolType || (exports.PoolType = {}));
 var isNativeCurrency = function isNativeCurrency(address) {
   return address.toLowerCase() === ETH_ADDRESS.toLowerCase() || address.toLowerCase() === E_ETH_ADDRESS.toLowerCase();
@@ -1090,21 +1134,35 @@ RouterTradeAdapter.toPair = function (_ref2) {
   return new v2Sdk.Pair(sdkCore.CurrencyAmount.fromRawAmount(RouterTradeAdapter.toToken(reserve0.token), reserve0.quotient), sdkCore.CurrencyAmount.fromRawAmount(RouterTradeAdapter.toToken(reserve1.token), reserve1.quotient));
 };
 
-// Parses UniversalRouter commands
+// Parses UniversalRouter V2 commands
 var CommandParser = /*#__PURE__*/function () {
   function CommandParser() {}
   CommandParser.parseCalldata = function parseCalldata(calldata) {
+    var genericParser = new GenericCommandParser(COMMAND_DEFINITION);
     var txDescription = CommandParser.INTERFACE.parseTransaction({
       data: calldata
     });
     var _txDescription$args = txDescription.args,
       commands = _txDescription$args.commands,
       inputs = _txDescription$args.inputs;
-    var commandTypes = CommandParser.getCommands(commands);
+    return genericParser.parse(commands, inputs);
+  };
+  return CommandParser;
+}();
+CommandParser.INTERFACE = /*#__PURE__*/new abi.Interface(UniversalRouter_json.abi);
+// Parses commands based on given command definition
+var GenericCommandParser = /*#__PURE__*/function () {
+  function GenericCommandParser(commandDefinition) {
+    this.commandDefinition = commandDefinition;
+  }
+  var _proto = GenericCommandParser.prototype;
+  _proto.parse = function parse(commands, inputs) {
+    var _this = this;
+    var commandTypes = GenericCommandParser.getCommands(commands);
     return {
       commands: commandTypes.map(function (commandType, i) {
-        var commandDef = COMMAND_DEFINITION[commandType];
-        if (commandDef.parser === Parser.V4Actions) {
+        var commandDef = _this.commandDefinition[commandType];
+        if (commandDef.parser === exports.Parser.V4Actions) {
           var _V4BaseActionsParser$ = v4Sdk.V4BaseActionsParser.parseCalldata(inputs[i]),
             actions = _V4BaseActionsParser$.actions;
           return {
@@ -1112,19 +1170,19 @@ var CommandParser = /*#__PURE__*/function () {
             commandType: commandType,
             params: v4RouterCallToParams(actions)
           };
-        } else if (commandDef.parser === Parser.Abi) {
+        } else if (commandDef.parser === exports.Parser.Abi) {
           var abiDef = commandDef.params;
           var rawParams = ethers.ethers.utils.defaultAbiCoder.decode(abiDef.map(function (command) {
             return command.type;
           }), inputs[i]);
           var params = rawParams.map(function (param, j) {
             switch (abiDef[j].subparser) {
-              case Subparser.V3PathExactIn:
+              case exports.Subparser.V3PathExactIn:
                 return {
                   name: abiDef[j].name,
                   value: parseV3PathExactIn(param)
                 };
-              case Subparser.V3PathExactOut:
+              case exports.Subparser.V3PathExactOut:
                 return {
                   name: abiDef[j].name,
                   value: parseV3PathExactOut(param)
@@ -1141,12 +1199,17 @@ var CommandParser = /*#__PURE__*/function () {
             commandType: commandType,
             params: params
           };
-        } else if (commandDef.parser === Parser.V3Actions) {
+        } else if (commandDef.parser === exports.Parser.V3Actions) {
           // TODO: implement better parsing here
           return {
             commandName: exports.CommandType[commandType],
             commandType: commandType,
-            params: inputs
+            params: inputs.map(function (input) {
+              return {
+                name: 'command',
+                value: input
+              };
+            })
           };
         } else {
           throw new Error("Unsupported parser: " + commandDef);
@@ -1156,7 +1219,7 @@ var CommandParser = /*#__PURE__*/function () {
   }
   // parse command types from bytes string
   ;
-  CommandParser.getCommands = function getCommands(commands) {
+  GenericCommandParser.getCommands = function getCommands(commands) {
     var commandTypes = [];
     for (var i = 2; i < commands.length; i += 2) {
       var _byte = commands.substring(i, i + 2);
@@ -1164,9 +1227,8 @@ var CommandParser = /*#__PURE__*/function () {
     }
     return commandTypes;
   };
-  return CommandParser;
+  return GenericCommandParser;
 }();
-CommandParser.INTERFACE = /*#__PURE__*/new abi.Interface(UniversalRouter_json.abi);
 function parseV3PathExactIn(path) {
   var strippedPath = path.replace('0x', '');
   var tokenIn = ethers.ethers.utils.getAddress(strippedPath.substring(0, 40));
@@ -1219,6 +1281,7 @@ function v4RouterCallToParams(actions) {
   });
 }
 
+exports.COMMAND_DEFINITION = COMMAND_DEFINITION;
 exports.CommandParser = CommandParser;
 exports.ROUTER_AS_RECIPIENT = ROUTER_AS_RECIPIENT;
 exports.RoutePlanner = RoutePlanner;