@uniswap/universal-router-sdk 4.3.1 → 4.4.0

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,
@@ -552,11 +550,11 @@ var CHAIN_CONFIGS = (_CHAIN_CONFIGS = {}, _CHAIN_CONFIGS[1] = {
 }, _CHAIN_CONFIGS[1301] = {
   weth: '0x4200000000000000000000000000000000000006',
   routerConfigs: (_routerConfigs20 = {}, _routerConfigs20[exports.UniversalRouterVersion.V1_2] = {
-    address: '0x16D4F26C15f3658ec65B1126ff27DD3dF2a2996b',
-    creationBlock: 618210
+    address: '0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6',
+    creationBlock: 1241811
   }, _routerConfigs20[exports.UniversalRouterVersion.V2_0] = {
-    address: '0x16D4F26C15f3658ec65B1126ff27DD3dF2a2996b',
-    creationBlock: 618210
+    address: '0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6',
+    creationBlock: 1241811
   }, _routerConfigs20)
 }, _CHAIN_CONFIGS);
 var UNIVERSAL_ROUTER_ADDRESS = function UNIVERSAL_ROUTER_ADDRESS(version, chainId) {
@@ -1090,21 +1088,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 +1124,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 +1153,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 +1173,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 +1181,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 +1235,7 @@ function v4RouterCallToParams(actions) {
   });
 }
 
+exports.COMMAND_DEFINITION = COMMAND_DEFINITION;
 exports.CommandParser = CommandParser;
 exports.ROUTER_AS_RECIPIENT = ROUTER_AS_RECIPIENT;
 exports.RoutePlanner = RoutePlanner;