@uniswap/universal-router-sdk 1.4.3 → 1.5.0-beta.0

package/dist/entities/NFTTrade.d.ts

@@ -9,7 +9,8 @@ import { LooksRareData } from './protocols/looksRare';
 import { SudoswapData } from './protocols/sudoswap';
 import { CryptopunkData } from './protocols/cryptopunk';
 import { X2Y2Data } from './protocols/x2y2';
-export declare type SupportedProtocolsData = SeaportData | FoundationData | NFTXData | LooksRareData | X2Y2Data | CryptopunkData | NFT20Data | SudoswapData;
+import { ElementData } from './protocols/element-market';
+export declare type SupportedProtocolsData = SeaportData | FoundationData | NFTXData | LooksRareData | X2Y2Data | CryptopunkData | NFT20Data | SudoswapData | ElementData;
 export declare abstract class NFTTrade<T> implements Command {
     readonly tradeType: RouterTradeType;
     readonly orders: T[];
@@ -17,7 +18,7 @@ export declare abstract class NFTTrade<T> implements Command {
     constructor(market: Market, orders: T[]);
     abstract encode(planner: RoutePlanner, config: TradeConfig): void;
     abstract getBuyItems(): BuyItem[];
-    abstract getTotalPrice(): BigNumber;
+    abstract getTotalPrice(token?: string): BigNumber;
 }
 export declare type BuyItem = {
     tokenAddress: string;
@@ -33,7 +34,8 @@ export declare enum Market {
     Seaport = "seaport",
     Sudoswap = "Sudoswap",
     Cryptopunks = "cryptopunks",
-    X2Y2 = "x2y2"
+    X2Y2 = "x2y2",
+    Element = "element"
 }
 export declare enum TokenType {
     ERC721 = "ERC721",

package/dist/entities/protocols/element-market.d.ts

@@ -0,0 +1,44 @@
+import { Interface } from '@ethersproject/abi';
+import { BuyItem, NFTTrade } from '../NFTTrade';
+import { TradeConfig } from '../Command';
+import { RoutePlanner } from '../../utils/routerCommands';
+import { BigNumber } from 'ethers';
+export interface Fee {
+    recipient: string;
+    amount: string;
+    feeData: string;
+}
+declare type ElementPartialData = {
+    maker: string;
+    taker: string;
+    expiry: string;
+    nonce: string;
+    erc20Token: string;
+    erc20TokenAmount: string;
+    fees: Fee[];
+};
+export declare type ERC721SellOrder = ElementPartialData & {
+    nft: string;
+    nftId: string;
+};
+export declare type OrderSignature = {
+    signatureType: number;
+    v: number;
+    r: string;
+    s: string;
+};
+export declare type ElementData = {
+    order: ERC721SellOrder;
+    signature: OrderSignature;
+    recipient: string;
+};
+export declare class ElementTrade extends NFTTrade<ElementData> {
+    private static ETH_ADDRESS;
+    static INTERFACE: Interface;
+    constructor(orders: ElementData[]);
+    encode(planner: RoutePlanner, config: TradeConfig): void;
+    getBuyItems(): BuyItem[];
+    getTotalPrice(): BigNumber;
+    getOrderPriceIncludingFees(order: ERC721SellOrder): BigNumber;
+}
+export {};

package/dist/entities/protocols/seaport.d.ts

@@ -3,14 +3,18 @@ import { Interface } from '@ethersproject/abi';
 import { BuyItem, NFTTrade } from '../NFTTrade';
 import { TradeConfig } from '../Command';
 import { RoutePlanner } from '../../utils/routerCommands';
-export declare enum SeaportVersion {
-    V1_1 = 0,
-    V1_4 = 1
-}
+import { Permit2Permit } from '../../utils/inputTokens';
 export declare type SeaportData = {
     items: Order[];
     recipient: string;
-    version: SeaportVersion;
+    protocolAddress: string;
+    inputTokenProcessing?: InputTokenProcessing[];
+};
+export declare type InputTokenProcessing = {
+    token: string;
+    permit2Permit?: Permit2Permit;
+    protocolApproval: boolean;
+    permit2TransferFrom: boolean;
 };
 export declare type FulfillmentComponent = {
     orderIndex: BigNumberish;
@@ -54,8 +58,8 @@ export declare class SeaportTrade extends NFTTrade<SeaportData> {
     constructor(orders: SeaportData[]);
     encode(planner: RoutePlanner, config: TradeConfig): void;
     getBuyItems(): BuyItem[];
-    getTotalOrderPrice(order: SeaportData): BigNumber;
-    getTotalPrice(): BigNumber;
+    getTotalOrderPrice(order: SeaportData, token?: string): BigNumber;
+    getTotalPrice(token?: string): BigNumber;
     private commandMap;
     private getConsiderationFulfillments;
     private getAdvancedOrderParams;

package/dist/entities/protocols/uniswap.d.ts

@@ -1,6 +1,6 @@
 import { RoutePlanner } from '../../utils/routerCommands';
 import { Trade as RouterTrade, SwapOptions as RouterSwapOptions } from '@uniswap/router-sdk';
-import { Permit2Permit } from '../../utils/permit2';
+import { Permit2Permit } from '../../utils/inputTokens';
 import { Currency, TradeType } from '@uniswap/sdk-core';
 import { Command, RouterTradeType, TradeConfig } from '../Command';
 export declare type SwapOptions = Omit<RouterSwapOptions, 'inputTokenPermit'> & {

package/dist/entities/protocols/unwrapWETH.d.ts

@@ -1,12 +1,11 @@
 import { BigNumberish } from 'ethers';
 import { RoutePlanner } from '../../utils/routerCommands';
-import { Permit2Permit } from '../../utils/permit2';
+import { Permit2Permit } from '../../utils/inputTokens';
 import { Command, RouterTradeType, TradeConfig } from '../Command';
 export declare class UnwrapWETH implements Command {
     readonly tradeType: RouterTradeType;
     readonly permit2Data: Permit2Permit;
     readonly wethAddress: string;
-    readonly routerAddress: string;
     readonly amount: BigNumberish;
     constructor(amount: BigNumberish, chainId: number, permit2?: Permit2Permit);
     encode(planner: RoutePlanner, _: TradeConfig): void;

package/dist/test/orders/element.d.ts

@@ -0,0 +1,7 @@
+import { ElementData, OrderSignature, ERC721SellOrder } from '../../src/entities/protocols/element-market';
+export declare const elementOrderETH: ERC721SellOrder;
+export declare const elementSignatureETH: OrderSignature;
+export declare const elementOrderETH_WithFees: ERC721SellOrder;
+export declare const elementOrderETH_WithFees_Signature: OrderSignature;
+export declare const elementDataETH: ElementData;
+export declare const elementDataETH_WithFees: ElementData;

package/dist/test/orders/seaport.d.ts

@@ -1,4 +1,5 @@
-import { SeaportData } from '../../src/entities/protocols/seaport';
+import { ConsiderationItem, SeaportData } from '../../src/entities/protocols/seaport';
 import { BigNumber } from 'ethers';
-export declare const seaportData2Covens: SeaportData;
-export declare const seaportValue: BigNumber;
+export declare const seaportDataETH: SeaportData;
+export declare const seaportDataERC20: SeaportData;
+export declare function calculateSeaportValue(considerations: ConsiderationItem[], token: string): BigNumber;

package/dist/test/orders/seaportV1_4.d.ts

@@ -1,4 +1,4 @@
 import { SeaportData } from '../../src/entities/protocols/seaport';
 import { BigNumber } from 'ethers';
-export declare const seaportV1_4Data: SeaportData;
-export declare const seaportV1_4Value: BigNumber;
+export declare const seaportV1_4DataETH: SeaportData;
+export declare const seaportV1_4ValueETH: BigNumber;

package/dist/test/utils/addresses.d.ts

@@ -1,2 +1,7 @@
+export declare const MAINNET_ROUTER_ADDRESS: string;
+export declare const FORGE_ROUTER_ADDRESS = "0xe808c1cfeebb6cb36b537b82fa7c9eef31415a05";
+export declare const FORGE_PERMIT2_ADDRESS = "0x4a873bdd49f7f9cc0a5458416a12973fab208f8d";
+export declare const FORGE_SENDER_ADDRESS = "0xcf03dd0a894ef79cb5b601a43c4b25e3ae4c67ed";
+export declare const TEST_RECIPIENT_ADDRESS = "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
 export declare const PERMIT2_ADDRESS: string;
 export declare const ROUTER_ADDRESS: string;

package/dist/test/utils/permit2.d.ts

@@ -1,6 +1,6 @@
 import { Wallet } from 'ethers';
 import { PermitSingle } from '@uniswap/permit2-sdk';
-import { Permit2Permit } from '../../src/utils/permit2';
+import { Permit2Permit } from '../../src/utils/inputTokens';
 export declare function generatePermitSignature(permit: PermitSingle, signer: Wallet, chainId: number, permitAddress?: string): Promise<string>;
 export declare function generateEip2098PermitSignature(permit: PermitSingle, signer: Wallet, chainId: number, permitAddress?: string): Promise<string>;
 export declare function toInputPermit(signature: string, permit: PermitSingle): Permit2Permit;

package/dist/test/utils/uniswapData.d.ts

@@ -4,7 +4,6 @@ import { Trade as V3Trade, Pool, FeeAmount } from '@uniswap/v3-sdk';
 import { SwapOptions } from '../../src';
 import { TradeType, Ether, Token, Currency } from '@uniswap/sdk-core';
 export declare const ETHER: Ether;
-export declare const RECIPIENT = "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
 export declare const WETH: Token;
 export declare const DAI: Token;
 export declare const USDC: Token;

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

@@ -82,11 +82,11 @@ var CommandType;
   CommandType[CommandType["PAY_PORTION"] = 6] = "PAY_PORTION";
   CommandType[CommandType["V2_SWAP_EXACT_IN"] = 8] = "V2_SWAP_EXACT_IN";
   CommandType[CommandType["V2_SWAP_EXACT_OUT"] = 9] = "V2_SWAP_EXACT_OUT";
-  CommandType[CommandType["PERMIT"] = 10] = "PERMIT";
+  CommandType[CommandType["PERMIT2_PERMIT"] = 10] = "PERMIT2_PERMIT";
   CommandType[CommandType["WRAP_ETH"] = 11] = "WRAP_ETH";
   CommandType[CommandType["UNWRAP_WETH"] = 12] = "UNWRAP_WETH";
   CommandType[CommandType["PERMIT2_TRANSFER_FROM_BATCH"] = 13] = "PERMIT2_TRANSFER_FROM_BATCH";
-  CommandType[CommandType["SEAPORT_V1_4"] = 14] = "SEAPORT_V1_4";
+  CommandType[CommandType["BALANCE_CHECK_ERC20"] = 14] = "BALANCE_CHECK_ERC20";
   // NFT-related command types
   CommandType[CommandType["SEAPORT"] = 16] = "SEAPORT";
   CommandType[CommandType["LOOKS_RARE_721"] = 17] = "LOOKS_RARE_721";
@@ -95,23 +95,34 @@ var CommandType;
   CommandType[CommandType["LOOKS_RARE_1155"] = 20] = "LOOKS_RARE_1155";
   CommandType[CommandType["OWNER_CHECK_721"] = 21] = "OWNER_CHECK_721";
   CommandType[CommandType["OWNER_CHECK_1155"] = 22] = "OWNER_CHECK_1155";
+  CommandType[CommandType["SWEEP_ERC721"] = 23] = "SWEEP_ERC721";
   CommandType[CommandType["X2Y2_721"] = 24] = "X2Y2_721";
   CommandType[CommandType["SUDOSWAP"] = 25] = "SUDOSWAP";
   CommandType[CommandType["NFT20"] = 26] = "NFT20";
   CommandType[CommandType["X2Y2_1155"] = 27] = "X2Y2_1155";
   CommandType[CommandType["FOUNDATION"] = 28] = "FOUNDATION";
+  CommandType[CommandType["SWEEP_ERC1155"] = 29] = "SWEEP_ERC1155";
+  CommandType[CommandType["ELEMENT_MARKET"] = 30] = "ELEMENT_MARKET";
+  CommandType[CommandType["EXECUTE_SUB_PLAN"] = 32] = "EXECUTE_SUB_PLAN";
+  CommandType[CommandType["SEAPORT_V1_4"] = 33] = "SEAPORT_V1_4";
+  CommandType[CommandType["APPROVE_ERC20"] = 34] = "APPROVE_ERC20";
 })(CommandType || (CommandType = {}));
-var PERMIT_STRUCT = '((address token,uint160 amount,uint48 expiration,uint48 nonce) details, address spender, uint256 sigDeadline)';
-var PERMIT_BATCH_STRUCT = '((address token,uint160 amount,uint48 expiration,uint48 nonce)[] details, address spender, uint256 sigDeadline)';
 var ALLOW_REVERT_FLAG = 0x80;
-var REVERTIBLE_COMMANDS = /*#__PURE__*/new Set([CommandType.SEAPORT, CommandType.SEAPORT_V1_4, CommandType.NFTX, CommandType.LOOKS_RARE_721, CommandType.LOOKS_RARE_1155, CommandType.X2Y2_721, CommandType.X2Y2_1155, CommandType.FOUNDATION, CommandType.SUDOSWAP, CommandType.NFT20, CommandType.CRYPTOPUNKS]);
-var ABI_DEFINITION = (_ABI_DEFINITION = {}, _ABI_DEFINITION[CommandType.PERMIT] = [PERMIT_STRUCT, 'bytes'], _ABI_DEFINITION[CommandType.PERMIT2_PERMIT_BATCH] = [PERMIT_BATCH_STRUCT, 'bytes'], _ABI_DEFINITION[CommandType.PERMIT2_TRANSFER_FROM] = ['address', 'address', 'uint160'], _ABI_DEFINITION[CommandType.PERMIT2_TRANSFER_FROM_BATCH] = ['bytes'], _ABI_DEFINITION[CommandType.TRANSFER] = ['address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.V3_SWAP_EXACT_IN] = ['address', 'uint256', 'uint256', 'bytes', 'bool'], _ABI_DEFINITION[CommandType.V3_SWAP_EXACT_OUT] = ['address', 'uint256', 'uint256', 'bytes', 'bool'], _ABI_DEFINITION[CommandType.V2_SWAP_EXACT_IN] = ['address', 'uint256', 'uint256', 'address[]', 'bool'], _ABI_DEFINITION[CommandType.V2_SWAP_EXACT_OUT] = ['address', 'uint256', 'uint256', 'address[]', 'bool'], _ABI_DEFINITION[CommandType.SEAPORT] = ['uint256', 'bytes'], _ABI_DEFINITION[CommandType.SEAPORT_V1_4] = ['uint256', 'bytes'], _ABI_DEFINITION[CommandType.WRAP_ETH] = ['address', 'uint256'], _ABI_DEFINITION[CommandType.UNWRAP_WETH] = ['address', 'uint256'], _ABI_DEFINITION[CommandType.SWEEP] = ['address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.NFTX] = ['uint256', 'bytes'], _ABI_DEFINITION[CommandType.LOOKS_RARE_721] = ['uint256', 'bytes', 'address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.LOOKS_RARE_1155] = ['uint256', 'bytes', 'address', 'address', 'uint256', 'uint256'], _ABI_DEFINITION[CommandType.X2Y2_721] = ['uint256', 'bytes', 'address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.X2Y2_1155] = ['uint256', 'bytes', 'address', 'address', 'uint256', 'uint256'], _ABI_DEFINITION[CommandType.FOUNDATION] = ['uint256', 'bytes', 'address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.PAY_PORTION] = ['address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.SUDOSWAP] = ['uint256', 'bytes'], _ABI_DEFINITION[CommandType.OWNER_CHECK_721] = ['address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.OWNER_CHECK_1155] = ['address', 'address', 'uint256', 'uint256'], _ABI_DEFINITION[CommandType.NFT20] = ['uint256', 'bytes'], _ABI_DEFINITION[CommandType.CRYPTOPUNKS] = ['uint256', 'address', 'uint256'], _ABI_DEFINITION);
+var REVERTIBLE_COMMANDS = /*#__PURE__*/new Set([CommandType.SEAPORT, CommandType.SEAPORT_V1_4, CommandType.NFTX, CommandType.LOOKS_RARE_721, CommandType.LOOKS_RARE_1155, CommandType.X2Y2_721, CommandType.X2Y2_1155, CommandType.FOUNDATION, CommandType.SUDOSWAP, CommandType.NFT20, CommandType.EXECUTE_SUB_PLAN, CommandType.CRYPTOPUNKS, CommandType.ELEMENT_MARKET]);
+var PERMIT_STRUCT = '((address token,uint160 amount,uint48 expiration,uint48 nonce) details,address spender,uint256 sigDeadline)';
+var PERMIT_BATCH_STRUCT = '((address token,uint160 amount,uint48 expiration,uint48 nonce)[] details,address spender,uint256 sigDeadline)';
+var PERMIT2_TRANSFER_FROM_STRUCT = '(address from,address to,uint160 amount,address token)';
+var PERMIT2_TRANSFER_FROM_BATCH_STRUCT = PERMIT2_TRANSFER_FROM_STRUCT + '[]';
+var ABI_DEFINITION = (_ABI_DEFINITION = {}, _ABI_DEFINITION[CommandType.EXECUTE_SUB_PLAN] = ['bytes', 'bytes[]'], _ABI_DEFINITION[CommandType.PERMIT2_PERMIT] = [PERMIT_STRUCT, 'bytes'], _ABI_DEFINITION[CommandType.PERMIT2_PERMIT_BATCH] = [PERMIT_BATCH_STRUCT, 'bytes'], _ABI_DEFINITION[CommandType.PERMIT2_TRANSFER_FROM] = ['address', 'address', 'uint160'], _ABI_DEFINITION[CommandType.PERMIT2_TRANSFER_FROM_BATCH] = [PERMIT2_TRANSFER_FROM_BATCH_STRUCT], _ABI_DEFINITION[CommandType.V3_SWAP_EXACT_IN] = ['address', 'uint256', 'uint256', 'bytes', 'bool'], _ABI_DEFINITION[CommandType.V3_SWAP_EXACT_OUT] = ['address', 'uint256', 'uint256', 'bytes', 'bool'], _ABI_DEFINITION[CommandType.V2_SWAP_EXACT_IN] = ['address', 'uint256', 'uint256', 'address[]', 'bool'], _ABI_DEFINITION[CommandType.V2_SWAP_EXACT_OUT] = ['address', 'uint256', 'uint256', 'address[]', 'bool'], _ABI_DEFINITION[CommandType.WRAP_ETH] = ['address', 'uint256'], _ABI_DEFINITION[CommandType.UNWRAP_WETH] = ['address', 'uint256'], _ABI_DEFINITION[CommandType.SWEEP] = ['address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.SWEEP_ERC721] = ['address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.SWEEP_ERC1155] = ['address', 'address', 'uint256', 'uint256'], _ABI_DEFINITION[CommandType.TRANSFER] = ['address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.PAY_PORTION] = ['address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.BALANCE_CHECK_ERC20] = ['address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.OWNER_CHECK_721] = ['address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.OWNER_CHECK_1155] = ['address', 'address', 'uint256', 'uint256'], _ABI_DEFINITION[CommandType.APPROVE_ERC20] = ['address', 'uint256'], _ABI_DEFINITION[CommandType.SEAPORT] = ['uint256', 'bytes'], _ABI_DEFINITION[CommandType.SEAPORT_V1_4] = ['uint256', 'bytes'], _ABI_DEFINITION[CommandType.NFTX] = ['uint256', 'bytes'], _ABI_DEFINITION[CommandType.LOOKS_RARE_721] = ['uint256', 'bytes', 'address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.LOOKS_RARE_1155] = ['uint256', 'bytes', 'address', 'address', 'uint256', 'uint256'], _ABI_DEFINITION[CommandType.X2Y2_721] = ['uint256', 'bytes', 'address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.X2Y2_1155] = ['uint256', 'bytes', 'address', 'address', 'uint256', 'uint256'], _ABI_DEFINITION[CommandType.FOUNDATION] = ['uint256', 'bytes', 'address', 'address', 'uint256'], _ABI_DEFINITION[CommandType.SUDOSWAP] = ['uint256', 'bytes'], _ABI_DEFINITION[CommandType.NFT20] = ['uint256', 'bytes'], _ABI_DEFINITION[CommandType.CRYPTOPUNKS] = ['uint256', 'address', 'uint256'], _ABI_DEFINITION[CommandType.ELEMENT_MARKET] = ['uint256', 'bytes'], _ABI_DEFINITION);
 var RoutePlanner = /*#__PURE__*/function () {
   function RoutePlanner() {
     this.commands = '0x';
     this.inputs = [];
   }
   var _proto = RoutePlanner.prototype;
+  _proto.addSubPlan = function addSubPlan(subplan) {
+    this.addCommand(CommandType.EXECUTE_SUB_PLAN, [subplan.commands, subplan.inputs], true);
+  };
   _proto.addCommand = function addCommand(type, parameters, allowRevert) {
     if (allowRevert === void 0) {
       allowRevert = false;
@@ -213,6 +224,8 @@ var CONTRACT_BALANCE = /*#__PURE__*/ethers.BigNumber.from(2).pow(255);
 var ETH_ADDRESS = '0x0000000000000000000000000000000000000000';
 var SENDER_AS_RECIPIENT = '0x0000000000000000000000000000000000000001';
 var ROUTER_AS_RECIPIENT = '0x0000000000000000000000000000000000000002';
+var OPENSEA_CONDUIT_SPENDER_ID = 0;
+var SUDOSWAP_SPENDER_ID = 1;
 
 var REFUND_ETH_PRICE_IMPACT_THRESHOLD = /*#__PURE__*/new sdkCore.Percent( /*#__PURE__*/JSBI.BigInt(50), /*#__PURE__*/JSBI.BigInt(100));
 // Wrapper for uniswap router-sdk trade entity to encode swaps for Universal Router
@@ -374,15 +387,52 @@ function riskOfPartialFill(trade) {
 
 var SIGNATURE_LENGTH = 65;
 var EIP_2098_SIGNATURE_LENGTH = 64;
-function encodePermit(planner, permit) {
-  var signature = permit.signature;
-  var length = ethers.ethers.utils.arrayify(permit.signature).length;
+function encodePermit(planner, permit2) {
+  var signature = permit2.signature;
+  var length = ethers.ethers.utils.arrayify(permit2.signature).length;
   // signature data provided for EIP-1271 may have length different from ECDSA signature
   if (length === SIGNATURE_LENGTH || length === EIP_2098_SIGNATURE_LENGTH) {
     // sanitizes signature to cover edge cases of malformed EIP-2098 sigs and v used as recovery id
-    signature = ethers.ethers.utils.joinSignature(ethers.ethers.utils.splitSignature(permit.signature));
+    signature = ethers.ethers.utils.joinSignature(ethers.ethers.utils.splitSignature(permit2.signature));
+  }
+  planner.addCommand(CommandType.PERMIT2_PERMIT, [permit2, signature]);
+}
+// Handles the encoding of commands needed to gather input tokens for a trade
+// Approval: The router approving another address to take tokens.
+//   note: Only seaport and sudoswap support this action. Approvals are left open.
+// Permit: A Permit2 signature-based Permit to allow the router to access a user's tokens
+// Transfer: A Permit2 TransferFrom of tokens from a user to either the router or another address
+function encodeInputTokenOptions(planner, options) {
+  // first ensure that all tokens provided for encoding are the same
+  if (!!options.approval && !!options.permit2Permit) !(options.approval.token === options.permit2Permit.details.token) ?  invariant(false, "inconsistent token")  : void 0;
+  if (!!options.approval && !!options.permit2TransferFrom) !(options.approval.token === options.permit2TransferFrom.token) ?  invariant(false, "inconsistent token")  : void 0;
+  if (!!options.permit2TransferFrom && !!options.permit2Permit) !(options.permit2TransferFrom.token === options.permit2Permit.details.token) ?  invariant(false, "inconsistent token")  : void 0;
+  // if an options.approval is required, add it
+  if (!!options.approval) {
+    planner.addCommand(CommandType.APPROVE_ERC20, [options.approval.token, mapApprovalProtocol(options.approval.protocol)]);
+  }
+  // if this order has a options.permit2Permit, encode it
+  if (!!options.permit2Permit) {
+    encodePermit(planner, options.permit2Permit);
+  }
+  if (!!options.permit2TransferFrom) {
+    planner.addCommand(CommandType.PERMIT2_TRANSFER_FROM, [options.permit2TransferFrom.token, options.permit2TransferFrom.recipient ? options.permit2TransferFrom.recipient : ROUTER_AS_RECIPIENT, options.permit2TransferFrom.amount]);
+  }
+}
+function mapApprovalProtocol(protocolAddress) {
+  switch (protocolAddress.toLowerCase()) {
+    case '0x00000000006c3852cbef3e08e8df289169ede581':
+      // Seaport v1.1
+      return OPENSEA_CONDUIT_SPENDER_ID;
+    case '0x00000000000001ad428e4906ae43d8f9852d0dd6':
+      // Seaport v1.4
+      return OPENSEA_CONDUIT_SPENDER_ID;
+    case '0x2b2e8cda09bba9660dca5cb6233787738ad68329':
+      // Sudoswap
+      return SUDOSWAP_SPENDER_ID;
+    default:
+      throw new Error('unsupported protocol address');
   }
-  planner.addCommand(CommandType.PERMIT, [permit, signature]);
 }
 
 var SwapRouter = /*#__PURE__*/function () {
@@ -419,7 +469,7 @@ var SwapRouter = /*#__PURE__*/function () {
           currentNativeValueInRouter = currentNativeValueInRouter.sub(tradePrice);
         }
         /**
-         * is Uniswap Trade
+         * is UniswapTrade
          */
       } else if (trade.tradeType == exports.RouterTradeType.UniswapTrade) {
         var uniswapTrade = trade;
@@ -545,6 +595,7 @@ var NFTTrade = function NFTTrade(market, orders) {
   Market["Sudoswap"] = "Sudoswap";
   Market["Cryptopunks"] = "cryptopunks";
   Market["X2Y2"] = "x2y2";
+  Market["Element"] = "element";
 })(exports.Market || (exports.Market = {}));
 (function (TokenType) {
   TokenType["ERC721"] = "ERC721";
@@ -6986,10 +7037,6 @@ var abi$4 = [
 	}
 ];
 
-(function (SeaportVersion) {
-  SeaportVersion[SeaportVersion["V1_1"] = 0] = "V1_1";
-  SeaportVersion[SeaportVersion["V1_4"] = 1] = "V1_4";
-})(exports.SeaportVersion || (exports.SeaportVersion = {}));
 var SeaportTrade = /*#__PURE__*/function (_NFTTrade) {
   _inheritsLoose(SeaportTrade, _NFTTrade);
   function SeaportTrade(orders) {
@@ -7019,17 +7066,33 @@ var SeaportTrade = /*#__PURE__*/function (_NFTTrade) {
       } else {
         calldata = SeaportTrade.INTERFACE.encodeFunctionData('fulfillAvailableAdvancedOrders', [advancedOrders, [], orderFulfillments, considerationFulFillments, SeaportTrade.OPENSEA_CONDUIT_KEY, order.recipient, 100]);
       }
-      planner.addCommand(this.commandMap(order.version), [this.getTotalOrderPrice(order).toString(), calldata], config.allowRevert);
+      if (!!order.inputTokenProcessing) {
+        for (var _iterator3 = _createForOfIteratorHelperLoose(order.inputTokenProcessing), _step3; !(_step3 = _iterator3()).done;) {
+          var inputToken = _step3.value;
+          encodeInputTokenOptions(planner, {
+            approval: inputToken.protocolApproval ? {
+              token: inputToken.token,
+              protocol: order.protocolAddress
+            } : undefined,
+            permit2Permit: inputToken.permit2Permit,
+            permit2TransferFrom: inputToken.permit2TransferFrom ? {
+              token: inputToken.token,
+              amount: this.getTotalOrderPrice(order, inputToken.token).toString()
+            } : undefined
+          });
+        }
+      }
+      planner.addCommand(this.commandMap(order.protocolAddress), [this.getTotalOrderPrice(order, ETH_ADDRESS).toString(), calldata], config.allowRevert);
     }
   };
   _proto.getBuyItems = function getBuyItems() {
     var buyItems = [];
-    for (var _iterator3 = _createForOfIteratorHelperLoose(this.orders), _step3; !(_step3 = _iterator3()).done;) {
-      var order = _step3.value;
-      for (var _iterator4 = _createForOfIteratorHelperLoose(order.items), _step4; !(_step4 = _iterator4()).done;) {
-        var item = _step4.value;
-        for (var _iterator5 = _createForOfIteratorHelperLoose(item.parameters.offer), _step5; !(_step5 = _iterator5()).done;) {
-          var offer = _step5.value;
+    for (var _iterator4 = _createForOfIteratorHelperLoose(this.orders), _step4; !(_step4 = _iterator4()).done;) {
+      var order = _step4.value;
+      for (var _iterator5 = _createForOfIteratorHelperLoose(order.items), _step5; !(_step5 = _iterator5()).done;) {
+        var item = _step5.value;
+        for (var _iterator6 = _createForOfIteratorHelperLoose(item.parameters.offer), _step6; !(_step6 = _iterator6()).done;) {
+          var offer = _step6.value;
           buyItems.push({
             tokenAddress: offer.token,
             tokenId: offer.identifierOrCriteria,
@@ -7040,31 +7103,41 @@ var SeaportTrade = /*#__PURE__*/function (_NFTTrade) {
     }
     return buyItems;
   };
-  _proto.getTotalOrderPrice = function getTotalOrderPrice(order) {
+  _proto.getTotalOrderPrice = function getTotalOrderPrice(order, token) {
+    if (token === void 0) {
+      token = ETH_ADDRESS;
+    }
     var totalOrderPrice = ethers.BigNumber.from(0);
-    for (var _iterator6 = _createForOfIteratorHelperLoose(order.items), _step6; !(_step6 = _iterator6()).done;) {
-      var item = _step6.value;
-      totalOrderPrice = totalOrderPrice.add(this.calculateValue(item.parameters.consideration));
+    for (var _iterator7 = _createForOfIteratorHelperLoose(order.items), _step7; !(_step7 = _iterator7()).done;) {
+      var item = _step7.value;
+      totalOrderPrice = totalOrderPrice.add(this.calculateValue(item.parameters.consideration, token));
     }
     return totalOrderPrice;
   };
-  _proto.getTotalPrice = function getTotalPrice() {
+  _proto.getTotalPrice = function getTotalPrice(token) {
+    if (token === void 0) {
+      token = ETH_ADDRESS;
+    }
     var totalPrice = ethers.BigNumber.from(0);
-    for (var _iterator7 = _createForOfIteratorHelperLoose(this.orders), _step7; !(_step7 = _iterator7()).done;) {
-      var order = _step7.value;
-      for (var _iterator8 = _createForOfIteratorHelperLoose(order.items), _step8; !(_step8 = _iterator8()).done;) {
-        var item = _step8.value;
-        totalPrice = totalPrice.add(this.calculateValue(item.parameters.consideration));
+    for (var _iterator8 = _createForOfIteratorHelperLoose(this.orders), _step8; !(_step8 = _iterator8()).done;) {
+      var order = _step8.value;
+      for (var _iterator9 = _createForOfIteratorHelperLoose(order.items), _step9; !(_step9 = _iterator9()).done;) {
+        var item = _step9.value;
+        totalPrice = totalPrice.add(this.calculateValue(item.parameters.consideration, token));
       }
     }
     return totalPrice;
   };
-  _proto.commandMap = function commandMap(version) {
-    switch (version) {
-      case exports.SeaportVersion.V1_1:
+  _proto.commandMap = function commandMap(protocolAddress) {
+    switch (protocolAddress.toLowerCase()) {
+      case '0x00000000006c3852cbef3e08e8df289169ede581':
+        // Seaport v1.1
         return CommandType.SEAPORT;
-      case exports.SeaportVersion.V1_4:
+      case '0x00000000000001ad428e4906ae43d8f9852d0dd6':
+        // Seaport v1.4
         return CommandType.SEAPORT_V1_4;
+      default:
+        throw new Error('unsupported Seaport address');
     }
   };
   _proto.getConsiderationFulfillments = function getConsiderationFulfillments(protocolDatas) {
@@ -7108,15 +7181,13 @@ var SeaportTrade = /*#__PURE__*/function (_NFTTrade) {
       signature: data.signature,
       extraData: '0x00'
     };
-    var value = this.calculateValue(data.parameters.consideration);
     return {
-      advancedOrder: advancedOrder,
-      value: value
+      advancedOrder: advancedOrder
     };
   };
-  _proto.calculateValue = function calculateValue(considerations) {
+  _proto.calculateValue = function calculateValue(considerations, token) {
     return considerations.reduce(function (amt, consideration) {
-      return amt.add(consideration.startAmount);
+      return consideration.token == token ? amt.add(consideration.startAmount) : amt;
     }, ethers.BigNumber.from(0));
   };
   return SeaportTrade;
@@ -9442,7 +9513,6 @@ var UnwrapWETH = /*#__PURE__*/function () {
   function UnwrapWETH(amount, chainId, permit2) {
     this.tradeType = exports.RouterTradeType.UnwrapWETH;
     this.wethAddress = WETH_ADDRESS(chainId);
-    this.routerAddress = UNIVERSAL_ROUTER_ADDRESS(chainId);
     this.amount = amount;
     if (!!permit2) {
       !(permit2.details.token === this.wethAddress) ?  invariant(false, "must be permitting WETH address: " + this.wethAddress)  : void 0;
@@ -9452,8 +9522,13 @@ var UnwrapWETH = /*#__PURE__*/function () {
   }
   var _proto = UnwrapWETH.prototype;
   _proto.encode = function encode(planner, _) {
-    if (!!this.permit2Data) encodePermit(planner, this.permit2Data);
-    planner.addCommand(CommandType.PERMIT2_TRANSFER_FROM, [this.wethAddress, this.routerAddress, this.amount]);
+    encodeInputTokenOptions(planner, {
+      permit2Permit: this.permit2Data,
+      permit2TransferFrom: {
+        token: this.wethAddress,
+        amount: this.amount.toString()
+      }
+    });
     planner.addCommand(CommandType.UNWRAP_WETH, [ROUTER_AS_RECIPIENT, this.amount]);
   };
   return UnwrapWETH;