@imtbl/sdk 0.8.0-alpha → 0.11.0-alpha

package/dist/index.js

@@ -5,7 +5,7 @@ import jwt_decode from 'jwt-decode';
 import * as crypto from 'crypto';
 import { Magic } from 'magic-sdk';
 import { OpenIdExtension } from '@magic-ext/oidc';
-import { BigNumber as BigNumber$1, ethers, providers, constants, utils as utils$1, Contract as Contract$1, ContractFactory } from 'ethers';
+import { BigNumber as BigNumber$1, ethers, providers, constants as constants$1, utils as utils$1, Contract as Contract$1, ContractFactory } from 'ethers';
 import BN$2 from 'bn.js';
 import * as encUtils from 'enc-utils';
 import { Web3Provider, JsonRpcProvider } from '@ethersproject/providers';
@@ -17,7 +17,7 @@ import { Seaport as Seaport$1 } from '@opensea/seaport-js';
 import { parseUnits } from '@ethersproject/units';
 import { BigNumber as BigNumber$2 } from '@ethersproject/bignumber';
 import detectEthereumProvider from '@metamask/detect-provider';
-import { Token, TradeType, CurrencyAmount, Percent } from '@uniswap/sdk-core';
+import { Token, TradeType, Percent, CurrencyAmount } from '@uniswap/sdk-core';
 import assert from 'assert';
 import { FeeAmount, Route, SwapQuoter, Pool, Trade, toHex as toHex$1, encodeRouteToPath } from '@uniswap/v3-sdk';
 import { keccak256 as keccak256$1 } from '@ethersproject/solidity';
@@ -2398,7 +2398,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.8.0-alpha' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.11.0-alpha' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -2458,7 +2458,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.8.0-alpha',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.11.0-alpha',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -2730,7 +2730,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.8.0-alpha',
+    sdkVersion: 'ts-immutable-sdk-0.11.0-alpha',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -9412,6 +9412,28 @@ class OrdersService {
             },
         });
     }
+    /**
+     * Retrieve fulfillment data for orders
+     * Retrieve signed fulfillment data based on the list of order IDs and corresponding fees.
+     * @returns any Successful response
+     * @throws ApiError
+     */
+    fulfillmentData({ chainName, requestBody, }) {
+        return this.httpRequest.request({
+            method: 'POST',
+            url: '/v1/chains/{chain_name}/orders/fulfillment-data',
+            path: {
+                'chain_name': chainName,
+            },
+            body: requestBody,
+            mediaType: 'application/json',
+            errors: {
+                400: `Bad Request (400)`,
+                404: `The specified resource was not found (404)`,
+                500: `Internal Server Error (500)`,
+            },
+        });
+    }
 }
 
 class OrderBookClient {
@@ -9419,7 +9441,7 @@ class OrderBookClient {
     request;
     constructor(config, HttpRequest = AxiosHttpRequest) {
         this.request = new HttpRequest({
-            BASE: config?.BASE ?? 'https://api.dev.immutable.com',
+            BASE: config?.BASE ?? 'https://api.sandbox.immutable.com',
             VERSION: config?.VERSION ?? '1.0.0',
             WITH_CREDENTIALS: config?.WITH_CREDENTIALS ?? false,
             CREDENTIALS: config?.CREDENTIALS ?? 'include',
@@ -9488,7 +9510,7 @@ var ActionType;
 // TODO: Resolve these from seaport-js.
 // There is some bundling issue that is preventing this from working
 const SEAPORT_CONTRACT_NAME = 'ImmutableSeaport';
-const SEAPORT_CONTRACT_VERSION_V1_4 = '1.4';
+// export const SEAPORT_CONTRACT_VERSION_V1_4 = '1.4';
 const SEAPORT_CONTRACT_VERSION_V1_5 = '1.5';
 const EIP_712_ORDER_TYPE = {
     OrderComponents: [
@@ -9579,7 +9601,7 @@ function mapImmutableOrderToSeaportOrderComponents(order, counter, zoneAddress)
                     endAmount: buyItem.start_amount,
                     itemType: ItemType.NATIVE,
                     recipient: order.account_address,
-                    token: constants.AddressZero,
+                    token: constants$1.AddressZero,
                     identifierOrCriteria: '0',
                 };
             case 'ERC20':
@@ -9588,7 +9610,7 @@ function mapImmutableOrderToSeaportOrderComponents(order, counter, zoneAddress)
                     endAmount: buyItem.start_amount,
                     itemType: ItemType.ERC20,
                     recipient: order.account_address,
-                    token: buyItem.contract_address || constants.AddressZero,
+                    token: buyItem.contract_address || constants$1.AddressZero,
                     identifierOrCriteria: '0',
                 };
             default: // ERC721
@@ -9597,7 +9619,7 @@ function mapImmutableOrderToSeaportOrderComponents(order, counter, zoneAddress)
                     endAmount: '1',
                     itemType: ItemType.ERC721,
                     recipient: order.account_address,
-                    token: buyItem.contract_address || constants.AddressZero,
+                    token: buyItem.contract_address || constants$1.AddressZero,
                     identifierOrCriteria: '0',
                 };
         }
@@ -9609,11 +9631,11 @@ function mapImmutableOrderToSeaportOrderComponents(order, counter, zoneAddress)
         recipient: fee.recipient,
         token: order.buy[0].item_type === 'ERC20'
             ? order.buy[0].contract_address
-            : constants.AddressZero,
+            : constants$1.AddressZero,
         identifierOrCriteria: '0',
     }));
     return {
-        conduitKey: constants.HashZero,
+        conduitKey: constants$1.HashZero,
         consideration: [...considerationItems, ...fees],
         offer: order.sell.map((sellItem) => {
             const erc721Item = sellItem;
@@ -9633,7 +9655,7 @@ function mapImmutableOrderToSeaportOrderComponents(order, counter, zoneAddress)
         zone: zoneAddress,
         totalOriginalConsiderationItems: 2,
         orderType: OrderType.FULL_RESTRICTED,
-        zoneHash: constants.HashZero,
+        zoneHash: constants$1.HashZero,
     };
 }
 
@@ -9678,7 +9700,7 @@ class Seaport {
             orderHash: this.getSeaportLib().getOrderHash(orderComponents),
         };
     }
-    async fulfillOrder(order, account) {
+    async fulfillOrder(order, account, extraData) {
         const orderComponents = await this.mapImmutableOrderToSeaportOrderComponents(order);
         const seaportLib = this.getSeaportLib(order);
         const { actions: seaportActions } = await seaportLib.fulfillOrders({
@@ -9688,7 +9710,7 @@ class Seaport {
                         parameters: orderComponents,
                         signature: order.signature,
                     },
-                    extraData: order.protocol_data.operator_signature,
+                    extraData,
                 }],
         });
         const fulfillmentActions = [];
@@ -9756,7 +9778,7 @@ class Seaport {
         const { chainId } = await this.provider.getNetwork();
         const domainData = {
             name: SEAPORT_CONTRACT_NAME,
-            version: SEAPORT_CONTRACT_VERSION_V1_4,
+            version: SEAPORT_CONTRACT_VERSION_V1_5,
             chainId,
             verifyingContract: this.seaportContractAddress,
         };
@@ -9768,10 +9790,10 @@ class Seaport {
     }
     getSeaportLib(order) {
         const seaportAddress = order?.protocol_data?.seaport_address ?? this.seaportContractAddress;
-        let seaportVersion = SEAPORT_CONTRACT_VERSION_V1_4;
-        if (order?.protocol_data?.seaport_version === SEAPORT_CONTRACT_VERSION_V1_5) {
-            seaportVersion = SEAPORT_CONTRACT_VERSION_V1_5;
-        }
+        const seaportVersion = SEAPORT_CONTRACT_VERSION_V1_5;
+        // if (order?.protocol_data?.seaport_version === SEAPORT_CONTRACT_VERSION_V1_5) {
+        //   seaportVersion = SEAPORT_CONTRACT_VERSION_V1_5;
+        // }
         return this.seaportLibFactory.create(seaportVersion, seaportAddress);
     }
 }
@@ -9785,6 +9807,12 @@ class ImmutableApiClient {
         this.chainName = chainName;
         this.seaportAddress = seaportAddress;
     }
+    async fulfillmentData(requests) {
+        return this.orderbookService.fulfillmentData({
+            chainName: this.chainName,
+            requestBody: requests,
+        });
+    }
     async getListing(listingId) {
         return this.orderbookService.getListing({
             chainName: this.chainName,
@@ -9840,7 +9868,7 @@ class ImmutableApiClient {
                     order_type: CreateOrderProtocolData.order_type.FULL_RESTRICTED,
                     zone_address: orderComponents.zone,
                     seaport_address: this.seaportAddress,
-                    seaport_version: SEAPORT_CONTRACT_VERSION_V1_4,
+                    seaport_version: SEAPORT_CONTRACT_VERSION_V1_5,
                     counter: orderComponents.counter.toString(),
                 },
                 salt: orderComponents.salt,
@@ -9881,9 +9909,9 @@ function getOrderbookConfig(environment) {
     switch (environment) {
         case Environment$1.SANDBOX:
             return {
-                seaportContractAddress: '0x410000346E270aDbC89b2b688177d3AE76348dE9',
-                zoneContractAddress: '0x979C2aCA989A56554Eb63E01e576E3179Cdad5A0',
-                apiEndpoint: 'https://order-book-mr.sandbox.imtbl.com',
+                seaportContractAddress: '0x7Fb7Da6De152597830eD16361633e362A2F59410',
+                zoneContractAddress: '0x63441cBfBd15Dd8f5E92598E535661Ac5aCB808E',
+                apiEndpoint: 'https://api.sandbox.immutable.com',
                 chainName: TESTNET_CHAIN_NAME,
                 provider: new providers.JsonRpcProvider('https://rpc.testnet.immutable.com'),
             };
@@ -10831,7 +10859,7 @@ class SeaportLibFactory {
         this.provider = provider;
     }
     create(orderSeaportVersion, orderSeaportAddress) {
-        const seaportVersion = orderSeaportVersion ?? SEAPORT_CONTRACT_VERSION_V1_4;
+        const seaportVersion = orderSeaportVersion ?? SEAPORT_CONTRACT_VERSION_V1_5;
         const seaportContractAddress = orderSeaportAddress ?? this.defaultSeaportContractAddress;
         return new Seaport$1(this.provider, {
             seaportVersion,
@@ -10870,6 +10898,13 @@ class Orderbook {
         const seaportLibFactory = new SeaportLibFactory(this.orderbookConfig.seaportContractAddress, this.orderbookConfig.provider);
         this.seaport = new Seaport(seaportLibFactory, this.orderbookConfig.provider, this.orderbookConfig.seaportContractAddress, this.orderbookConfig.zoneContractAddress);
     }
+    /**
+     * Return the configuration for the orderbook module.
+     * @return {OrderbookModuleConfiguration} The configuration for the orderbook module.
+     */
+    config() {
+        return this.orderbookConfig;
+    }
     /**
      * Get an order by ID
      * @param {string} listingId - The listingId to find.
@@ -10921,11 +10956,20 @@ class Orderbook {
      * @return {FulfillOrderResponse} Approval and fulfilment transactions.
      */
     async fulfillOrder(listingId, takerAddress) {
-        const orderResult = await this.apiClient.getListing(listingId);
-        if (orderResult.result.status !== OrderStatus.ACTIVE) {
-            throw new Error(`Cannot fulfil order that is not active. Current status: ${orderResult.result.status}`);
+        const fulfillmentDataRes = await this.apiClient.fulfillmentData([{
+                order_id: listingId,
+                // fee: takerFee,
+                fee: undefined,
+            }]);
+        if (fulfillmentDataRes.result.length !== 1) {
+            throw new Error('unexpected fulfillment data result length');
         }
-        return this.seaport.fulfillOrder(orderResult.result, takerAddress);
+        const extraData = fulfillmentDataRes.result[0].extra_data;
+        const orderResult = fulfillmentDataRes.result[0].order;
+        if (orderResult.status !== OrderStatus.ACTIVE) {
+            throw new Error(`Cannot fulfil order that is not active. Current status: ${orderResult.status}`);
+        }
+        return this.seaport.fulfillOrder(orderResult, takerAddress, extraData);
     }
     /**
      * Get an unsigned cancel order transaction. Orders can only be cancelled by
@@ -10949,12 +10993,21 @@ class Orderbook {
     }
 }
 
+// Consumers might want an estimated gas limit for fulfilling an order
+// without calling the transaction builder. This is an estimate that
+// should work for all fulfillment scenarios.
+const ESTIMATED_FULFILLMENT_GAS_GWEI = 400000;
+const constants = {
+    estimatedFulfillmentGasGwei: ESTIMATED_FULFILLMENT_GAS_GWEI,
+};
+
 var orderbook = /*#__PURE__*/Object.freeze({
     __proto__: null,
     get ActionType () { return ActionType; },
     Orderbook: Orderbook,
     get SignablePurpose () { return SignablePurpose; },
-    get TransactionPurpose () { return TransactionPurpose; }
+    get TransactionPurpose () { return TransactionPurpose; },
+    constants: constants
 });
 
 function isChainValid(chainID, config) {
@@ -16045,10 +16098,10 @@ class BigNumber {
         Object.freeze(this);
     }
     fromTwos(value) {
-        return toBigNumber$1(toBN(this).fromTwos(value));
+        return toBigNumber(toBN(this).fromTwos(value));
     }
     toTwos(value) {
-        return toBigNumber$1(toBN(this).toTwos(value));
+        return toBigNumber(toBN(this).toTwos(value));
     }
     abs() {
         if (this._hex[0] === "-") {
@@ -16057,73 +16110,73 @@ class BigNumber {
         return this;
     }
     add(other) {
-        return toBigNumber$1(toBN(this).add(toBN(other)));
+        return toBigNumber(toBN(this).add(toBN(other)));
     }
     sub(other) {
-        return toBigNumber$1(toBN(this).sub(toBN(other)));
+        return toBigNumber(toBN(this).sub(toBN(other)));
     }
     div(other) {
         const o = BigNumber.from(other);
         if (o.isZero()) {
             throwFault("division-by-zero", "div");
         }
-        return toBigNumber$1(toBN(this).div(toBN(other)));
+        return toBigNumber(toBN(this).div(toBN(other)));
     }
     mul(other) {
-        return toBigNumber$1(toBN(this).mul(toBN(other)));
+        return toBigNumber(toBN(this).mul(toBN(other)));
     }
     mod(other) {
         const value = toBN(other);
         if (value.isNeg()) {
             throwFault("division-by-zero", "mod");
         }
-        return toBigNumber$1(toBN(this).umod(value));
+        return toBigNumber(toBN(this).umod(value));
     }
     pow(other) {
         const value = toBN(other);
         if (value.isNeg()) {
             throwFault("negative-power", "pow");
         }
-        return toBigNumber$1(toBN(this).pow(value));
+        return toBigNumber(toBN(this).pow(value));
     }
     and(other) {
         const value = toBN(other);
         if (this.isNegative() || value.isNeg()) {
             throwFault("unbound-bitwise-result", "and");
         }
-        return toBigNumber$1(toBN(this).and(value));
+        return toBigNumber(toBN(this).and(value));
     }
     or(other) {
         const value = toBN(other);
         if (this.isNegative() || value.isNeg()) {
             throwFault("unbound-bitwise-result", "or");
         }
-        return toBigNumber$1(toBN(this).or(value));
+        return toBigNumber(toBN(this).or(value));
     }
     xor(other) {
         const value = toBN(other);
         if (this.isNegative() || value.isNeg()) {
             throwFault("unbound-bitwise-result", "xor");
         }
-        return toBigNumber$1(toBN(this).xor(value));
+        return toBigNumber(toBN(this).xor(value));
     }
     mask(value) {
         if (this.isNegative() || value < 0) {
             throwFault("negative-width", "mask");
         }
-        return toBigNumber$1(toBN(this).maskn(value));
+        return toBigNumber(toBN(this).maskn(value));
     }
     shl(value) {
         if (this.isNegative() || value < 0) {
             throwFault("negative-width", "shl");
         }
-        return toBigNumber$1(toBN(this).shln(value));
+        return toBigNumber(toBN(this).shln(value));
     }
     shr(value) {
         if (this.isNegative() || value < 0) {
             throwFault("negative-width", "shr");
         }
-        return toBigNumber$1(toBN(this).shrn(value));
+        return toBigNumber(toBN(this).shrn(value));
     }
     eq(other) {
         return toBN(this).eq(toBN(other));
@@ -16286,7 +16339,7 @@ function toHex(value) {
     }
     return value;
 }
-function toBigNumber$1(value) {
+function toBigNumber(value) {
     return BigNumber.from(toHex(value));
 }
 function toBN(value) {
@@ -24859,70 +24912,6 @@ const getApproval = async (nativeToken, provider, ownerAddress, tokenAddress, pr
     };
 };
 
-const quoteReturnMapping = {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    '0xcdca1753': ['uint256', 'uint160[]', 'uint32[]', 'uint256'],
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    '0xc6a5026a': ['uint256', 'uint160', 'uint32', 'uint256'],
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    '0x2f80bb1d': ['uint256', 'uint160[]', 'uint32[]', 'uint256'],
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    '0xbd21704a': ['uint256', 'uint160', 'uint32', 'uint256'],
-};
-/**
- * Returns true if poolA is equivalent to poolB
- * @param poolA one of the two pools
- * @param poolB the other pool
- */
-function poolEquals(poolA, poolB) {
-    return (poolA === poolB
-        || (poolA.token0.equals(poolB.token0)
-            && poolA.token1.equals(poolB.token1)
-            && poolA.fee === poolB.fee));
-}
-async function getERC20Decimals(tokenAddress, provider) {
-    const decimalsFunctionSig = ethers.utils.id('decimals()').substring(0, 10);
-    try {
-        const decimalsResult = await provider.call({
-            to: tokenAddress,
-            data: decimalsFunctionSig,
-        });
-        return parseInt(decimalsResult, 16);
-    }
-    catch (e) {
-        const message = e instanceof Error ? e.message : 'Unknown Error';
-        throw new ProviderCallError(`failed to get ERC20 decimals: ${message}`);
-    }
-}
-/**
- * Based on https://github.com/ethers-io/ethers.js/blob/main/src.ts/address/checks.ts#L51
- */
-function isValidNonZeroAddress(address) {
-    if (address === ethers.constants.AddressZero) {
-        return false;
-    }
-    try {
-        ethers.utils.getAddress(address);
-        return true;
-    }
-    catch (error) {
-        return false;
-    }
-}
-const tokenInfoToUniswapToken = (tokenInfo) => new Token(tokenInfo.chainId, tokenInfo.address, tokenInfo.decimals, tokenInfo.symbol, tokenInfo.name);
-const uniswapTokenToTokenInfo = (token) => ({
-    chainId: token.chainId,
-    address: token.address,
-    decimals: token.decimals,
-    symbol: token.symbol,
-    name: token.name,
-});
-const toBigNumber = (amount) => (ethers.BigNumber.from(amount.multiply(amount.decimalScale).toExact()));
-const newAmount = (amount, token) => ({
-    value: amount,
-    token,
-});
-
 // slippageToPercent takes the slippage as a percentage (e.g. 0.1) and
 // converts it to the Uniswap equivalent type
 const slippageToFraction = (slippage) => {
@@ -24942,17 +24931,11 @@ const slippageToFraction = (slippage) => {
     return new Percent(numerator, denominator);
 };
 
-function getQuoteAmountFromTradeType(tradeInfo, tokenInfo) {
+function getQuoteAmountFromTradeType(tradeInfo) {
     if (tradeInfo.tradeType === TradeType.EXACT_INPUT) {
-        return {
-            token: tokenInfo,
-            value: tradeInfo.amountOut,
-        };
+        return tradeInfo.amountOut;
     }
-    return {
-        token: tokenInfo,
-        value: tradeInfo.amountIn,
-    };
+    return tradeInfo.amountIn;
 }
 function applySlippage(tradeType, amount, slippage) {
     const slippageTolerance = slippageToFraction(slippage);
@@ -24961,8 +24944,8 @@ function applySlippage(tradeType, amount, slippage) {
     const amountWithSlippage = maybeInverted.multiply(amount.toString()).quotient;
     return ethers.BigNumber.from(amountWithSlippage.toString());
 }
-function prepareUserQuote(otherCurrency, tradeInfo, slippage, fees) {
-    const resultToken = otherCurrency.wrapped;
+function prepareUserQuote(otherToken, tradeInfo, slippage, fees) {
+    const resultToken = otherToken.wrapped;
     const tokenInfo = {
         chainId: resultToken.chainId,
         address: resultToken.address,
@@ -24970,7 +24953,7 @@ function prepareUserQuote(otherCurrency, tradeInfo, slippage, fees) {
         symbol: resultToken.symbol,
         name: resultToken.name,
     };
-    const quote = getQuoteAmountFromTradeType(tradeInfo, tokenInfo);
+    const quote = getQuoteAmountFromTradeType(tradeInfo);
     const amountWithSlippage = applySlippage(tradeInfo.tradeType, quote.value, slippage);
     return {
         amount: quote,
@@ -24987,8 +24970,8 @@ function getOurQuoteReqAmount(amount, fees, tradeType) {
         // For an exact output swap, we do not need to subtract fees from the given amount
         return amount;
     }
-    fees.addAmount(toBigNumber(amount));
-    return CurrencyAmount.fromRawAmount(amount.currency, fees.amountLessFees().toString());
+    fees.addAmount(amount);
+    return fees.amountLessFees();
 }
 
 // 0.1% default slippage
@@ -25140,6 +25123,11 @@ class Multicall__factory extends ContractFactory {
 const _abi$1$1 = [
     {
         inputs: [
+            {
+                internalType: "address",
+                name: "_admin",
+                type: "address",
+            },
             {
                 internalType: "address",
                 name: "_uniRouter",
@@ -25180,36 +25168,92 @@ const _abi$1$1 = [
         name: "FeeTaken",
         type: "event",
     },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: false,
+                internalType: "address",
+                name: "account",
+                type: "address",
+            },
+        ],
+        name: "Paused",
+        type: "event",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: "bytes32",
+                name: "role",
+                type: "bytes32",
+            },
+            {
+                indexed: true,
+                internalType: "bytes32",
+                name: "previousAdminRole",
+                type: "bytes32",
+            },
+            {
+                indexed: true,
+                internalType: "bytes32",
+                name: "newAdminRole",
+                type: "bytes32",
+            },
+        ],
+        name: "RoleAdminChanged",
+        type: "event",
+    },
     {
         anonymous: false,
         inputs: [
+            {
+                indexed: true,
+                internalType: "bytes32",
+                name: "role",
+                type: "bytes32",
+            },
             {
                 indexed: true,
                 internalType: "address",
-                name: "previousOwner",
+                name: "account",
                 type: "address",
             },
             {
                 indexed: true,
                 internalType: "address",
-                name: "newOwner",
+                name: "sender",
                 type: "address",
             },
         ],
-        name: "OwnershipTransferred",
+        name: "RoleGranted",
         type: "event",
     },
     {
         anonymous: false,
         inputs: [
             {
-                indexed: false,
+                indexed: true,
+                internalType: "bytes32",
+                name: "role",
+                type: "bytes32",
+            },
+            {
+                indexed: true,
                 internalType: "address",
                 name: "account",
                 type: "address",
             },
+            {
+                indexed: true,
+                internalType: "address",
+                name: "sender",
+                type: "address",
+            },
         ],
-        name: "Paused",
+        name: "RoleRevoked",
         type: "event",
     },
     {
@@ -25230,9 +25274,9 @@ const _abi$1$1 = [
         name: "BASIS_POINT_PRECISION",
         outputs: [
             {
-                internalType: "uint16",
+                internalType: "uint256",
                 name: "",
-                type: "uint16",
+                type: "uint256",
             },
         ],
         stateMutability: "view",
@@ -25240,7 +25284,20 @@ const _abi$1$1 = [
     },
     {
         inputs: [],
-        name: "MAX_SERVICE_FEE",
+        name: "DEFAULT_ADMIN_ROLE",
+        outputs: [
+            {
+                internalType: "bytes32",
+                name: "",
+                type: "bytes32",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "FEE_BASIS_POINTS_MAXIMUM",
         outputs: [
             {
                 internalType: "uint16",
@@ -25251,6 +25308,45 @@ const _abi$1$1 = [
         stateMutability: "view",
         type: "function",
     },
+    {
+        inputs: [],
+        name: "PAUSE",
+        outputs: [
+            {
+                internalType: "bytes32",
+                name: "",
+                type: "bytes32",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "UNPAUSE",
+        outputs: [
+            {
+                internalType: "bytes32",
+                name: "",
+                type: "bytes32",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "WITHDRAW",
+        outputs: [
+            {
+                internalType: "bytes32",
+                name: "",
+                type: "bytes32",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
     {
         inputs: [
             {
@@ -25261,13 +25357,13 @@ const _abi$1$1 = [
                         type: "address",
                     },
                     {
-                        internalType: "uint16",
-                        name: "feePrcntBasisPoints",
-                        type: "uint16",
+                        internalType: "uint256",
+                        name: "feeBasisPoints",
+                        type: "uint256",
                     },
                 ],
-                internalType: "struct ISecondaryFee.ServiceFeeParams[]",
-                name: "serviceFee",
+                internalType: "struct ISecondaryFee.SecondaryFeeParams[]",
+                name: "secondaryFees",
                 type: "tuple[]",
             },
             {
@@ -25309,11 +25405,11 @@ const _abi$1$1 = [
                     },
                 ],
                 internalType: "struct IV3SwapRouter.ExactInputSingleParams",
-                name: "params",
+                name: "swapParams",
                 type: "tuple",
             },
         ],
-        name: "exactInputSingleWithServiceFee",
+        name: "exactInputSingleWithSecondaryFee",
         outputs: [
             {
                 internalType: "uint256",
@@ -25334,13 +25430,13 @@ const _abi$1$1 = [
                         type: "address",
                     },
                     {
-                        internalType: "uint16",
-                        name: "feePrcntBasisPoints",
-                        type: "uint16",
+                        internalType: "uint256",
+                        name: "feeBasisPoints",
+                        type: "uint256",
                     },
                 ],
-                internalType: "struct ISecondaryFee.ServiceFeeParams[]",
-                name: "serviceFee",
+                internalType: "struct ISecondaryFee.SecondaryFeeParams[]",
+                name: "secondaryFees",
                 type: "tuple[]",
             },
             {
@@ -25367,11 +25463,11 @@ const _abi$1$1 = [
                     },
                 ],
                 internalType: "struct IV3SwapRouter.ExactInputParams",
-                name: "params",
+                name: "swapParams",
                 type: "tuple",
             },
         ],
-        name: "exactInputWithServiceFee",
+        name: "exactInputWithSecondaryFee",
         outputs: [
             {
                 internalType: "uint256",
@@ -25392,13 +25488,13 @@ const _abi$1$1 = [
                         type: "address",
                     },
                     {
-                        internalType: "uint16",
-                        name: "feePrcntBasisPoints",
-                        type: "uint16",
+                        internalType: "uint256",
+                        name: "feeBasisPoints",
+                        type: "uint256",
                     },
                 ],
-                internalType: "struct ISecondaryFee.ServiceFeeParams[]",
-                name: "serviceFee",
+                internalType: "struct ISecondaryFee.SecondaryFeeParams[]",
+                name: "secondaryFees",
                 type: "tuple[]",
             },
             {
@@ -25440,15 +25536,15 @@ const _abi$1$1 = [
                     },
                 ],
                 internalType: "struct IV3SwapRouter.ExactOutputSingleParams",
-                name: "params",
+                name: "swapParams",
                 type: "tuple",
             },
         ],
-        name: "exactOutputSingleWithServiceFee",
+        name: "exactOutputSingleWithSecondaryFee",
         outputs: [
             {
                 internalType: "uint256",
-                name: "amountIn",
+                name: "",
                 type: "uint256",
             },
         ],
@@ -25465,13 +25561,13 @@ const _abi$1$1 = [
                         type: "address",
                     },
                     {
-                        internalType: "uint16",
-                        name: "feePrcntBasisPoints",
-                        type: "uint16",
+                        internalType: "uint256",
+                        name: "feeBasisPoints",
+                        type: "uint256",
                     },
                 ],
-                internalType: "struct ISecondaryFee.ServiceFeeParams[]",
-                name: "serviceFee",
+                internalType: "struct ISecondaryFee.SecondaryFeeParams[]",
+                name: "secondaryFees",
                 type: "tuple[]",
             },
             {
@@ -25498,21 +25594,82 @@ const _abi$1$1 = [
                     },
                 ],
                 internalType: "struct IV3SwapRouter.ExactOutputParams",
-                name: "params",
+                name: "swapParams",
                 type: "tuple",
             },
         ],
-        name: "exactOutputWithServiceFee",
+        name: "exactOutputWithSecondaryFee",
         outputs: [
             {
                 internalType: "uint256",
-                name: "amountIn",
+                name: "",
                 type: "uint256",
             },
         ],
         stateMutability: "payable",
         type: "function",
     },
+    {
+        inputs: [
+            {
+                internalType: "bytes32",
+                name: "role",
+                type: "bytes32",
+            },
+        ],
+        name: "getRoleAdmin",
+        outputs: [
+            {
+                internalType: "bytes32",
+                name: "",
+                type: "bytes32",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "bytes32",
+                name: "role",
+                type: "bytes32",
+            },
+            {
+                internalType: "address",
+                name: "account",
+                type: "address",
+            },
+        ],
+        name: "grantRole",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "bytes32",
+                name: "role",
+                type: "bytes32",
+            },
+            {
+                internalType: "address",
+                name: "account",
+                type: "address",
+            },
+        ],
+        name: "hasRole",
+        outputs: [
+            {
+                internalType: "bool",
+                name: "",
+                type: "bool",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
     {
         inputs: [
             {
@@ -25556,19 +25713,6 @@ const _abi$1$1 = [
         stateMutability: "nonpayable",
         type: "function",
     },
-    {
-        inputs: [],
-        name: "owner",
-        outputs: [
-            {
-                internalType: "address",
-                name: "",
-                type: "address",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-    },
     {
         inputs: [],
         name: "pause",
@@ -25590,25 +25734,60 @@ const _abi$1$1 = [
         type: "function",
     },
     {
-        inputs: [],
-        name: "renounceOwnership",
+        inputs: [
+            {
+                internalType: "bytes32",
+                name: "role",
+                type: "bytes32",
+            },
+            {
+                internalType: "address",
+                name: "account",
+                type: "address",
+            },
+        ],
+        name: "renounceRole",
         outputs: [],
         stateMutability: "nonpayable",
         type: "function",
     },
     {
         inputs: [
+            {
+                internalType: "bytes32",
+                name: "role",
+                type: "bytes32",
+            },
             {
                 internalType: "address",
-                name: "newOwner",
+                name: "account",
                 type: "address",
             },
         ],
-        name: "transferOwnership",
+        name: "revokeRole",
         outputs: [],
         stateMutability: "nonpayable",
         type: "function",
     },
+    {
+        inputs: [
+            {
+                internalType: "bytes4",
+                name: "interfaceId",
+                type: "bytes4",
+            },
+        ],
+        name: "supportsInterface",
+        outputs: [
+            {
+                internalType: "bool",
+                name: "",
+                type: "bool",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
     {
         inputs: [],
         name: "uniswapRouter",
@@ -25629,8 +25808,26 @@ const _abi$1$1 = [
         stateMutability: "nonpayable",
         type: "function",
     },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "to",
+                type: "address",
+            },
+            {
+                internalType: "address",
+                name: "erc20",
+                type: "address",
+            },
+        ],
+        name: "withdrawFunds",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
 ];
-const _bytecode$1$1 = "0x60806040523480156200001157600080fd5b5060405162002123380380620021238339810160408190526200003491620000c2565b6200003f3362000072565b6000805460ff60a01b19169055600180546001600160a01b0319166001600160a01b0392909216919091179055620000f4565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b600060208284031215620000d557600080fd5b81516001600160a01b0381168114620000ed57600080fd5b9392505050565b61201f80620001046000396000f3fe6080604052600436106100e85760003560e01c8063735de9f71161008a578063ac9650d811610059578063ac9650d814610243578063d9a6f70514610263578063ed921d3c14610279578063f2fde38b1461028c57600080fd5b8063735de9f7146101c5578063742ac944146101fd5780638456cb59146102105780638da5cb5b1461022557600080fd5b80633f4ba83a116100c65780633f4ba83a1461014f5780635ae401dc146101665780635c975abb14610186578063715018a6146101b057600080fd5b80631411734e146100ed57806314d90e1b146101135780631fd168ff1461013c575b600080fd5b6101006100fb366004611a14565b6102ac565b6040519081526020015b60405180910390f35b34801561011f57600080fd5b506101296103e881565b60405161ffff909116815260200161010a565b61010061014a366004611a14565b61040a565b34801561015b57600080fd5b5061016461057a565b005b610179610174366004611ac0565b61058c565b60405161010a9190611b5b565b34801561019257600080fd5b50600054600160a01b900460ff16604051901515815260200161010a565b3480156101bc57600080fd5b506101646105e2565b3480156101d157600080fd5b506001546101e5906001600160a01b031681565b6040516001600160a01b03909116815260200161010a565b61010061020b366004611c50565b6105f4565b34801561021c57600080fd5b50610164610731565b34801561023157600080fd5b506000546001600160a01b03166101e5565b34801561024f57600080fd5b5061017961025e366004611ca5565b610741565b34801561026f57600080fd5b5061012961271081565b610100610287366004611c50565b610836565b34801561029857600080fd5b506101646102a7366004611ce6565b61095e565b60208101516000906001600160a01b031633148015906102d9575060208201516001600160a01b03163014155b156102ff5760405162461bcd60e51b81526004016102f690611d03565b60405180910390fd5b600061030e83600001516109d7565b905060008061037983866040015187602001518a8a808060200260200160405190810160405280939291908181526020016000905b8282101561036f5761036060408302860136819003810190611d50565b81526020019060010190610343565b50505050506109e3565b60408088018390526001600160a01b0380831660208a0152600154915163b858183f60e01b8152939550919350169063b858183f906103bc908890600401611dfc565b6020604051808303816000875af11580156103db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ff9190611e0f565b979650505050505050565b6040810151815160009190829061042090610ac4565b9050600061043185600001516109d7565b90506000806000806104a4868a606001518b604001518c602001518f8f808060200260200160405190810160405280939291908181526020016000905b8282101561049a5761048b60408302860136819003810190611d50565b8152602001906001019061046e565b5050505050610af2565b9350935093509350838960400181815250508289602001906001600160a01b031690816001600160a01b031681525050600160009054906101000a90046001600160a01b03166001600160a01b03166309b813468a6040518263ffffffff1660e01b81526004016105159190611dfc565b6020604051808303816000875af1158015610534573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105589190611e0f565b975061056c8787878c604001518587610bd3565b505050505050509392505050565b610582610e16565b61058a610e70565b565b6060834211156105d05760405162461bcd60e51b815260206004820152600f60248201526e111958591b1a5b99481c185cdcd959608a1b60448201526064016102f6565b6105da8383610741565b949350505050565b6105ea610e16565b61058a6000610ec5565b60608101516000906001600160a01b03163314801590610621575060608201516001600160a01b03163014155b1561063e5760405162461bcd60e51b81526004016102f690611d03565b6000806106a18460000151856080015186606001518989808060200260200160405190810160405280939291908181526020016000905b8282101561036f5761069260408302860136819003810190611d50565b81526020019060010190610675565b608086018290526001600160a01b0380821660608801526001546040516304e45aaf60e01b815293955091935016906304e45aaf906106e4908790600401611e28565b6020604051808303816000875af1158015610703573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107279190611e0f565b9695505050505050565b610739610e16565b61058a610f15565b6060816001600160401b0381111561075b5761075b61189c565b60405190808252806020026020018201604052801561078e57816020015b60608152602001906001900390816107795790505b50905060005b8281101561082e576107fe308585848181106107b2576107b2611e87565b90506020028101906107c49190611e9d565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250610f5892505050565b82828151811061081057610810611e87565b6020026020010181905250808061082690611ef9565b915050610794565b505b92915050565b600080826080015190506000806000806108ab87600001518860a0015189608001518a606001518d8d808060200260200160405190810160405280939291908181526020016000905b8282101561049a5761089c60408302860136819003810190611d50565b8152602001906001019061087f565b60808b018490526001600160a01b0380841660608d0152600154604051635023b4df60e01b815295995093975091955093501690635023b4df906108f3908a90600401611e28565b6020604051808303816000875af1158015610912573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109369190611e0f565b955061095285886000015189602001518a608001518587610bd3565b50505050509392505050565b610966610e16565b6001600160a01b0381166109cb5760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084016102f6565b6109d481610ec5565b50565b60006108308282610f84565b600080548190600160a01b900460ff16610a2257600080610a048786610fe9565b9092509050610a138288611f12565b9650610a1f88826111c6565b50505b6040516323b872dd60e01b8152336004820152306024820152604481018690526001600160a01b038716906323b872dd906064016020604051808303816000875af1158015610a75573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a999190611f25565b50610aa48686611341565b306001600160a01b03851603610ab8573393505b50929491935090915050565b60008060148351610ad59190611f12565b90506000610ae584836014611438565b90506105da816000610f84565b6000806060818082610b0e60005460ff600160a01b9091041690565b610b2e57610b1c8988610fe9565b9092509050610b2b828a611f47565b98505b6001600160a01b0388163014610b42573097505b610b4c8b8b611341565b6040516323b872dd60e01b8152336004820152306024820152604481018b90526001600160a01b038c16906323b872dd906064016020604051808303816000875af1158015610b9f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bc39190611f25565b50979a9699509697505050505050565b600054600160a01b900460ff16610bee57610bee8482611545565b6040516370a0823160e01b81523060048201526000906001600160a01b038616906370a0823190602401602060405180830381865afa158015610c35573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c599190611e0f565b9050610c658385611f12565b811015610cb45760405162461bcd60e51b815260206004820181905260248201527f696e636f72726563742066656520616d6f756e7420646973747269627574656460448201526064016102f6565b60405163a9059cbb60e01b8152336004820152602481018890526001600160a01b0386169063a9059cbb906044016020604051808303816000875af1158015610d01573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d259190611f25565b506040516370a0823160e01b81523060048201526000906001600160a01b038816906370a0823190602401602060405180830381865afa158015610d6d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d919190611e0f565b90508015610e0c5760405163a9059cbb60e01b8152336004820152602481018290526001600160a01b0388169063a9059cbb906044016020604051808303816000875af1158015610de6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0a9190611f25565b505b5050505050505050565b6000546001600160a01b0316331461058a5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016102f6565b610e786116b4565b6000805460ff60a01b191690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b6040516001600160a01b03909116815260200160405180910390a1565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b610f1d611704565b6000805460ff60a01b1916600160a01b1790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a258610ea83390565b6060610f7d8383604051806060016040528060278152602001611fc360279139611751565b9392505050565b6000610f91826014611f47565b83511015610fd95760405162461bcd60e51b8152602060048201526015602482015274746f416464726573735f6f75744f66426f756e647360581b60448201526064016102f6565b500160200151600160601b900490565b6000606081805b845181101561103a5784818151811061100b5761100b611e87565b60200260200101516020015161ffff16826110269190611f47565b91508061103281611ef9565b915050610ff0565b506103e881111561108d5760405162461bcd60e51b815260206004820152601d60248201527f5365727669636520666565203e204d41585f534552564943455f46454500000060448201526064016102f6565b60008085516001600160401b038111156110a9576110a961189c565b6040519080825280602002602001820160405280156110ee57816020015b60408051808201909152600080825260208201528152602001906001900390816110c75790505b50905060005b86518110156111b757600061271061ffff1688838151811061111857611118611e87565b60200260200101516020015161ffff168a6111339190611f5a565b61113d9190611f71565b9050604051806040016040528089848151811061115c5761115c611e87565b6020026020010151600001516001600160a01b031681526020018281525083838151811061118c5761118c611e87565b60209081029190910101526111a18185611f47565b93505080806111af90611ef9565b9150506110f4565b509093509150505b9250929050565b60005b815181101561133c57826001600160a01b03166323b872dd338484815181106111f4576111f4611e87565b60200260200101516000015185858151811061121257611212611e87565b60209081029190910181015101516040516001600160e01b031960e086901b1681526001600160a01b03938416600482015292909116602483015260448201526064016020604051808303816000875af1158015611274573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112989190611f25565b508181815181106112ab576112ab611e87565b6020026020010151600001516001600160a01b0316336001600160a01b0316846001600160a01b03167f1f9a9fdac86b6ca3c5300bec0b61555cded1f1a234378602dcca6c27085eac8e85858151811061130757611307611e87565b60200260200101516020015160405161132291815260200190565b60405180910390a48061133481611ef9565b9150506111c9565b505050565b600154604051636eb1769f60e11b81523060048201526001600160a01b039182166024820152829184169063dd62ed3e90604401602060405180830381865afa158015611392573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113b69190611e0f565b10156114345760015460405163095ea7b360e01b81526001600160a01b03918216600482015260001960248201529083169063095ea7b3906044016020604051808303816000875af1158015611410573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061133c9190611f25565b5050565b60608161144681601f611f47565b10156114855760405162461bcd60e51b815260206004820152600e60248201526d736c6963655f6f766572666c6f7760901b60448201526064016102f6565b61148f8284611f47565b845110156114d35760405162461bcd60e51b8152602060048201526011602482015270736c6963655f6f75744f66426f756e647360781b60448201526064016102f6565b6060821580156114f2576040519150600082526020820160405261153c565b6040519150601f8416801560200281840101858101878315602002848b0101015b8183101561152b578051835260209283019201611513565b5050858452601f01601f1916604052505b50949350505050565b60005b815181101561133c57826001600160a01b031663a9059cbb83838151811061157257611572611e87565b60200260200101516000015184848151811061159057611590611e87565b6020026020010151602001516040518363ffffffff1660e01b81526004016115cd9291906001600160a01b03929092168252602082015260400190565b6020604051808303816000875af11580156115ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116109190611f25565b5081818151811061162357611623611e87565b6020026020010151600001516001600160a01b0316336001600160a01b0316846001600160a01b03167f1f9a9fdac86b6ca3c5300bec0b61555cded1f1a234378602dcca6c27085eac8e85858151811061167f5761167f611e87565b60200260200101516020015160405161169a91815260200190565b60405180910390a4806116ac81611ef9565b915050611548565b600054600160a01b900460ff1661058a5760405162461bcd60e51b815260206004820152601460248201527314185d5cd8589b194e881b9bdd081c185d5cd95960621b60448201526064016102f6565b600054600160a01b900460ff161561058a5760405162461bcd60e51b815260206004820152601060248201526f14185d5cd8589b194e881c185d5cd95960821b60448201526064016102f6565b6060600080856001600160a01b03168560405161176e9190611f93565b600060405180830381855af49150503d80600081146117a9576040519150601f19603f3d011682016040523d82523d6000602084013e6117ae565b606091505b50915091506107278683838760608315611829578251600003611822576001600160a01b0385163b6118225760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016102f6565b50816105da565b6105da838381511561183e5781518083602001fd5b8060405162461bcd60e51b81526004016102f69190611faf565b60008083601f84011261186a57600080fd5b5081356001600160401b0381111561188157600080fd5b6020830191508360208260061b85010111156111bf57600080fd5b634e487b7160e01b600052604160045260246000fd5b604051608081016001600160401b03811182821017156118d4576118d461189c565b60405290565b60405160e081016001600160401b03811182821017156118d4576118d461189c565b604051601f8201601f191681016001600160401b03811182821017156119245761192461189c565b604052919050565b6001600160a01b03811681146109d457600080fd5b803561194c8161192c565b919050565b60006080828403121561196357600080fd5b61196b6118b2565b905081356001600160401b038082111561198457600080fd5b818401915084601f83011261199857600080fd5b81356020828211156119ac576119ac61189c565b6119be601f8301601f191682016118fc565b925081835286818386010111156119d457600080fd5b818185018285013760008183850101528285526119f2818701611941565b8186015250505050604082013560408201526060820135606082015292915050565b600080600060408486031215611a2957600080fd5b83356001600160401b0380821115611a4057600080fd5b611a4c87838801611858565b90955093506020860135915080821115611a6557600080fd5b50611a7286828701611951565b9150509250925092565b60008083601f840112611a8e57600080fd5b5081356001600160401b03811115611aa557600080fd5b6020830191508360208260051b85010111156111bf57600080fd5b600080600060408486031215611ad557600080fd5b8335925060208401356001600160401b03811115611af257600080fd5b611afe86828701611a7c565b9497909650939450505050565b60005b83811015611b26578181015183820152602001611b0e565b50506000910152565b60008151808452611b47816020860160208601611b0b565b601f01601f19169290920160200192915050565b6000602080830181845280855180835260408601915060408160051b870101925083870160005b82811015611bb057603f19888603018452611b9e858351611b2f565b94509285019290850190600101611b82565b5092979650505050505050565b600060e08284031215611bcf57600080fd5b611bd76118da565b90508135611be48161192c565b81526020820135611bf48161192c565b6020820152604082013562ffffff81168114611c0f57600080fd5b6040820152611c2060608301611941565b60608201526080820135608082015260a082013560a0820152611c4560c08301611941565b60c082015292915050565b60008060006101008486031215611c6657600080fd5b83356001600160401b03811115611c7c57600080fd5b611c8886828701611858565b9094509250611c9c90508560208601611bbd565b90509250925092565b60008060208385031215611cb857600080fd5b82356001600160401b03811115611cce57600080fd5b611cda85828601611a7c565b90969095509350505050565b600060208284031215611cf857600080fd5b8135610f7d8161192c565b6020808252602d908201527f726563697069656e74206d757374206265206d73672e73656e646572206f722060408201526c1d1a1a5cc818dbdb9d1c9858dd609a1b606082015260800190565b600060408284031215611d6257600080fd5b604051604081018181106001600160401b0382111715611d8457611d8461189c565b6040528235611d928161192c565b8152602083013561ffff81168114611da957600080fd5b60208201529392505050565b6000815160808452611dca6080850182611b2f565b6020848101516001600160a01b0316908601526040808501519086015260609384015193909401929092525090919050565b602081526000610f7d6020830184611db5565b600060208284031215611e2157600080fd5b5051919050565b60e08101610830828480516001600160a01b03908116835260208083015182169084015260408083015162ffffff16908401526060808301518216908401526080808301519084015260a0828101519084015260c09182015116910152565b634e487b7160e01b600052603260045260246000fd5b6000808335601e19843603018112611eb457600080fd5b8301803591506001600160401b03821115611ece57600080fd5b6020019150368190038213156111bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b600060018201611f0b57611f0b611ee3565b5060010190565b8181038181111561083057610830611ee3565b600060208284031215611f3757600080fd5b81518015158114610f7d57600080fd5b8082018082111561083057610830611ee3565b808202811582820484141761083057610830611ee3565b600082611f8e57634e487b7160e01b600052601260045260246000fd5b500490565b60008251611fa5818460208701611b0b565b9190910192915050565b602081526000610f7d6020830184611b2f56fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212203925f97cd63c2e61736a2a442ff1d4bf966f453350e9df354a849229f69092cf64736f6c63430008130033";
+const _bytecode$1$1 = "0x60806040523480156200001157600080fd5b506040516200278438038062002784833981016040819052620000349162000136565b6001805460ff191690556200004b60008362000078565b600180546001600160a01b0390921661010002610100600160a81b0319909216919091179055506200016e565b6000828152602081815260408083206001600160a01b038516845290915290205460ff1662000115576000828152602081815260408083206001600160a01b03851684529091529020805460ff19166001179055620000d43390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45b5050565b80516001600160a01b03811681146200013157600080fd5b919050565b600080604083850312156200014a57600080fd5b620001558362000119565b9150620001656020840162000119565b90509250929050565b612606806200017e6000396000f3fe60806040526004361061013f5760003560e01c80635ae401dc116100b657806393751f631161006f57806393751f631461038c578063a217fddf146103b5578063ac9650d8146103ca578063d547741f146103ea578063d9a6f7051461040a578063e65fad971461042057600080fd5b80635ae401dc146102ae5780635c975abb146102ce578063735de9f7146102e65780638456cb59146103235780638f3914661461033857806391d148541461036c57600080fd5b80632f2ff15d116101085780632f2ff15d1461022057806336568abe14610240578063383ebb0b146102605780633f4ba83a146102735780635640f6591461028857806358e81a501461029b57600080fd5b80620fa9fb1461014457806301ffc9a714610166578063116944b21461019b57806316ba7197146101bc578063248a9ca3146101f0575b600080fd5b34801561015057600080fd5b5061016461015f366004611db4565b610454565b005b34801561017257600080fd5b50610186610181366004611ded565b61050d565b60405190151581526020015b60405180910390f35b6101ae6101a9366004611f85565b610544565b604051908152602001610192565b3480156101c857600080fd5b506101ae7f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286981565b3480156101fc57600080fd5b506101ae61020b366004611fda565b60009081526020819052604090206001015490565b34801561022c57600080fd5b5061016461023b366004611ff3565b610634565b34801561024c57600080fd5b5061016461025b366004611ff3565b610659565b6101ae61026e3660046120db565b6106dc565b34801561027f57600080fd5b5061016461084c565b6101ae6102963660046120db565b610889565b6101ae6102a9366004611f85565b61097f565b6102c16102bc366004612187565b610ad0565b6040516101929190612222565b3480156102da57600080fd5b5060015460ff16610186565b3480156102f257600080fd5b5060015461030b9061010090046001600160a01b031681565b6040516001600160a01b039091168152602001610192565b34801561032f57600080fd5b50610164610b1e565b34801561034457600080fd5b506101ae7fe7276a2a84d8de556657ec9cf93a55a7d66f096e529d0582ed08e9e2208b92b581565b34801561037857600080fd5b50610186610387366004611ff3565b610b59565b34801561039857600080fd5b506103a26103e881565b60405161ffff9091168152602001610192565b3480156103c157600080fd5b506101ae600081565b3480156103d657600080fd5b506102c16103e5366004612284565b610b82565b3480156103f657600080fd5b50610164610405366004611ff3565b610c76565b34801561041657600080fd5b506101ae61271081565b34801561042c57600080fd5b506101ae7ffcb9fcbfa83b897fb2d5cf4b58962164105c1e71489a37ef3ae0db3fdce576f681565b61047e7f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286933610b59565b61048757600080fd5b6040516370a0823160e01b81523060048201526000906001600160a01b038316906370a0823190602401602060405180830381865afa1580156104ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104f291906122c5565b90506105086001600160a01b0383168483610c9b565b505050565b60006001600160e01b03198216637965db0b60e01b148061053e57506301ffc9a760e01b6001600160e01b03198316145b92915050565b60006105b08260000151836080015184606001518787808060200260200160405190810160405280939291908181526020016000905b828210156105a657610597604083028601368190038101906122de565b8152602001906001019061057a565b5050505050610cfe565b60808301526001546040516304e45aaf60e01b81526101009091046001600160a01b0316906304e45aaf906105e9908590600401612335565b6020604051808303816000875af1158015610608573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061062c91906122c5565b949350505050565b60008281526020819052604090206001015461064f81610dbf565b6105088383610dcc565b6001600160a01b03811633146106ce5760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b60648201526084015b60405180910390fd5b6106d88282610e50565b5050565b6000806106ec8360000151610eb5565b905060008061075783866060015187602001518a8a808060200260200160405190810160405280939291908181526020016000905b8282101561074d5761073e604083028601368190038101906122de565b81526020019060010190610721565b5050505050610ee3565b606087018190526001546040516304dc09a360e11b81529294509092506000916101009091046001600160a01b0316906309b813469061079b9089906004016123db565b6020604051808303816000875af11580156107ba573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107de91906122c5565b905061083e8482858b8b808060200260200160405190810160405280939291908181526020016000905b8282101561083457610825604083028601368190038101906122de565b81526020019060010190610808565b5050505050610f96565b9450505050505b9392505050565b6108767fe7276a2a84d8de556657ec9cf93a55a7d66f096e529d0582ed08e9e2208b92b533610b59565b61087f57600080fd5b610887610ff7565b565b6000806108998360000151611049565b90506108f781846040015185602001518888808060200260200160405190810160405280939291908181526020016000905b828210156105a6576108e8604083028601368190038101906122de565b815260200190600101906108cb565b604084810191909152600154905163b858183f60e01b81526101009091046001600160a01b03169063b858183f906109339086906004016123db565b6020604051808303816000875af1158015610952573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061097691906122c5565b95945050505050565b60008060006109e484600001518560a0015186606001518989808060200260200160405190810160405280939291908181526020016000905b8282101561074d576109d5604083028601368190038101906122de565b815260200190600101906109b8565b60a08601819052600154604051635023b4df60e01b81529294509092506000916101009091046001600160a01b031690635023b4df90610a28908890600401612335565b6020604051808303816000875af1158015610a47573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6b91906122c5565b9050610ac5856000015182858a8a808060200260200160405190810160405280939291908181526020016000905b8282101561083457610ab6604083028601368190038101906122de565b81526020019060010190610a99565b979650505050505050565b606083421115610b145760405162461bcd60e51b815260206004820152600f60248201526e111958591b1a5b99481c185cdcd959608a1b60448201526064016106c5565b61062c8383610b82565b610b487ffcb9fcbfa83b897fb2d5cf4b58962164105c1e71489a37ef3ae0db3fdce576f633610b59565b610b5157600080fd5b610887611055565b6000918252602082815260408084206001600160a01b0393909316845291905290205460ff1690565b6060816001600160401b03811115610b9c57610b9c611e62565b604051908082528060200260200182016040528015610bcf57816020015b6060815260200190600190039081610bba5790505b50905060005b82811015610c6f57610c3f30858584818110610bf357610bf36123ee565b9050602002810190610c059190612404565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061109092505050565b828281518110610c5157610c516123ee565b60200260200101819052508080610c6790612460565b915050610bd5565b5092915050565b600082815260208190526040902060010154610c9181610dbf565b6105088383610e50565b6040516001600160a01b03831660248201526044810182905261050890849063a9059cbb60e01b906064015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b0319909316929092179091526110b5565b60006001600160a01b0383163314610d585760405162461bcd60e51b815260206004820181905260248201527f73776170526563697069656e74206d757374206265206d73672e73656e64657260448201526064016106c5565b60015460ff16610d9757610d6b8261118a565b50600080610d79868561123d565b9092509050610d888287612479565b9550610d948782611366565b50505b610dac6001600160a01b03861633308761146f565b610db685856114ad565b50919392505050565b610dc981336115aa565b50565b610dd68282610b59565b6106d8576000828152602081815260408083206001600160a01b03851684529091529020805460ff19166001179055610e0c3390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b610e5a8282610b59565b156106d8576000828152602081815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b60008060148351610ec69190612479565b90506000610ed684836014611603565b905061062c816000611710565b6000806001600160a01b0384163314610f3e5760405162461bcd60e51b815260206004820181905260248201527f73776170526563697069656e74206d757374206265206d73672e73656e64657260448201526064016106c5565b6000610f498461118a565b90506000610f598261271061248c565b9050610f688761271083611775565b9250610f7488846114ad565b610f896001600160a01b03891633308a61146f565b5094969095509350505050565b6000806000610fa5868561123d565b91509150610fb560015460ff1690565b610fc357610fc387826117b5565b610fed3383610fd28989612479565b610fdc9190612479565b6001600160a01b038a169190610c9b565b610ac5828761248c565b610fff6118bc565b6001805460ff191690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b6040516001600160a01b03909116815260200160405180910390a1565b600061053e8282611710565b61105d611905565b6001805460ff1916811790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a2583361102c565b606061084583836040518060600160405280602781526020016125aa6027913961194b565b600061110a826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166119c39092919063ffffffff16565b905080516000148061112b57508080602001905181019061112b919061249f565b6105085760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b60648201526084016106c5565b6000805b82518110156111d4578281815181106111a9576111a96123ee565b602002602001015160200151826111c0919061248c565b9150806111cc81612460565b91505061118e565b506103e88111156112385760405162461bcd60e51b815260206004820152602860248201527f5365636f6e6461727920666565203e204645455f42415349535f504f494e54536044820152675f4d4158494d554d60c01b60648201526084016106c5565b919050565b6000606082516001600160401b0381111561125a5761125a611e62565b60405190808252806020026020018201604052801561129f57816020015b60408051808201909152600080825260208201528152602001906001900390816112785790505b50905060005b835181101561135e5760006112e48583815181106112c5576112c56123ee565b602002602001015160200151612710886119d29092919063ffffffff16565b90506040518060400160405280868481518110611303576113036123ee565b6020026020010151600001516001600160a01b0316815260200182815250838381518110611333576113336123ee565b6020908102919091010152611348818561248c565b935050808061135690612460565b9150506112a5565b509250929050565b60005b8151811015610508576113cc33838381518110611388576113886123ee565b6020026020010151600001518484815181106113a6576113a66123ee565b602002602001015160200151866001600160a01b031661146f909392919063ffffffff16565b8181815181106113de576113de6123ee565b6020026020010151600001516001600160a01b0316336001600160a01b0316846001600160a01b03167f1f9a9fdac86b6ca3c5300bec0b61555cded1f1a234378602dcca6c27085eac8e85858151811061143a5761143a6123ee565b60200260200101516020015160405161145591815260200190565b60405180910390a48061146781612460565b915050611369565b6040516001600160a01b03808516602483015283166044820152606481018290526114a79085906323b872dd60e01b90608401610cc7565b50505050565b600154604051636eb1769f60e11b81523060048201526001600160a01b0361010090920482166024820152829184169063dd62ed3e90604401602060405180830381865afa158015611503573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061152791906122c5565b10156106d85760015460405163095ea7b360e01b81526101009091046001600160a01b039081166004830152600019602483015283169063095ea7b3906044016020604051808303816000875af1158015611586573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610508919061249f565b6115b48282610b59565b6106d8576115c181611a74565b6115cc836020611a86565b6040516020016115dd9291906124c1565b60408051601f198184030181529082905262461bcd60e51b82526106c591600401612536565b60608161161181601f61248c565b10156116505760405162461bcd60e51b815260206004820152600e60248201526d736c6963655f6f766572666c6f7760901b60448201526064016106c5565b61165a828461248c565b8451101561169e5760405162461bcd60e51b8152602060048201526011602482015270736c6963655f6f75744f66426f756e647360781b60448201526064016106c5565b6060821580156116bd5760405191506000825260208201604052611707565b6040519150601f8416801560200281840101858101878315602002848b0101015b818310156116f65780518352602092830192016116de565b5050858452601f01601f1916604052505b50949350505050565b600061171d82601461248c565b835110156117655760405162461bcd60e51b8152602060048201526015602482015274746f416464726573735f6f75744f66426f756e647360581b60448201526064016106c5565b500160200151600160601b900490565b60006117828484846119d2565b90506000828061179457611794612549565b84860911156108455760001981106117ab57600080fd5b6001019392505050565b60005b8151811015610508576118198282815181106117d6576117d66123ee565b6020026020010151600001518383815181106117f4576117f46123ee565b602002602001015160200151856001600160a01b0316610c9b9092919063ffffffff16565b81818151811061182b5761182b6123ee565b6020026020010151600001516001600160a01b0316336001600160a01b0316846001600160a01b03167f1f9a9fdac86b6ca3c5300bec0b61555cded1f1a234378602dcca6c27085eac8e858581518110611887576118876123ee565b6020026020010151602001516040516118a291815260200190565b60405180910390a4806118b481612460565b9150506117b8565b60015460ff166108875760405162461bcd60e51b815260206004820152601460248201527314185d5cd8589b194e881b9bdd081c185d5cd95960621b60448201526064016106c5565b60015460ff16156108875760405162461bcd60e51b815260206004820152601060248201526f14185d5cd8589b194e881c185d5cd95960821b60448201526064016106c5565b6060600080856001600160a01b031685604051611968919061255f565b600060405180830381855af49150503d80600081146119a3576040519150601f19603f3d011682016040523d82523d6000602084013e6119a8565b606091505b50915091506119b986838387611c21565b9695505050505050565b606061062c8484600085611c9a565b600083830281600019858709828110838203039150508084116119f457600080fd5b80600003611a0757508290049050610845565b6000848688096000868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b606061053e6001600160a01b03831660145b60606000611a9583600261257b565b611aa090600261248c565b6001600160401b03811115611ab757611ab7611e62565b6040519080825280601f01601f191660200182016040528015611ae1576020820181803683370190505b509050600360fc1b81600081518110611afc57611afc6123ee565b60200101906001600160f81b031916908160001a905350600f60fb1b81600181518110611b2b57611b2b6123ee565b60200101906001600160f81b031916908160001a9053506000611b4f84600261257b565b611b5a90600161248c565b90505b6001811115611bd2576f181899199a1a9b1b9c1cb0b131b232b360811b85600f1660108110611b8e57611b8e6123ee565b1a60f81b828281518110611ba457611ba46123ee565b60200101906001600160f81b031916908160001a90535060049490941c93611bcb81612592565b9050611b5d565b5083156108455760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e7460448201526064016106c5565b60608315611c90578251600003611c89576001600160a01b0385163b611c895760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016106c5565b508161062c565b61062c8383611d6a565b606082471015611cfb5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b60648201526084016106c5565b600080866001600160a01b03168587604051611d17919061255f565b60006040518083038185875af1925050503d8060008114611d54576040519150601f19603f3d011682016040523d82523d6000602084013e611d59565b606091505b5091509150610ac587838387611c21565b815115611d7a5781518083602001fd5b8060405162461bcd60e51b81526004016106c59190612536565b6001600160a01b0381168114610dc957600080fd5b803561123881611d94565b60008060408385031215611dc757600080fd5b8235611dd281611d94565b91506020830135611de281611d94565b809150509250929050565b600060208284031215611dff57600080fd5b81356001600160e01b03198116811461084557600080fd5b60008083601f840112611e2957600080fd5b5081356001600160401b03811115611e4057600080fd5b6020830191508360208260061b8501011115611e5b57600080fd5b9250929050565b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b0381118282101715611e9a57611e9a611e62565b60405290565b604051608081016001600160401b0381118282101715611e9a57611e9a611e62565b604051601f8201601f191681016001600160401b0381118282101715611eea57611eea611e62565b604052919050565b600060e08284031215611f0457600080fd5b611f0c611e78565b90508135611f1981611d94565b81526020820135611f2981611d94565b6020820152604082013562ffffff81168114611f4457600080fd5b6040820152611f5560608301611da9565b60608201526080820135608082015260a082013560a0820152611f7a60c08301611da9565b60c082015292915050565b60008060006101008486031215611f9b57600080fd5b83356001600160401b03811115611fb157600080fd5b611fbd86828701611e17565b9094509250611fd190508560208601611ef2565b90509250925092565b600060208284031215611fec57600080fd5b5035919050565b6000806040838503121561200657600080fd5b823591506020830135611de281611d94565b60006080828403121561202a57600080fd5b612032611ea0565b905081356001600160401b038082111561204b57600080fd5b818401915084601f83011261205f57600080fd5b813560208282111561207357612073611e62565b612085601f8301601f19168201611ec2565b9250818352868183860101111561209b57600080fd5b818185018285013760008183850101528285526120b9818701611da9565b8186015250505050604082013560408201526060820135606082015292915050565b6000806000604084860312156120f057600080fd5b83356001600160401b038082111561210757600080fd5b61211387838801611e17565b9095509350602086013591508082111561212c57600080fd5b5061213986828701612018565b9150509250925092565b60008083601f84011261215557600080fd5b5081356001600160401b0381111561216c57600080fd5b6020830191508360208260051b8501011115611e5b57600080fd5b60008060006040848603121561219c57600080fd5b8335925060208401356001600160401b038111156121b957600080fd5b6121c586828701612143565b9497909650939450505050565b60005b838110156121ed5781810151838201526020016121d5565b50506000910152565b6000815180845261220e8160208601602086016121d2565b601f01601f19169290920160200192915050565b6000602080830181845280855180835260408601915060408160051b870101925083870160005b8281101561227757603f198886030184526122658583516121f6565b94509285019290850190600101612249565b5092979650505050505050565b6000806020838503121561229757600080fd5b82356001600160401b038111156122ad57600080fd5b6122b985828601612143565b90969095509350505050565b6000602082840312156122d757600080fd5b5051919050565b6000604082840312156122f057600080fd5b604051604081018181106001600160401b038211171561231257612312611e62565b604052823561232081611d94565b81526020928301359281019290925250919050565b60e0810161053e828480516001600160a01b03908116835260208083015182169084015260408083015162ffffff16908401526060808301518216908401526080808301519084015260a0828101519084015260c09182015116910152565b60008151608084526123a960808501826121f6565b6020848101516001600160a01b0316908601526040808501519086015260609384015193909401929092525090919050565b6020815260006108456020830184612394565b634e487b7160e01b600052603260045260246000fd5b6000808335601e1984360301811261241b57600080fd5b8301803591506001600160401b0382111561243557600080fd5b602001915036819003821315611e5b57600080fd5b634e487b7160e01b600052601160045260246000fd5b6000600182016124725761247261244a565b5060010190565b8181038181111561053e5761053e61244a565b8082018082111561053e5761053e61244a565b6000602082840312156124b157600080fd5b8151801515811461084557600080fd5b7f416363657373436f6e74726f6c3a206163636f756e74200000000000000000008152600083516124f98160178501602088016121d2565b7001034b99036b4b9b9b4b733903937b6329607d1b601791840191820152835161252a8160288401602088016121d2565b01602801949350505050565b60208152600061084560208301846121f6565b634e487b7160e01b600052601260045260246000fd5b600082516125718184602087016121d2565b9190910192915050565b808202811582820484141761053e5761053e61244a565b6000816125a1576125a161244a565b50600019019056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220c75a7db1b170ff1ce6888f2940825a25db3ebb624d8b84bd3f2372ebae2de1d464736f6c63430008130033";
 const isSuperArgs$1$1 = (xs) => xs.length > 1;
 class SecondaryFee__factory extends ContractFactory {
     constructor(...args) {
@@ -25641,11 +25838,11 @@ class SecondaryFee__factory extends ContractFactory {
             super(_abi$1$1, _bytecode$1$1, args[0]);
         }
     }
-    deploy(_uniRouter, overrides) {
-        return super.deploy(_uniRouter, overrides || {});
+    deploy(_admin, _uniRouter, overrides) {
+        return super.deploy(_admin, _uniRouter, overrides || {});
     }
-    getDeployTransaction(_uniRouter, overrides) {
-        return super.getDeployTransaction(_uniRouter, overrides || {});
+    getDeployTransaction(_admin, _uniRouter, overrides) {
+        return super.getDeployTransaction(_admin, _uniRouter, overrides || {});
     }
     attach(address) {
         return super.attach(address);
@@ -26731,10 +26928,87 @@ const getCallData = (methodName, contractInterface) => {
     return fragment ? contractInterface?.encodeFunctionData(fragment) : undefined;
 };
 
+const quoteReturnMapping = {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    '0xcdca1753': ['uint256', 'uint160[]', 'uint32[]', 'uint256'],
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    '0xc6a5026a': ['uint256', 'uint160', 'uint32', 'uint256'],
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    '0x2f80bb1d': ['uint256', 'uint160[]', 'uint32[]', 'uint256'],
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    '0xbd21704a': ['uint256', 'uint160', 'uint32', 'uint256'],
+};
+/**
+ * Returns true if poolA is equivalent to poolB
+ * @param poolA one of the two pools
+ * @param poolB the other pool
+ */
+function poolEquals(poolA, poolB) {
+    return (poolA === poolB
+        || (poolA.token0.equals(poolB.token0)
+            && poolA.token1.equals(poolB.token1)
+            && poolA.fee === poolB.fee));
+}
+async function getERC20Decimals(tokenAddress, provider) {
+    const decimalsFunctionSig = ethers.utils.id('decimals()').substring(0, 10);
+    try {
+        const decimalsResult = await provider.call({
+            to: tokenAddress,
+            data: decimalsFunctionSig,
+        });
+        return parseInt(decimalsResult, 16);
+    }
+    catch (e) {
+        const message = e instanceof Error ? e.message : 'Unknown Error';
+        throw new ProviderCallError(`failed to get ERC20 decimals: ${message}`);
+    }
+}
+/**
+ * Based on https://github.com/ethers-io/ethers.js/blob/main/src.ts/address/checks.ts#L51
+ */
+function isValidNonZeroAddress(address) {
+    if (address === ethers.constants.AddressZero) {
+        return false;
+    }
+    try {
+        ethers.utils.getAddress(address);
+        return true;
+    }
+    catch (error) {
+        return false;
+    }
+}
+const tokenInfoToUniswapToken = (tokenInfo) => new Token(tokenInfo.chainId, tokenInfo.address, tokenInfo.decimals, tokenInfo.symbol, tokenInfo.name);
+const uniswapTokenToTokenInfo = (token) => ({
+    chainId: token.chainId,
+    address: token.address,
+    decimals: token.decimals,
+    symbol: token.symbol,
+    name: token.name,
+});
+const toCurrencyAmount = (amount) => {
+    const token = tokenInfoToUniswapToken(amount.token);
+    return CurrencyAmount.fromRawAmount(token, amount.value.toString());
+};
+const newAmount = (amount, token) => ({
+    value: amount,
+    token,
+});
+const addAmount = (a, b) => {
+    if (a.token.address !== b.token.address)
+        throw new Error('Token mismatch');
+    return { value: a.value.add(b.value), token: a.token };
+};
+const subtractAmount = (a, b) => {
+    if (a.token.address !== b.token.address)
+        throw new Error('Token mismatch');
+    return { value: a.value.sub(b.value), token: a.token };
+};
+
 const amountIndex = 0;
 const gasEstimateIndex = 3;
 async function getQuotesForRoutes(multicallContract, quoterContractAddress, routes, amountSpecified, tradeType) {
-    const callData = routes.map((route) => SwapQuoter.quoteCallParameters(route, amountSpecified, tradeType, {
+    const callData = routes.map((route) => SwapQuoter.quoteCallParameters(route, toCurrencyAmount(amountSpecified), tradeType, {
         useQuoterV2: true,
     }).calldata);
     let quoteResults;
@@ -26760,27 +27034,26 @@ async function getQuotesForRoutes(multicallContract, quoterContractAddress, rout
             // eslint-disable-next-line no-continue
             continue;
         }
-        let decodedQuoteResult;
         try {
-            decodedQuoteResult = ethers.utils.defaultAbiCoder.decode(returnTypes, quoteResults.returnData[i].returnData);
+            const decodedQuoteResult = ethers.utils.defaultAbiCoder.decode(returnTypes, quoteResults.returnData[i].returnData);
+            if (decodedQuoteResult) {
+                // The 0th element in each decoded data is going to be the amountOut or amountIn.
+                const quoteAmount = decodedQuoteResult[amountIndex];
+                if (!(quoteAmount instanceof BigNumber$1))
+                    throw new Error('Expected BigNumber');
+                decodedQuoteResults.push({
+                    route: routes[i],
+                    amountIn: tradeType === TradeType.EXACT_INPUT ? amountSpecified : newAmount(quoteAmount, routes[i].input),
+                    amountOut: tradeType === TradeType.EXACT_INPUT ? newAmount(quoteAmount, routes[i].output) : amountSpecified,
+                    gasEstimate: ethers.BigNumber.from(decodedQuoteResult[gasEstimateIndex]),
+                });
+            }
         }
         catch {
             // Failed to get the quote for this particular route
             // Other quotes for routes may still succeed, so do nothing
             // and continue processing
         }
-        // TODO: ideally this is already a big number as we don't need a CurrencyAmount at this level
-        const amountSpecifiedBigNumber = toBigNumber(amountSpecified);
-        if (decodedQuoteResult) {
-            // The 0th element in each decoded data is going to be the amountOut or amountIn.
-            const quoteAmount = decodedQuoteResult[amountIndex];
-            decodedQuoteResults.push({
-                route: routes[i],
-                amountIn: tradeType === TradeType.EXACT_INPUT ? amountSpecifiedBigNumber : quoteAmount,
-                amountOut: tradeType === TradeType.EXACT_INPUT ? quoteAmount : amountSpecifiedBigNumber,
-                gasEstimate: ethers.BigNumber.from(decodedQuoteResult[gasEstimateIndex]),
-            });
-        }
     }
     return decodedQuoteResults;
 }
@@ -26916,10 +27189,10 @@ class Router {
         this.routingTokens = routingTokens;
         this.routingContracts = routingContracts;
     }
-    async findOptimalRoute(amountSpecified, otherCurrency, tradeType, maxHops = 2) {
-        const [currencyIn, currencyOut] = this.determineERC20InAndERC20Out(tradeType, amountSpecified, otherCurrency);
+    async findOptimalRoute(amountSpecified, otherToken, tradeType, maxHops = 2) {
+        const [tokenIn, tokenOut] = this.determineERC20InAndERC20Out(tradeType, amountSpecified, otherToken);
         const multicallContract = Multicall__factory.connect(this.routingContracts.multicallAddress, this.provider);
-        const erc20Pair = [currencyIn.wrapped, currencyOut.wrapped];
+        const erc20Pair = [tokenIn, tokenOut];
         // Get all pools and use these to get all possible routes.
         const pools = await fetchValidPools(multicallContract, erc20Pair, this.routingTokens, this.routingContracts.factoryAddress);
         const noValidPools = pools.length === 0;
@@ -26929,7 +27202,7 @@ class Router {
         // Get all the possible routes from the given pools
         // TODO: Fix used before defined error
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
-        const routes = generateAllAcyclicPaths(currencyIn, currencyOut, pools, maxHops, [], [], currencyIn);
+        const routes = generateAllAcyclicPaths(tokenIn, tokenOut, pools, maxHops, [], [], tokenIn);
         const noValidRoute = routes.length === 0;
         if (noValidRoute) {
             throw new NoRoutesAvailableError();
@@ -26939,9 +27212,7 @@ class Router {
         return {
             route,
             amountIn,
-            tokenIn: currencyIn,
             amountOut,
-            tokenOut: currencyOut,
             tradeType,
             gasEstimate,
         };
@@ -26977,7 +27248,7 @@ class Router {
     bestQuoteForAmountIn(quotes) {
         let bestQuote = quotes[0];
         for (let i = 1; i < quotes.length; i++) {
-            if (quotes[i].amountOut.gt(bestQuote.amountOut)) {
+            if (quotes[i].amountOut.value.gt(bestQuote.amountOut.value)) {
                 bestQuote = quotes[i];
             }
         }
@@ -26987,48 +27258,49 @@ class Router {
     bestQuoteForAmountOut(quotes) {
         let bestQuote = quotes[0];
         for (let i = 1; i < quotes.length; i++) {
-            if (quotes[i].amountIn.lt(bestQuote.amountIn)) {
+            if (quotes[i].amountIn.value.lt(bestQuote.amountIn.value)) {
                 bestQuote = quotes[i];
             }
         }
         return bestQuote;
     }
     // eslint-disable-next-line class-methods-use-this
-    determineERC20InAndERC20Out(tradeType, amountSpecified, otherCurrency) {
+    determineERC20InAndERC20Out(tradeType, amountSpecified, otherToken) {
         // If the trade type is EXACT INPUT then we have specified the amount for the tokenIn
         return tradeType === TradeType.EXACT_INPUT
-            ? [amountSpecified?.currency, otherCurrency]
-            : [otherCurrency, amountSpecified?.currency];
+            ? [amountSpecified.token, otherToken]
+            : [otherToken, amountSpecified.token];
     }
 }
-const generateAllAcyclicPaths = (currencyIn, // the currency we start with
-currencyOut, // the currency we want to end up with
+const generateAllAcyclicPaths = (tokenIn, // the currency we start with
+tokenOut, // the currency we want to end up with
 pools, // list of all available pools
 maxHops, // the maximum number of pools that can be traversed
 currentRoute = [], // list of pools already traversed
 routes = [], // list of all routes found so far
-startCurrencyIn = currencyIn) => {
-    const tokenIn = currencyIn.wrapped;
-    const tokenOut = currencyOut.wrapped;
+startTokenIn = tokenIn) => {
+    const currencyIn = new Token(tokenIn.chainId, tokenIn.address, tokenIn.decimals);
+    const currencyOut = new Token(tokenOut.chainId, tokenOut.address, tokenOut.decimals);
+    const startCurrencyIn = new Token(startTokenIn.chainId, startTokenIn.address, startTokenIn.decimals);
     for (const pool of pools) {
         // if the pool doesn't have the tokenIn or if it has already been traversed,
         // skip to the next pool
-        const poolHasTokenIn = pool.involvesToken(tokenIn);
+        const poolHasTokenIn = pool.involvesToken(currencyIn);
         const poolHasCycle = currentRoute.find((pathPool) => poolEquals(pool, pathPool));
         // eslint-disable-next-line no-continue
         if (!poolHasTokenIn || poolHasCycle)
             continue;
         // get the output token of the pool
-        const outputToken = pool.token0.equals(tokenIn) ? pool.token1 : pool.token0;
+        const outputToken = pool.token0.equals(currencyIn) ? pool.token1 : pool.token0;
         // if we have found a route to the target currency, add it to the list of routes
-        const routeFound = outputToken.equals(tokenOut);
+        const routeFound = outputToken.equals(currencyOut);
         if (routeFound) {
             routes.push(new Route([...currentRoute, pool], startCurrencyIn, currencyOut));
         }
         else if (maxHops > 1) {
             // otherwise, if we haven't exceeded the maximum number of pools that can be traversed,
             // recursively call this function with the output token as the new starting currency
-            generateAllAcyclicPaths(outputToken, currencyOut, pools, maxHops - 1, [...currentRoute, pool], routes, startCurrencyIn);
+            generateAllAcyclicPaths(outputToken, tokenOut, pools, maxHops - 1, [...currentRoute, pool], routes, startTokenIn);
         }
     }
     return routes;
@@ -27036,39 +27308,38 @@ startCurrencyIn = currencyIn) => {
 
 class Fees {
     secondaryFees;
-    token;
-    amount = ethers.BigNumber.from(0);
+    amount;
     constructor(secondaryFees, token) {
         this.secondaryFees = secondaryFees;
-        this.token = token;
+        this.amount = { token, value: BigNumber$1.from(0) };
     }
     addAmount(amount) {
-        this.amount = this.amount.add(amount);
+        this.amount = addAmount(this.amount, amount);
     }
     amountWithFeesApplied() {
-        return this.amount.add(this.total());
+        return addAmount(this.amount, this.total());
     }
     amountLessFees() {
-        return this.amount.sub(this.total());
+        return subtractAmount(this.amount, this.total());
     }
     withAmounts() {
         return this.secondaryFees.map((fee) => {
-            const feeAmount = this.amount
-                .mul(fee.feeBasisPoints)
+            const feeAmount = this.amount.value
+                .mul(fee.basisPoints)
                 .div(BASIS_POINT_PRECISION);
             return {
                 ...fee,
-                amount: newAmount(feeAmount, this.token),
+                amount: newAmount(feeAmount, this.amount.token),
             };
         });
     }
     total() {
-        let totalFees = ethers.BigNumber.from(0);
-        for (let i = 0; i < this.secondaryFees.length; i++) {
-            const feeAmount = this.amount
-                .mul(this.secondaryFees[i].feeBasisPoints)
+        let totalFees = newAmount(BigNumber$1.from(0), this.amount.token);
+        for (const fee of this.secondaryFees) {
+            const feeAmount = this.amount.value
+                .mul(fee.basisPoints)
                 .div(BASIS_POINT_PRECISION);
-            totalFees = totalFees.add(feeAmount);
+            totalFees = addAmount(totalFees, newAmount(feeAmount, this.amount.token));
         }
         return totalFees;
     }
@@ -27092,11 +27363,11 @@ const zeroNativeCurrencyValue = '0x00';
 const multicallWithDeadlineFunctionSignature = 'multicall(uint256,bytes[])';
 function buildSwapParametersForSinglePoolSwap(fromAddress, trade, route, amountIn, amountOut, secondaryFees, secondaryFeeContract) {
     const secondaryFeeValues = secondaryFees.map((fee) => ({
-        feePrcntBasisPoints: fee.feeBasisPoints,
-        recipient: fee.feeRecipient,
+        feeBasisPoints: fee.basisPoints,
+        recipient: fee.recipient,
     }));
     if (trade.tradeType === TradeType.EXACT_INPUT) {
-        return secondaryFeeContract.encodeFunctionData('exactInputSingleWithServiceFee', [secondaryFeeValues, {
+        return secondaryFeeContract.encodeFunctionData('exactInputSingleWithSecondaryFee', [secondaryFeeValues, {
                 tokenIn: route.tokenPath[0].address,
                 tokenOut: route.tokenPath[1].address,
                 fee: route.pools[0].fee,
@@ -27106,7 +27377,7 @@ function buildSwapParametersForSinglePoolSwap(fromAddress, trade, route, amountI
                 sqrtPriceLimitX96: 0,
             }]);
     }
-    return secondaryFeeContract.encodeFunctionData('exactOutputSingleWithServiceFee', [secondaryFeeValues, {
+    return secondaryFeeContract.encodeFunctionData('exactOutputSingleWithSecondaryFee', [secondaryFeeValues, {
             tokenIn: route.tokenPath[0].address,
             tokenOut: route.tokenPath[1].address,
             fee: route.pools[0].fee,
@@ -27119,18 +27390,18 @@ function buildSwapParametersForSinglePoolSwap(fromAddress, trade, route, amountI
 function buildSwapParametersForMultiPoolSwap(fromAddress, trade, route, amountIn, amountOut, secondaryFees, secondaryFeeContract) {
     const path = encodeRouteToPath(route, trade.tradeType === TradeType.EXACT_OUTPUT);
     const secondaryFeeValues = secondaryFees.map((fee) => ({
-        feePrcntBasisPoints: fee.feeBasisPoints,
-        recipient: fee.feeRecipient,
+        feeBasisPoints: fee.basisPoints,
+        recipient: fee.recipient,
     }));
     if (trade.tradeType === TradeType.EXACT_INPUT) {
-        return secondaryFeeContract.encodeFunctionData('exactInputWithServiceFee', [secondaryFeeValues, {
+        return secondaryFeeContract.encodeFunctionData('exactInputWithSecondaryFee', [secondaryFeeValues, {
                 path,
                 recipient: fromAddress,
                 amountIn,
                 amountOutMinimum: amountOut,
             }]);
     }
-    return secondaryFeeContract.encodeFunctionData('exactOutputWithServiceFee', [secondaryFeeValues, {
+    return secondaryFeeContract.encodeFunctionData('exactOutputWithSecondaryFee', [secondaryFeeValues, {
             path,
             recipient: fromAddress,
             amountInMaximum: amountIn,
@@ -27166,8 +27437,8 @@ function createSwapParameters(adjustedQuote, fromAddress, slippage, deadline, se
     // Create an unchecked trade to be used in generating swap parameters.
     const uncheckedTrade = Trade.createUncheckedTrade({
         route: adjustedQuote.route,
-        inputAmount: CurrencyAmount.fromRawAmount(adjustedQuote.tokenIn, adjustedQuote.amountIn.toString()),
-        outputAmount: CurrencyAmount.fromRawAmount(adjustedQuote.tokenOut, adjustedQuote.amountOut.toString()),
+        inputAmount: toCurrencyAmount(adjustedQuote.amountIn),
+        outputAmount: toCurrencyAmount(adjustedQuote.amountOut),
         tradeType: adjustedQuote.tradeType,
     });
     const slippageTolerance = slippageToFraction(slippage);
@@ -27205,8 +27476,6 @@ function prepareSwap(ourQuote, amountSpecified, fees) {
         return {
             gasEstimate: ourQuote.gasEstimate,
             route: ourQuote.route,
-            tokenIn: ourQuote.tokenIn,
-            tokenOut: ourQuote.tokenOut,
             amountIn: fees.amountWithFeesApplied(),
             amountOut: amountSpecified,
             tradeType: ourQuote.tradeType,
@@ -27215,8 +27484,6 @@ function prepareSwap(ourQuote, amountSpecified, fees) {
     return {
         gasEstimate: ourQuote.gasEstimate,
         route: ourQuote.route,
-        tokenIn: ourQuote.tokenIn,
-        tokenOut: ourQuote.tokenOut,
         amountIn: amountSpecified,
         amountOut: ourQuote.amountOut,
         tradeType: ourQuote.tradeType,
@@ -27229,7 +27496,7 @@ const CONTRACTS_FOR_CHAIN_ID = {
         coreFactory: '0x8AC26EfCbf5D700b37A27aA00E6934e6904e7B8e',
         quoterV2: '0x0Afe6F5f4DC34461A801420634239FFaD50A2e44',
         peripheryRouter: '0x87854A7D4b9BaC3D37f4516A1Ac7F36fB5ad539f',
-        secondaryFee: '0x8dBE1f0900C5e92ad87A54521902a33ba1598C51',
+        secondaryFee: '0x5893A5c7bc615Dfd36D7383366d00FFFca5f7178',
     },
 };
 const SUPPORTED_SANDBOX_CHAINS = {
@@ -27262,13 +27529,13 @@ function validateOverrides(overrides) {
 function validateSecondaryFees(secondaryFees) {
     let totalSecondaryFeeBasisPoints = 0;
     for (const secondaryFee of secondaryFees) {
-        if (!isValidNonZeroAddress(secondaryFee.feeRecipient)) {
-            throw new InvalidConfigurationError(`Invalid secondary fee recipient address: ${secondaryFee.feeRecipient}`);
+        if (!isValidNonZeroAddress(secondaryFee.recipient)) {
+            throw new InvalidConfigurationError(`Invalid secondary fee recipient address: ${secondaryFee.recipient}`);
         }
-        if (secondaryFee.feeBasisPoints < 0 || secondaryFee.feeBasisPoints > MAX_SECONDARY_FEE_BASIS_POINTS) {
-            throw new InvalidConfigurationError(`Invalid secondary fee basis points: ${secondaryFee.feeBasisPoints}`);
+        if (secondaryFee.basisPoints < 0 || secondaryFee.basisPoints > MAX_SECONDARY_FEE_BASIS_POINTS) {
+            throw new InvalidConfigurationError(`Invalid secondary fee basis points: ${secondaryFee.basisPoints}`);
         }
-        totalSecondaryFeeBasisPoints += secondaryFee.feeBasisPoints;
+        totalSecondaryFeeBasisPoints += secondaryFee.basisPoints;
     }
     if (totalSecondaryFeeBasisPoints > MAX_SECONDARY_FEE_BASIS_POINTS) {
         throw new InvalidConfigurationError(`Invalid total secondary fee basis points: ${totalSecondaryFeeBasisPoints}`);
@@ -27338,12 +27605,24 @@ class Exchange {
         assert(slippagePercent <= 50, new InvalidSlippageError('slippage percent must be less than or equal to 50'));
         assert(slippagePercent >= 0, new InvalidSlippageError('slippage percent must be greater than or equal to 0'));
     }
+    async getSecondaryFees() {
+        if (this.secondaryFees.length === 0) {
+            return [];
+        }
+        const secondaryFeeContract = SecondaryFee__factory.connect(this.router.routingContracts.secondaryFeeAddress, this.provider);
+        if (await secondaryFeeContract.paused()) {
+            // Do not use secondary fees if the contract is paused
+            return [];
+        }
+        return this.secondaryFees;
+    }
     async getUnsignedSwapTx(fromAddress, tokenInAddress, tokenOutAddress, amount, slippagePercent, maxHops, deadline, tradeType) {
         Exchange.validate(tokenInAddress, tokenOutAddress, maxHops, slippagePercent, fromAddress);
         // get the decimals of the tokens that will be swapped
-        const [tokenInDecimals, tokenOutDecimals] = await Promise.all([
+        const [tokenInDecimals, tokenOutDecimals, secondaryFees] = await Promise.all([
             getERC20Decimals(tokenInAddress, this.provider),
             getERC20Decimals(tokenOutAddress, this.provider),
+            this.getSecondaryFees(),
         ]);
         const tokenIn = new Token(this.chainId, tokenInAddress, tokenInDecimals);
         const tokenOut = new Token(this.chainId, tokenOutAddress, tokenOutDecimals);
@@ -27351,22 +27630,24 @@ class Exchange {
         let amountSpecified;
         let otherToken;
         if (tradeType === TradeType.EXACT_INPUT) {
-            amountSpecified = CurrencyAmount.fromRawAmount(tokenIn, amount.toString());
+            amountSpecified = newAmount(amount, tokenIn);
             otherToken = tokenOut;
         }
         else {
-            amountSpecified = CurrencyAmount.fromRawAmount(tokenOut, amount.toString());
+            amountSpecified = newAmount(amount, tokenOut);
             otherToken = tokenIn;
         }
-        const fees = new Fees(this.secondaryFees, uniswapTokenToTokenInfo(tokenIn));
+        const fees = new Fees(secondaryFees, uniswapTokenToTokenInfo(tokenIn));
         const ourQuoteReqAmount = getOurQuoteReqAmount(amountSpecified, fees, tradeType);
-        const ourQuote = await this.router.findOptimalRoute(ourQuoteReqAmount, otherToken, tradeType, maxHops);
-        // get gas details
-        const gasPrice = await fetchGasPrice(this.provider);
-        const adjustedQuote = prepareSwap(ourQuote, amount, fees);
-        const swap = getSwap(this.nativeToken, adjustedQuote, fromAddress, slippagePercent, deadline, this.router.routingContracts.peripheryRouterAddress, this.router.routingContracts.secondaryFeeAddress, gasPrice, this.secondaryFees);
+        // get quote and gas details
+        const [ourQuote, gasPrice] = await Promise.all([
+            this.router.findOptimalRoute(ourQuoteReqAmount, otherToken, tradeType, maxHops),
+            fetchGasPrice(this.provider),
+        ]);
+        const adjustedQuote = prepareSwap(ourQuote, amountSpecified, fees);
+        const swap = getSwap(this.nativeToken, adjustedQuote, fromAddress, slippagePercent, deadline, this.router.routingContracts.peripheryRouterAddress, this.router.routingContracts.secondaryFeeAddress, gasPrice, secondaryFees);
         const userQuote = prepareUserQuote(otherToken, adjustedQuote, slippagePercent, fees);
-        const preparedApproval = prepareApproval(tradeType, amount, userQuote.amountWithMaxSlippage.value, this.router.routingContracts, this.secondaryFees);
+        const preparedApproval = prepareApproval(tradeType, amount, userQuote.amountWithMaxSlippage.value, this.router.routingContracts, secondaryFees);
         // we always use the tokenIn address because we are always selling the tokenIn
         const approval = await getApproval(this.nativeToken, this.provider, fromAddress, tokenInAddress, preparedApproval, gasPrice);
         return {
@@ -27472,17 +27753,6 @@ const $762782b6c862d954$export$db5daa1b5156ccfe = [
 ];
 
 
-var $aa144554f9ef124b$export$1fc8f52ad1810e52;
-(function(ItemType) {
-    ItemType["NATIVE"] = "NATIVE";
-    ItemType["ERC20"] = "ERC20";
-    ItemType["ERC721"] = "ERC721";
-})($aa144554f9ef124b$export$1fc8f52ad1810e52 || ($aa144554f9ef124b$export$1fc8f52ad1810e52 = {}));
-var $aa144554f9ef124b$export$537fa3efd10ed435;
-(function(GasTokenType) {
-    GasTokenType["NATIVE"] = "NATIVE";
-    GasTokenType["ERC20"] = "ERC20";
-})($aa144554f9ef124b$export$537fa3efd10ed435 || ($aa144554f9ef124b$export$537fa3efd10ed435 = {}));
 
 
 /**
@@ -27566,8 +27836,8 @@ var $4f91c5f280efe242$export$a75605c67ea83a5a;
 
 var $e768639828688ca3$export$2d7a51a18d87e21d;
 (function(WalletProviderName) {
-    WalletProviderName["METAMASK"] = "metamask";
     WalletProviderName["PASSPORT"] = "passport";
+    WalletProviderName["METAMASK"] = "metamask";
 })($e768639828688ca3$export$2d7a51a18d87e21d || ($e768639828688ca3$export$2d7a51a18d87e21d = {}));
 const $e768639828688ca3$export$44dde05038008549 = {
     allowMistmatchedChainId: false,
@@ -27690,6 +27960,31 @@ const $d85ad1457a3f1a83$export$3a9ebede6a150274 = new Map([
 ]);
 
 
+var $4b58188d47aafe8d$export$1fc8f52ad1810e52;
+(function(ItemType) {
+    ItemType["NATIVE"] = "NATIVE";
+    ItemType["ERC20"] = "ERC20";
+    ItemType["ERC721"] = "ERC721";
+})($4b58188d47aafe8d$export$1fc8f52ad1810e52 || ($4b58188d47aafe8d$export$1fc8f52ad1810e52 = {}));
+var $4b58188d47aafe8d$export$65c64e46348ee3c1;
+(function(TransactionOrGasType) {
+    TransactionOrGasType["TRANSACTION"] = "TRANSACTION";
+    TransactionOrGasType["GAS"] = "GAS";
+})($4b58188d47aafe8d$export$65c64e46348ee3c1 || ($4b58188d47aafe8d$export$65c64e46348ee3c1 = {}));
+var $4b58188d47aafe8d$export$537fa3efd10ed435;
+(function(GasTokenType) {
+    GasTokenType["NATIVE"] = "NATIVE";
+    GasTokenType["ERC20"] = "ERC20";
+})($4b58188d47aafe8d$export$537fa3efd10ed435 || ($4b58188d47aafe8d$export$537fa3efd10ed435 = {}));
+var $4b58188d47aafe8d$export$5d3b0ad129b9b98e;
+(function(TransactionRequirementType) {
+    TransactionRequirementType["GAS"] = "GAS";
+    TransactionRequirementType["NATIVE"] = "NATIVE";
+    TransactionRequirementType["ERC20"] = "ERC20";
+    TransactionRequirementType["ERC721"] = "ERC721";
+})($4b58188d47aafe8d$export$5d3b0ad129b9b98e || ($4b58188d47aafe8d$export$5d3b0ad129b9b98e = {}));
+
+
 
 
 /**
@@ -28024,9 +28319,13 @@ async function $5c763be0b0b81038$var$getMetaMaskProvider() {
     if (!provider || !provider.request) throw new ($a8bc256d81a5e2c1$export$b722478a3cbfa3bc)("No MetaMask provider installed.", ($a8bc256d81a5e2c1$export$e3dc0620abde7f5a).METAMASK_PROVIDER_ERROR);
     return new (Web3Provider)(provider);
 }
-async function $5c763be0b0b81038$export$500fbc0cd14cdbaa(walletProviderName) {
+async function $5c763be0b0b81038$export$500fbc0cd14cdbaa(walletProviderName, passport) {
     let provider = null;
     switch(walletProviderName){
+        case ($e768639828688ca3$export$2d7a51a18d87e21d).PASSPORT:
+            if (passport) provider = new (Web3Provider)(passport.connectEvm());
+            else throw new ($a8bc256d81a5e2c1$export$b722478a3cbfa3bc)("Passport not provided", ($a8bc256d81a5e2c1$export$e3dc0620abde7f5a).DEFAULT_PROVIDER_ERROR);
+            break;
         case ($e768639828688ca3$export$2d7a51a18d87e21d).METAMASK:
             provider = await $5c763be0b0b81038$var$getMetaMaskProvider();
             break;
@@ -28406,20 +28705,19 @@ async function $2e7bf45a7c9a9570$export$942c8de7174809fc(params, readOnlyProvide
 
 const $c147333b1f360629$export$92589613aaa38e1f = 300000;
 const $c147333b1f360629$export$dea9ce0e9bb2441c = "0x474989C4D25DD41B0B9b1ECb4643B9Fe25f83B19";
-const $c147333b1f360629$export$5baee63457fa7911 = (type, amount, contractAddress)=>{
+const $c147333b1f360629$export$4249179755829904 = (type, contractAddress, amount)=>{
     switch(type){
-        case ($aa144554f9ef124b$export$1fc8f52ad1810e52).ERC20:
-        case ($aa144554f9ef124b$export$1fc8f52ad1810e52).ERC721:
+        case ($4b58188d47aafe8d$export$1fc8f52ad1810e52).ERC20:
             return {
                 type: type,
                 amount: amount,
                 contractAddress: contractAddress,
-                approvalContractAddress: $c147333b1f360629$export$dea9ce0e9bb2441c
+                spenderAddress: $c147333b1f360629$export$dea9ce0e9bb2441c
             };
-        case ($aa144554f9ef124b$export$1fc8f52ad1810e52).NATIVE:
+        case ($4b58188d47aafe8d$export$1fc8f52ad1810e52).NATIVE:
         default:
             return {
-                type: ($aa144554f9ef124b$export$1fc8f52ad1810e52).NATIVE,
+                type: ($4b58188d47aafe8d$export$1fc8f52ad1810e52).NATIVE,
                 amount: amount
             };
     }
@@ -28436,19 +28734,15 @@ const $c147333b1f360629$export$7f8e2b98eca5a7f0 = async (config, provider, order
         });
     }
     let amount = (BigNumber$1).from("0");
-    let type = ($aa144554f9ef124b$export$1fc8f52ad1810e52).NATIVE;
+    let type = ($4b58188d47aafe8d$export$1fc8f52ad1810e52).NATIVE;
     let contractAddress = "";
     const buyArray = order.result.buy;
     if (buyArray.length > 0) switch(buyArray[0].item_type){
         case "NATIVE":
-            type = ($aa144554f9ef124b$export$1fc8f52ad1810e52).NATIVE;
+            type = ($4b58188d47aafe8d$export$1fc8f52ad1810e52).NATIVE;
             break;
         case "ERC20":
-            type = ($aa144554f9ef124b$export$1fc8f52ad1810e52).ERC20;
-            contractAddress = buyArray[0].contract_address;
-            break;
-        case "ERC721":
-            type = ($aa144554f9ef124b$export$1fc8f52ad1810e52).ERC721;
+            type = ($4b58188d47aafe8d$export$1fc8f52ad1810e52).ERC20;
             contractAddress = buyArray[0].contract_address;
             break;
         default:
@@ -28457,19 +28751,19 @@ const $c147333b1f360629$export$7f8e2b98eca5a7f0 = async (config, provider, order
             });
     }
     buyArray.forEach((item)=>{
-        amount = amount.add((BigNumber$1).from(item.start_amount));
+        if (item.item_type !== ($4b58188d47aafe8d$export$1fc8f52ad1810e52).ERC721) amount = amount.add((BigNumber$1).from(item.start_amount));
     });
     const feeArray = order.result.fees;
     feeArray.forEach((item)=>{
         amount = amount.add((BigNumber$1).from(item.amount));
     });
-    const requirements = [
-        $c147333b1f360629$export$5baee63457fa7911(type, amount, contractAddress)
+    const itemRequirements = [
+        $c147333b1f360629$export$4249179755829904(type, contractAddress, amount)
     ];
     return {
-        requirements: requirements,
-        gas: {
-            type: ($aa144554f9ef124b$export$537fa3efd10ed435).NATIVE,
+        itemRequirements: itemRequirements,
+        gasToken: {
+            type: ($4b58188d47aafe8d$export$537fa3efd10ed435).NATIVE,
             limit: (BigNumber$1).from($c147333b1f360629$export$92589613aaa38e1f)
         }
     };
@@ -28480,6 +28774,45 @@ const $c147333b1f360629$export$7f8e2b98eca5a7f0 = async (config, provider, order
 
 
 
+const $0e7419077c373b24$export$9e073f9ada8c81e6 = async (provider, itemRequirements, transactionOrGasAmount)=>{
+    // eslint-disable-next-line no-console
+    console.log(provider, itemRequirements, transactionOrGasAmount);
+    return {
+        sufficient: true,
+        transactionRequirements: [
+            {
+                type: ($4b58188d47aafe8d$export$5d3b0ad129b9b98e).GAS,
+                sufficient: true,
+                required: {
+                    balance: (BigNumber$1).from(0),
+                    formattedBalance: "0",
+                    token: {
+                        name: "IMX",
+                        symbol: "IMX",
+                        address: "0x0",
+                        decimals: 18
+                    }
+                },
+                current: {
+                    balance: (BigNumber$1).from(1),
+                    formattedBalance: "1",
+                    token: {
+                        name: "IMX",
+                        symbol: "IMX",
+                        address: "0x0",
+                        decimals: 18
+                    }
+                }
+            }
+        ]
+    };
+};
+
+
+
+
+
+
 
 
 async function $0e0060cb42e136d2$export$339cb2be73677b30(config, existingReadOnlyProviders) {
@@ -28518,7 +28851,7 @@ class $a8cb37a3fc8eb863$export$1f60ba4ec72508a0 {
    * @param {CreateProviderParams} params - The parameters for creating the provider.
    * @returns {Promise<CreateProviderResult>} A promise that resolves to the created provider.
    */ async createProvider(params) {
-        return await $5c763be0b0b81038$export$500fbc0cd14cdbaa(params.walletProvider);
+        return await $5c763be0b0b81038$export$500fbc0cd14cdbaa(params.walletProvider, params.passport);
     }
     /**
    * Checks if a wallet is connected to the specified provider.
@@ -28619,12 +28952,23 @@ class $a8cb37a3fc8eb863$export$1f60ba4ec72508a0 {
    * Determines the requirements for performing a buy.
    * @param {BuyParams} params - The parameters for the buy.
   */ async buy(params) {
+        if (this.config.isProduction) throw new Error("This endpoint is not currently available.");
         // eslint-disable-next-line no-console
         console.warn("This endpoint is currently under construction.");
         const web3Provider = await $bb88265fe45a0393$export$9e1fd9cc88c637a0(this.config, params.provider);
         await $c147333b1f360629$export$7f8e2b98eca5a7f0(this.config, web3Provider, params.orderId);
     }
     /**
+   * Determines the transaction requirements to complete a purchase.
+   * @params {SmartCheckoutParams} params - The parameters for smart checkout.
+   */ async smartCheckout(params) {
+        if (this.config.isProduction) throw new Error("This endpoint is not currently available.");
+        // eslint-disable-next-line no-console
+        console.warn("This endpoint is currently under construction.");
+        const web3Provider = await $bb88265fe45a0393$export$9e1fd9cc88c637a0(this.config, params.provider);
+        await $0e7419077c373b24$export$9e073f9ada8c81e6(web3Provider, params.itemRequirements, params.transactionOrGasAmount);
+    }
+    /**
    * Checks if the given object is a Web3 provider.
    * @param {Web3Provider} web3Provider - The object to check.
    * @returns {boolean} - True if the object is a Web3 provider, false otherwise.
@@ -28658,7 +29002,7 @@ var checkout_sdk = /*#__PURE__*/Object.freeze({
 function $parcel$export(e, n, v, s) {
   Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});
 }
-const $d663162fd5a0853f$export$38a083d9fb5551ca = "0.8.0-alpha";
+const $d663162fd5a0853f$export$38a083d9fb5551ca = "0.11.0-alpha";
 const $d663162fd5a0853f$export$83bf90b30cdfd29f = ()=>false;
 const $d663162fd5a0853f$export$1169f5475725171b = ()=>$d663162fd5a0853f$export$38a083d9fb5551ca;