@imtbl/sdk 0.38.0 → 0.39.1

package/dist/index.js

@@ -14,7 +14,7 @@ import { walletContracts } from '@0xsequence/abi';
 import { v1 } from '@0xsequence/core';
 import FormData$2 from 'form-data';
 import { Seaport as Seaport$1 } from '@opensea/seaport-js';
-import { parseUnits as parseUnits$1 } from '@ethersproject/units';
+import { parseUnits } from '@ethersproject/units';
 import { BigNumber as BigNumber$2 } from '@ethersproject/bignumber';
 import detectEthereumProvider from '@metamask/detect-provider';
 import * as Uniswap from '@uniswap/sdk-core';
@@ -4234,7 +4234,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.38.0' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.39.1' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -4294,7 +4294,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.38.0',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.39.1',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -4733,7 +4733,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.38.0',
+    sdkVersion: 'ts-immutable-sdk-0.39.1',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -13697,7 +13697,7 @@ async function depositEth({ signers: { ethSigner }, deposit, config, }) {
     const data = {
         decimals: 18,
     };
-    const amount = parseUnits$1(deposit.amount, 'wei');
+    const amount = parseUnits(deposit.amount, 'wei');
     const imxConfig = config.immutableXConfig;
     const depositsApi = new DepositsApi(imxConfig.apiConfiguration);
     const encodingApi = new EncodingApi(imxConfig.apiConfiguration);
@@ -13760,7 +13760,7 @@ async function depositERC20({ signers: { ethSigner }, deposit, config, }) {
         decimals,
         token_address: deposit.tokenAddress,
     };
-    const amount = parseUnits$1(deposit.amount, 0); // 0 to always use undecimalized value
+    const amount = parseUnits(deposit.amount, 0); // 0 to always use undecimalized value
     // Approve whether an amount of token from an account can be spent by a third-party account
     const tokenContract = Contracts.IERC20.connect(deposit.tokenAddress, ethSigner);
     const approveTransaction = await tokenContract.populateTransaction.approve(ethConfiguration.coreContractAddress, amount);
@@ -20867,7 +20867,7 @@ var require$$0 = /*@__PURE__*/getAugmentedNamespace(_nodeResolve_empty$1);
 var bnExports = bn.exports;
 var BN$1 = /*@__PURE__*/getDefaultExportFromCjs(bnExports);
 
-const version$c = "logger/5.7.0";
+const version$b = "logger/5.7.0";
 
 let _permanentCensorErrors = false;
 let _censorErrors = false;
@@ -21182,7 +21182,7 @@ class Logger {
     }
     static globalLogger() {
         if (!_globalLogger) {
-            _globalLogger = new Logger(version$c);
+            _globalLogger = new Logger(version$b);
         }
         return _globalLogger;
     }
@@ -21218,9 +21218,9 @@ class Logger {
 Logger.errors = ErrorCode;
 Logger.levels = LogLevel;
 
-const version$b = "bytes/5.7.0";
+const version$a = "bytes/5.7.0";
 
-const logger$g = new Logger(version$b);
+const logger$e = new Logger(version$a);
 ///////////////////////////////
 function isHexable(value) {
     return !!(value.toHexString);
@@ -21267,7 +21267,7 @@ function arrayify(value, options) {
         options = {};
     }
     if (typeof (value) === "number") {
-        logger$g.checkSafeUint53(value, "invalid arrayify value");
+        logger$e.checkSafeUint53(value, "invalid arrayify value");
         const result = [];
         while (value) {
             result.unshift(value & 0xff);
@@ -21294,7 +21294,7 @@ function arrayify(value, options) {
                 hex += "0";
             }
             else {
-                logger$g.throwArgumentError("hex data is odd-length", "value", value);
+                logger$e.throwArgumentError("hex data is odd-length", "value", value);
             }
         }
         const result = [];
@@ -21306,7 +21306,7 @@ function arrayify(value, options) {
     if (isBytes(value)) {
         return addSlice(new Uint8Array(value));
     }
-    return logger$g.throwArgumentError("invalid arrayify value", "value", value);
+    return logger$e.throwArgumentError("invalid arrayify value", "value", value);
 }
 function concat(items) {
     const objects = items.map(item => arrayify(item));
@@ -21349,7 +21349,7 @@ function hexlify(value, options) {
         options = {};
     }
     if (typeof (value) === "number") {
-        logger$g.checkSafeUint53(value, "invalid hexlify value");
+        logger$e.checkSafeUint53(value, "invalid hexlify value");
         let hex = "";
         while (value) {
             hex = HexCharacters[value & 0xf] + hex;
@@ -21385,7 +21385,7 @@ function hexlify(value, options) {
                 value += "0";
             }
             else {
-                logger$g.throwArgumentError("hex data is odd-length", "value", value);
+                logger$e.throwArgumentError("hex data is odd-length", "value", value);
             }
         }
         return value.toLowerCase();
@@ -21398,7 +21398,7 @@ function hexlify(value, options) {
         }
         return result;
     }
-    return logger$g.throwArgumentError("invalid hexlify value", "value", value);
+    return logger$e.throwArgumentError("invalid hexlify value", "value", value);
 }
 /*
 function unoddify(value: BytesLike | Hexable | number): BytesLike | Hexable | number {
@@ -21422,7 +21422,7 @@ function hexDataSlice(data, offset, endOffset) {
         data = hexlify(data);
     }
     else if (!isHexString(data) || (data.length % 2)) {
-        logger$g.throwArgumentError("invalid hexData", "value", data);
+        logger$e.throwArgumentError("invalid hexData", "value", data);
     }
     offset = 2 + 2 * offset;
     if (endOffset != null) {
@@ -21442,10 +21442,10 @@ function hexZeroPad(value, length) {
         value = hexlify(value);
     }
     else if (!isHexString(value)) {
-        logger$g.throwArgumentError("invalid hex string", "value", value);
+        logger$e.throwArgumentError("invalid hex string", "value", value);
     }
     if (value.length > 2 * length + 2) {
-        logger$g.throwArgumentError("value out of range", "value", arguments[1]);
+        logger$e.throwArgumentError("value out of range", "value", arguments[1]);
     }
     while (value.length < 2 * length + 2) {
         value = "0x0" + value.substring(2);
@@ -21453,26 +21453,18 @@ function hexZeroPad(value, length) {
     return value;
 }
 
-const version$a = "bignumber/5.7.0";
+const version$9 = "bignumber/5.7.0";
 
 var BN = BN$1.BN;
-const logger$f = new Logger(version$a);
-const _constructorGuard$2 = {};
+const logger$d = new Logger(version$9);
+const _constructorGuard$1 = {};
 const MAX_SAFE = 0x1fffffffffffff;
-function isBigNumberish(value) {
-    return (value != null) && (BigNumber.isBigNumber(value) ||
-        (typeof (value) === "number" && (value % 1) === 0) ||
-        (typeof (value) === "string" && !!value.match(/^-?[0-9]+$/)) ||
-        isHexString(value) ||
-        (typeof (value) === "bigint") ||
-        isBytes(value));
-}
 // Only warn about passing 10 into radix once
 let _warnedToStringRadix = false;
 class BigNumber {
     constructor(constructorGuard, hex) {
-        if (constructorGuard !== _constructorGuard$2) {
-            logger$f.throwError("cannot call constructor directly; use BigNumber.from", Logger.errors.UNSUPPORTED_OPERATION, {
+        if (constructorGuard !== _constructorGuard$1) {
+            logger$d.throwError("cannot call constructor directly; use BigNumber.from", Logger.errors.UNSUPPORTED_OPERATION, {
                 operation: "new (BigNumber)"
             });
         }
@@ -21501,7 +21493,7 @@ class BigNumber {
     div(other) {
         const o = BigNumber.from(other);
         if (o.isZero()) {
-            throwFault$1("division-by-zero", "div");
+            throwFault("division-by-zero", "div");
         }
         return toBigNumber(toBN(this).div(toBN(other)));
     }
@@ -21511,53 +21503,53 @@ class BigNumber {
     mod(other) {
         const value = toBN(other);
         if (value.isNeg()) {
-            throwFault$1("division-by-zero", "mod");
+            throwFault("division-by-zero", "mod");
         }
         return toBigNumber(toBN(this).umod(value));
     }
     pow(other) {
         const value = toBN(other);
         if (value.isNeg()) {
-            throwFault$1("negative-power", "pow");
+            throwFault("negative-power", "pow");
         }
         return toBigNumber(toBN(this).pow(value));
     }
     and(other) {
         const value = toBN(other);
         if (this.isNegative() || value.isNeg()) {
-            throwFault$1("unbound-bitwise-result", "and");
+            throwFault("unbound-bitwise-result", "and");
         }
         return toBigNumber(toBN(this).and(value));
     }
     or(other) {
         const value = toBN(other);
         if (this.isNegative() || value.isNeg()) {
-            throwFault$1("unbound-bitwise-result", "or");
+            throwFault("unbound-bitwise-result", "or");
         }
         return toBigNumber(toBN(this).or(value));
     }
     xor(other) {
         const value = toBN(other);
         if (this.isNegative() || value.isNeg()) {
-            throwFault$1("unbound-bitwise-result", "xor");
+            throwFault("unbound-bitwise-result", "xor");
         }
         return toBigNumber(toBN(this).xor(value));
     }
     mask(value) {
         if (this.isNegative() || value < 0) {
-            throwFault$1("negative-width", "mask");
+            throwFault("negative-width", "mask");
         }
         return toBigNumber(toBN(this).maskn(value));
     }
     shl(value) {
         if (this.isNegative() || value < 0) {
-            throwFault$1("negative-width", "shl");
+            throwFault("negative-width", "shl");
         }
         return toBigNumber(toBN(this).shln(value));
     }
     shr(value) {
         if (this.isNegative() || value < 0) {
-            throwFault$1("negative-width", "shr");
+            throwFault("negative-width", "shr");
         }
         return toBigNumber(toBN(this).shrn(value));
     }
@@ -21587,7 +21579,7 @@ class BigNumber {
             return toBN(this).toNumber();
         }
         catch (error) {
-            throwFault$1("overflow", "toNumber", this.toString());
+            throwFault("overflow", "toNumber", this.toString());
         }
         return null;
     }
@@ -21596,7 +21588,7 @@ class BigNumber {
             return BigInt(this.toString());
         }
         catch (e) { }
-        return logger$f.throwError("this platform does not support BigInt", Logger.errors.UNSUPPORTED_OPERATION, {
+        return logger$d.throwError("this platform does not support BigInt", Logger.errors.UNSUPPORTED_OPERATION, {
             value: this.toString()
         });
     }
@@ -21606,14 +21598,14 @@ class BigNumber {
             if (arguments[0] === 10) {
                 if (!_warnedToStringRadix) {
                     _warnedToStringRadix = true;
-                    logger$f.warn("BigNumber.toString does not accept any parameters; base-10 is assumed");
+                    logger$d.warn("BigNumber.toString does not accept any parameters; base-10 is assumed");
                 }
             }
             else if (arguments[0] === 16) {
-                logger$f.throwError("BigNumber.toString does not accept any parameters; use bigNumber.toHexString()", Logger.errors.UNEXPECTED_ARGUMENT, {});
+                logger$d.throwError("BigNumber.toString does not accept any parameters; use bigNumber.toHexString()", Logger.errors.UNEXPECTED_ARGUMENT, {});
             }
             else {
-                logger$f.throwError("BigNumber.toString does not accept parameters", Logger.errors.UNEXPECTED_ARGUMENT, {});
+                logger$d.throwError("BigNumber.toString does not accept parameters", Logger.errors.UNEXPECTED_ARGUMENT, {});
             }
         }
         return toBN(this).toString(10);
@@ -21630,19 +21622,19 @@ class BigNumber {
         }
         if (typeof (value) === "string") {
             if (value.match(/^-?0x[0-9a-f]+$/i)) {
-                return new BigNumber(_constructorGuard$2, toHex(value));
+                return new BigNumber(_constructorGuard$1, toHex(value));
             }
             if (value.match(/^-?[0-9]+$/)) {
-                return new BigNumber(_constructorGuard$2, toHex(new BN(value)));
+                return new BigNumber(_constructorGuard$1, toHex(new BN(value)));
             }
-            return logger$f.throwArgumentError("invalid BigNumber string", "value", value);
+            return logger$d.throwArgumentError("invalid BigNumber string", "value", value);
         }
         if (typeof (value) === "number") {
             if (value % 1) {
-                throwFault$1("underflow", "BigNumber.from", value);
+                throwFault("underflow", "BigNumber.from", value);
             }
             if (value >= MAX_SAFE || value <= -MAX_SAFE) {
-                throwFault$1("overflow", "BigNumber.from", value);
+                throwFault("overflow", "BigNumber.from", value);
             }
             return BigNumber.from(String(value));
         }
@@ -21675,7 +21667,7 @@ class BigNumber {
                 }
             }
         }
-        return logger$f.throwArgumentError("invalid BigNumber value", "value", value);
+        return logger$d.throwArgumentError("invalid BigNumber value", "value", value);
     }
     static isBigNumber(value) {
         return !!(value && value._isBigNumber);
@@ -21693,7 +21685,7 @@ function toHex(value) {
         value = value.substring(1);
         // Cannot have multiple negative signs (e.g. "--0x04")
         if (value[0] === "-") {
-            logger$f.throwArgumentError("invalid hex", "value", value);
+            logger$d.throwArgumentError("invalid hex", "value", value);
         }
         // Call toHex on the positive component
         value = toHex(value);
@@ -21732,373 +21724,19 @@ function toBN(value) {
     }
     return new BN(hex.substring(2), 16);
 }
-function throwFault$1(fault, operation, value) {
+function throwFault(fault, operation, value) {
     const params = { fault: fault, operation: operation };
     if (value != null) {
         params.value = value;
     }
-    return logger$f.throwError(fault, Logger.errors.NUMERIC_FAULT, params);
+    return logger$d.throwError(fault, Logger.errors.NUMERIC_FAULT, params);
 }
 // value should have no prefix
 function _base36To16(value) {
     return (new BN(value, 36)).toString(16);
 }
 
-const logger$e = new Logger(version$a);
-const _constructorGuard$1 = {};
-const Zero$1 = BigNumber.from(0);
-const NegativeOne$1 = BigNumber.from(-1);
-function throwFault(message, fault, operation, value) {
-    const params = { fault: fault, operation: operation };
-    if (value !== undefined) {
-        params.value = value;
-    }
-    return logger$e.throwError(message, Logger.errors.NUMERIC_FAULT, params);
-}
-// Constant to pull zeros from for multipliers
-let zeros = "0";
-while (zeros.length < 256) {
-    zeros += zeros;
-}
-// Returns a string "1" followed by decimal "0"s
-function getMultiplier(decimals) {
-    if (typeof (decimals) !== "number") {
-        try {
-            decimals = BigNumber.from(decimals).toNumber();
-        }
-        catch (e) { }
-    }
-    if (typeof (decimals) === "number" && decimals >= 0 && decimals <= 256 && !(decimals % 1)) {
-        return ("1" + zeros.substring(0, decimals));
-    }
-    return logger$e.throwArgumentError("invalid decimal size", "decimals", decimals);
-}
-function formatFixed(value, decimals) {
-    if (decimals == null) {
-        decimals = 0;
-    }
-    const multiplier = getMultiplier(decimals);
-    // Make sure wei is a big number (convert as necessary)
-    value = BigNumber.from(value);
-    const negative = value.lt(Zero$1);
-    if (negative) {
-        value = value.mul(NegativeOne$1);
-    }
-    let fraction = value.mod(multiplier).toString();
-    while (fraction.length < multiplier.length - 1) {
-        fraction = "0" + fraction;
-    }
-    // Strip training 0
-    fraction = fraction.match(/^([0-9]*[1-9]|0)(0*)/)[1];
-    const whole = value.div(multiplier).toString();
-    if (multiplier.length === 1) {
-        value = whole;
-    }
-    else {
-        value = whole + "." + fraction;
-    }
-    if (negative) {
-        value = "-" + value;
-    }
-    return value;
-}
-function parseFixed(value, decimals) {
-    if (decimals == null) {
-        decimals = 0;
-    }
-    const multiplier = getMultiplier(decimals);
-    if (typeof (value) !== "string" || !value.match(/^-?[0-9.]+$/)) {
-        logger$e.throwArgumentError("invalid decimal value", "value", value);
-    }
-    // Is it negative?
-    const negative = (value.substring(0, 1) === "-");
-    if (negative) {
-        value = value.substring(1);
-    }
-    if (value === ".") {
-        logger$e.throwArgumentError("missing value", "value", value);
-    }
-    // Split it into a whole and fractional part
-    const comps = value.split(".");
-    if (comps.length > 2) {
-        logger$e.throwArgumentError("too many decimal points", "value", value);
-    }
-    let whole = comps[0], fraction = comps[1];
-    if (!whole) {
-        whole = "0";
-    }
-    if (!fraction) {
-        fraction = "0";
-    }
-    // Trim trailing zeros
-    while (fraction[fraction.length - 1] === "0") {
-        fraction = fraction.substring(0, fraction.length - 1);
-    }
-    // Check the fraction doesn't exceed our decimals size
-    if (fraction.length > multiplier.length - 1) {
-        throwFault("fractional component exceeds decimals", "underflow", "parseFixed");
-    }
-    // If decimals is 0, we have an empty string for fraction
-    if (fraction === "") {
-        fraction = "0";
-    }
-    // Fully pad the string with zeros to get to wei
-    while (fraction.length < multiplier.length - 1) {
-        fraction += "0";
-    }
-    const wholeValue = BigNumber.from(whole);
-    const fractionValue = BigNumber.from(fraction);
-    let wei = (wholeValue.mul(multiplier)).add(fractionValue);
-    if (negative) {
-        wei = wei.mul(NegativeOne$1);
-    }
-    return wei;
-}
-class FixedFormat {
-    constructor(constructorGuard, signed, width, decimals) {
-        if (constructorGuard !== _constructorGuard$1) {
-            logger$e.throwError("cannot use FixedFormat constructor; use FixedFormat.from", Logger.errors.UNSUPPORTED_OPERATION, {
-                operation: "new FixedFormat"
-            });
-        }
-        this.signed = signed;
-        this.width = width;
-        this.decimals = decimals;
-        this.name = (signed ? "" : "u") + "fixed" + String(width) + "x" + String(decimals);
-        this._multiplier = getMultiplier(decimals);
-        Object.freeze(this);
-    }
-    static from(value) {
-        if (value instanceof FixedFormat) {
-            return value;
-        }
-        if (typeof (value) === "number") {
-            value = `fixed128x${value}`;
-        }
-        let signed = true;
-        let width = 128;
-        let decimals = 18;
-        if (typeof (value) === "string") {
-            if (value === "fixed") ;
-            else if (value === "ufixed") {
-                signed = false;
-            }
-            else {
-                const match = value.match(/^(u?)fixed([0-9]+)x([0-9]+)$/);
-                if (!match) {
-                    logger$e.throwArgumentError("invalid fixed format", "format", value);
-                }
-                signed = (match[1] !== "u");
-                width = parseInt(match[2]);
-                decimals = parseInt(match[3]);
-            }
-        }
-        else if (value) {
-            const check = (key, type, defaultValue) => {
-                if (value[key] == null) {
-                    return defaultValue;
-                }
-                if (typeof (value[key]) !== type) {
-                    logger$e.throwArgumentError("invalid fixed format (" + key + " not " + type + ")", "format." + key, value[key]);
-                }
-                return value[key];
-            };
-            signed = check("signed", "boolean", signed);
-            width = check("width", "number", width);
-            decimals = check("decimals", "number", decimals);
-        }
-        if (width % 8) {
-            logger$e.throwArgumentError("invalid fixed format width (not byte aligned)", "format.width", width);
-        }
-        if (decimals > 80) {
-            logger$e.throwArgumentError("invalid fixed format (decimals too large)", "format.decimals", decimals);
-        }
-        return new FixedFormat(_constructorGuard$1, signed, width, decimals);
-    }
-}
-class FixedNumber {
-    constructor(constructorGuard, hex, value, format) {
-        if (constructorGuard !== _constructorGuard$1) {
-            logger$e.throwError("cannot use FixedNumber constructor; use FixedNumber.from", Logger.errors.UNSUPPORTED_OPERATION, {
-                operation: "new FixedFormat"
-            });
-        }
-        this.format = format;
-        this._hex = hex;
-        this._value = value;
-        this._isFixedNumber = true;
-        Object.freeze(this);
-    }
-    _checkFormat(other) {
-        if (this.format.name !== other.format.name) {
-            logger$e.throwArgumentError("incompatible format; use fixedNumber.toFormat", "other", other);
-        }
-    }
-    addUnsafe(other) {
-        this._checkFormat(other);
-        const a = parseFixed(this._value, this.format.decimals);
-        const b = parseFixed(other._value, other.format.decimals);
-        return FixedNumber.fromValue(a.add(b), this.format.decimals, this.format);
-    }
-    subUnsafe(other) {
-        this._checkFormat(other);
-        const a = parseFixed(this._value, this.format.decimals);
-        const b = parseFixed(other._value, other.format.decimals);
-        return FixedNumber.fromValue(a.sub(b), this.format.decimals, this.format);
-    }
-    mulUnsafe(other) {
-        this._checkFormat(other);
-        const a = parseFixed(this._value, this.format.decimals);
-        const b = parseFixed(other._value, other.format.decimals);
-        return FixedNumber.fromValue(a.mul(b).div(this.format._multiplier), this.format.decimals, this.format);
-    }
-    divUnsafe(other) {
-        this._checkFormat(other);
-        const a = parseFixed(this._value, this.format.decimals);
-        const b = parseFixed(other._value, other.format.decimals);
-        return FixedNumber.fromValue(a.mul(this.format._multiplier).div(b), this.format.decimals, this.format);
-    }
-    floor() {
-        const comps = this.toString().split(".");
-        if (comps.length === 1) {
-            comps.push("0");
-        }
-        let result = FixedNumber.from(comps[0], this.format);
-        const hasFraction = !comps[1].match(/^(0*)$/);
-        if (this.isNegative() && hasFraction) {
-            result = result.subUnsafe(ONE.toFormat(result.format));
-        }
-        return result;
-    }
-    ceiling() {
-        const comps = this.toString().split(".");
-        if (comps.length === 1) {
-            comps.push("0");
-        }
-        let result = FixedNumber.from(comps[0], this.format);
-        const hasFraction = !comps[1].match(/^(0*)$/);
-        if (!this.isNegative() && hasFraction) {
-            result = result.addUnsafe(ONE.toFormat(result.format));
-        }
-        return result;
-    }
-    // @TODO: Support other rounding algorithms
-    round(decimals) {
-        if (decimals == null) {
-            decimals = 0;
-        }
-        // If we are already in range, we're done
-        const comps = this.toString().split(".");
-        if (comps.length === 1) {
-            comps.push("0");
-        }
-        if (decimals < 0 || decimals > 80 || (decimals % 1)) {
-            logger$e.throwArgumentError("invalid decimal count", "decimals", decimals);
-        }
-        if (comps[1].length <= decimals) {
-            return this;
-        }
-        const factor = FixedNumber.from("1" + zeros.substring(0, decimals), this.format);
-        const bump = BUMP.toFormat(this.format);
-        return this.mulUnsafe(factor).addUnsafe(bump).floor().divUnsafe(factor);
-    }
-    isZero() {
-        return (this._value === "0.0" || this._value === "0");
-    }
-    isNegative() {
-        return (this._value[0] === "-");
-    }
-    toString() { return this._value; }
-    toHexString(width) {
-        if (width == null) {
-            return this._hex;
-        }
-        if (width % 8) {
-            logger$e.throwArgumentError("invalid byte width", "width", width);
-        }
-        const hex = BigNumber.from(this._hex).fromTwos(this.format.width).toTwos(width).toHexString();
-        return hexZeroPad(hex, width / 8);
-    }
-    toUnsafeFloat() { return parseFloat(this.toString()); }
-    toFormat(format) {
-        return FixedNumber.fromString(this._value, format);
-    }
-    static fromValue(value, decimals, format) {
-        // If decimals looks more like a format, and there is no format, shift the parameters
-        if (format == null && decimals != null && !isBigNumberish(decimals)) {
-            format = decimals;
-            decimals = null;
-        }
-        if (decimals == null) {
-            decimals = 0;
-        }
-        if (format == null) {
-            format = "fixed";
-        }
-        return FixedNumber.fromString(formatFixed(value, decimals), FixedFormat.from(format));
-    }
-    static fromString(value, format) {
-        if (format == null) {
-            format = "fixed";
-        }
-        const fixedFormat = FixedFormat.from(format);
-        const numeric = parseFixed(value, fixedFormat.decimals);
-        if (!fixedFormat.signed && numeric.lt(Zero$1)) {
-            throwFault("unsigned value cannot be negative", "overflow", "value", value);
-        }
-        let hex = null;
-        if (fixedFormat.signed) {
-            hex = numeric.toTwos(fixedFormat.width).toHexString();
-        }
-        else {
-            hex = numeric.toHexString();
-            hex = hexZeroPad(hex, fixedFormat.width / 8);
-        }
-        const decimal = formatFixed(numeric, fixedFormat.decimals);
-        return new FixedNumber(_constructorGuard$1, hex, decimal, fixedFormat);
-    }
-    static fromBytes(value, format) {
-        if (format == null) {
-            format = "fixed";
-        }
-        const fixedFormat = FixedFormat.from(format);
-        if (arrayify(value).length > fixedFormat.width / 8) {
-            throw new Error("overflow");
-        }
-        let numeric = BigNumber.from(value);
-        if (fixedFormat.signed) {
-            numeric = numeric.fromTwos(fixedFormat.width);
-        }
-        const hex = numeric.toTwos((fixedFormat.signed ? 0 : 1) + fixedFormat.width).toHexString();
-        const decimal = formatFixed(numeric, fixedFormat.decimals);
-        return new FixedNumber(_constructorGuard$1, hex, decimal, fixedFormat);
-    }
-    static from(value, format) {
-        if (typeof (value) === "string") {
-            return FixedNumber.fromString(value, format);
-        }
-        if (isBytes(value)) {
-            return FixedNumber.fromBytes(value, format);
-        }
-        try {
-            return FixedNumber.fromValue(value, 0, format);
-        }
-        catch (error) {
-            // Allow NUMERIC_FAULT to bubble up
-            if (error.code !== Logger.errors.INVALID_ARGUMENT) {
-                throw error;
-            }
-        }
-        return logger$e.throwArgumentError("invalid FixedNumber value", "value", value);
-    }
-    static isFixedNumber(value) {
-        return !!(value && value._isFixedNumber);
-    }
-}
-const ONE = FixedNumber.from(1);
-const BUMP = FixedNumber.from("0.5");
-
-const version$9 = "properties/5.7.0";
+const version$8 = "properties/5.7.0";
 
 var __awaiter$3 = function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -22109,7 +21747,7 @@ var __awaiter$3 = function (thisArg, _arguments, P, generator) {
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const logger$d = new Logger(version$9);
+const logger$c = new Logger(version$8);
 function defineReadOnly(object, name, value) {
     Object.defineProperty(object, name, {
         enumerable: true,
@@ -22177,7 +21815,7 @@ function _isFrozen(object) {
         }
         return true;
     }
-    return logger$d.throwArgumentError(`Cannot deepCopy ${typeof (object)}`, "object", object);
+    return logger$c.throwArgumentError(`Cannot deepCopy ${typeof (object)}`, "object", object);
 }
 // Returns a new copy of object, such that no properties may be replaced.
 // New properties may be added only to objects.
@@ -22200,7 +21838,7 @@ function _deepCopy(object) {
         }
         return result;
     }
-    return logger$d.throwArgumentError(`Cannot deepCopy ${typeof (object)}`, "object", object);
+    return logger$c.throwArgumentError(`Cannot deepCopy ${typeof (object)}`, "object", object);
 }
 function deepCopy(object) {
     return _deepCopy(object);
@@ -22213,9 +21851,9 @@ class Description {
     }
 }
 
-const version$8 = "abi/5.7.0";
+const version$7 = "abi/5.7.0";
 
-const logger$c = new Logger(version$8);
+const logger$b = new Logger(version$7);
 const _constructorGuard = {};
 let ModifiersBytes = { calldata: true, memory: true, storage: true };
 let ModifiersNest = { calldata: true, memory: true };
@@ -22236,7 +21874,7 @@ function checkModifier(type, name) {
         }
     }
     if (ModifiersBytes[name] || name === "payable") {
-        logger$c.throwArgumentError("invalid modifier", "name", name);
+        logger$b.throwArgumentError("invalid modifier", "name", name);
     }
     return false;
 }
@@ -22244,7 +21882,7 @@ function checkModifier(type, name) {
 function parseParamType(param, allowIndexed) {
     let originalParam = param;
     function throwError(i) {
-        logger$c.throwArgumentError(`unexpected character at position ${i}`, "param", param);
+        logger$b.throwArgumentError(`unexpected character at position ${i}`, "param", param);
     }
     param = param.replace(/\s/g, " ");
     function newNode(parent) {
@@ -22383,7 +22021,7 @@ function parseParamType(param, allowIndexed) {
         }
     }
     if (node.parent) {
-        logger$c.throwArgumentError("unexpected eof", "param", param);
+        logger$b.throwArgumentError("unexpected eof", "param", param);
     }
     delete parent.state;
     if (node.name === "indexed") {
@@ -22421,7 +22059,7 @@ const paramTypeArray = new RegExp(/^(.*)\[([0-9]*)\]$/);
 class ParamType {
     constructor(constructorGuard, params) {
         if (constructorGuard !== _constructorGuard) {
-            logger$c.throwError("use fromString", Logger.errors.UNSUPPORTED_OPERATION, {
+            logger$b.throwError("use fromString", Logger.errors.UNSUPPORTED_OPERATION, {
                 operation: "new ParamType()"
             });
         }
@@ -22456,7 +22094,7 @@ class ParamType {
             format = FormatTypes.sighash;
         }
         if (!FormatTypes[format]) {
-            logger$c.throwArgumentError("invalid format type", "format", format);
+            logger$b.throwArgumentError("invalid format type", "format", format);
         }
         if (format === FormatTypes.json) {
             let result = {
@@ -22536,7 +22174,7 @@ function parseParams(value, allowIndex) {
 class Fragment {
     constructor(constructorGuard, params) {
         if (constructorGuard !== _constructorGuard) {
-            logger$c.throwError("use a static from method", Logger.errors.UNSUPPORTED_OPERATION, {
+            logger$b.throwError("use a static from method", Logger.errors.UNSUPPORTED_OPERATION, {
                 operation: "new Fragment()"
             });
         }
@@ -22571,7 +22209,7 @@ class Fragment {
                 // @TODO: Something? Maybe return a FunctionFragment? A custom DefaultFunctionFragment?
                 return null;
         }
-        return logger$c.throwArgumentError("invalid fragment object", "value", value);
+        return logger$b.throwArgumentError("invalid fragment object", "value", value);
     }
     static fromString(value) {
         // Make sure the "returns" is surrounded by a space and all whitespace is exactly one space
@@ -22590,7 +22228,7 @@ class Fragment {
         else if (value.split(" ")[0] === "error") {
             return ErrorFragment.fromString(value.substring(5).trim());
         }
-        return logger$c.throwArgumentError("unsupported fragment", "value", value);
+        return logger$b.throwArgumentError("unsupported fragment", "value", value);
     }
     static isFragment(value) {
         return !!(value && value._isFragment);
@@ -22602,7 +22240,7 @@ class EventFragment extends Fragment {
             format = FormatTypes.sighash;
         }
         if (!FormatTypes[format]) {
-            logger$c.throwArgumentError("invalid format type", "format", format);
+            logger$b.throwArgumentError("invalid format type", "format", format);
         }
         if (format === FormatTypes.json) {
             return JSON.stringify({
@@ -22635,7 +22273,7 @@ class EventFragment extends Fragment {
             return value;
         }
         if (value.type !== "event") {
-            logger$c.throwArgumentError("invalid event object", "value", value);
+            logger$b.throwArgumentError("invalid event object", "value", value);
         }
         const params = {
             name: verifyIdentifier(value.name),
@@ -22648,7 +22286,7 @@ class EventFragment extends Fragment {
     static fromString(value) {
         let match = value.match(regexParen);
         if (!match) {
-            logger$c.throwArgumentError("invalid event string", "value", value);
+            logger$b.throwArgumentError("invalid event string", "value", value);
         }
         let anonymous = false;
         match[3].split(" ").forEach((modifier) => {
@@ -22659,7 +22297,7 @@ class EventFragment extends Fragment {
                 case "":
                     break;
                 default:
-                    logger$c.warn("unknown modifier: " + modifier);
+                    logger$b.warn("unknown modifier: " + modifier);
             }
         });
         return EventFragment.fromObject({
@@ -22678,10 +22316,10 @@ function parseGas(value, params) {
     let comps = value.split("@");
     if (comps.length !== 1) {
         if (comps.length > 2) {
-            logger$c.throwArgumentError("invalid human-readable ABI signature", "value", value);
+            logger$b.throwArgumentError("invalid human-readable ABI signature", "value", value);
         }
         if (!comps[1].match(/^[0-9]+$/)) {
-            logger$c.throwArgumentError("invalid human-readable ABI signature gas", "value", value);
+            logger$b.throwArgumentError("invalid human-readable ABI signature gas", "value", value);
         }
         params.gas = BigNumber.from(comps[1]);
         return comps[0];
@@ -22734,14 +22372,14 @@ function verifyState(value) {
         result.constant = (result.stateMutability === "view" || result.stateMutability === "pure");
         if (value.constant != null) {
             if ((!!value.constant) !== result.constant) {
-                logger$c.throwArgumentError("cannot have constant function with mutability " + result.stateMutability, "value", value);
+                logger$b.throwArgumentError("cannot have constant function with mutability " + result.stateMutability, "value", value);
             }
         }
         // Set (and check things are consistent) the payable property
         result.payable = (result.stateMutability === "payable");
         if (value.payable != null) {
             if ((!!value.payable) !== result.payable) {
-                logger$c.throwArgumentError("cannot have payable function with mutability " + result.stateMutability, "value", value);
+                logger$b.throwArgumentError("cannot have payable function with mutability " + result.stateMutability, "value", value);
             }
         }
     }
@@ -22749,7 +22387,7 @@ function verifyState(value) {
         result.payable = !!value.payable;
         // If payable we can assume non-constant; otherwise we can't assume
         if (value.constant == null && !result.payable && value.type !== "constructor") {
-            logger$c.throwArgumentError("unable to determine stateMutability", "value", value);
+            logger$b.throwArgumentError("unable to determine stateMutability", "value", value);
         }
         result.constant = !!value.constant;
         if (result.constant) {
@@ -22759,7 +22397,7 @@ function verifyState(value) {
             result.stateMutability = (result.payable ? "payable" : "nonpayable");
         }
         if (result.payable && result.constant) {
-            logger$c.throwArgumentError("cannot have constant payable function", "value", value);
+            logger$b.throwArgumentError("cannot have constant payable function", "value", value);
         }
     }
     else if (value.constant != null) {
@@ -22768,7 +22406,7 @@ function verifyState(value) {
         result.stateMutability = (result.constant ? "view" : "payable");
     }
     else if (value.type !== "constructor") {
-        logger$c.throwArgumentError("unable to determine stateMutability", "value", value);
+        logger$b.throwArgumentError("unable to determine stateMutability", "value", value);
     }
     return result;
 }
@@ -22778,7 +22416,7 @@ class ConstructorFragment extends Fragment {
             format = FormatTypes.sighash;
         }
         if (!FormatTypes[format]) {
-            logger$c.throwArgumentError("invalid format type", "format", format);
+            logger$b.throwArgumentError("invalid format type", "format", format);
         }
         if (format === FormatTypes.json) {
             return JSON.stringify({
@@ -22790,7 +22428,7 @@ class ConstructorFragment extends Fragment {
             });
         }
         if (format === FormatTypes.sighash) {
-            logger$c.throwError("cannot format a constructor for sighash", Logger.errors.UNSUPPORTED_OPERATION, {
+            logger$b.throwError("cannot format a constructor for sighash", Logger.errors.UNSUPPORTED_OPERATION, {
                 operation: "format(sighash)"
             });
         }
@@ -22811,11 +22449,11 @@ class ConstructorFragment extends Fragment {
             return value;
         }
         if (value.type !== "constructor") {
-            logger$c.throwArgumentError("invalid constructor object", "value", value);
+            logger$b.throwArgumentError("invalid constructor object", "value", value);
         }
         let state = verifyState(value);
         if (state.constant) {
-            logger$c.throwArgumentError("constructor cannot be constant", "value", value);
+            logger$b.throwArgumentError("constructor cannot be constant", "value", value);
         }
         const params = {
             name: null,
@@ -22832,7 +22470,7 @@ class ConstructorFragment extends Fragment {
         value = parseGas(value, params);
         let parens = value.match(regexParen);
         if (!parens || parens[1].trim() !== "constructor") {
-            logger$c.throwArgumentError("invalid constructor string", "value", value);
+            logger$b.throwArgumentError("invalid constructor string", "value", value);
         }
         params.inputs = parseParams(parens[2].trim(), false);
         parseModifiers(parens[3].trim(), params);
@@ -22848,7 +22486,7 @@ class FunctionFragment extends ConstructorFragment {
             format = FormatTypes.sighash;
         }
         if (!FormatTypes[format]) {
-            logger$c.throwArgumentError("invalid format type", "format", format);
+            logger$b.throwArgumentError("invalid format type", "format", format);
         }
         if (format === FormatTypes.json) {
             return JSON.stringify({
@@ -22896,7 +22534,7 @@ class FunctionFragment extends ConstructorFragment {
             return value;
         }
         if (value.type !== "function") {
-            logger$c.throwArgumentError("invalid function object", "value", value);
+            logger$b.throwArgumentError("invalid function object", "value", value);
         }
         let state = verifyState(value);
         const params = {
@@ -22916,11 +22554,11 @@ class FunctionFragment extends ConstructorFragment {
         value = parseGas(value, params);
         let comps = value.split(" returns ");
         if (comps.length > 2) {
-            logger$c.throwArgumentError("invalid function string", "value", value);
+            logger$b.throwArgumentError("invalid function string", "value", value);
         }
         let parens = comps[0].match(regexParen);
         if (!parens) {
-            logger$c.throwArgumentError("invalid function signature", "value", value);
+            logger$b.throwArgumentError("invalid function signature", "value", value);
         }
         params.name = parens[1].trim();
         if (params.name) {
@@ -22932,7 +22570,7 @@ class FunctionFragment extends ConstructorFragment {
         if (comps.length > 1) {
             let returns = comps[1].match(regexParen);
             if (returns[1].trim() != "" || returns[3].trim() != "") {
-                logger$c.throwArgumentError("unexpected tokens", "value", value);
+                logger$b.throwArgumentError("unexpected tokens", "value", value);
             }
             params.outputs = parseParams(returns[2], false);
         }
@@ -22950,7 +22588,7 @@ class FunctionFragment extends ConstructorFragment {
 function checkForbidden(fragment) {
     const sig = fragment.format();
     if (sig === "Error(string)" || sig === "Panic(uint256)") {
-        logger$c.throwArgumentError(`cannot specify user defined ${sig} error`, "fragment", fragment);
+        logger$b.throwArgumentError(`cannot specify user defined ${sig} error`, "fragment", fragment);
     }
     return fragment;
 }
@@ -22960,7 +22598,7 @@ class ErrorFragment extends Fragment {
             format = FormatTypes.sighash;
         }
         if (!FormatTypes[format]) {
-            logger$c.throwArgumentError("invalid format type", "format", format);
+            logger$b.throwArgumentError("invalid format type", "format", format);
         }
         if (format === FormatTypes.json) {
             return JSON.stringify({
@@ -22987,7 +22625,7 @@ class ErrorFragment extends Fragment {
             return value;
         }
         if (value.type !== "error") {
-            logger$c.throwArgumentError("invalid error object", "value", value);
+            logger$b.throwArgumentError("invalid error object", "value", value);
         }
         const params = {
             type: value.type,
@@ -23000,7 +22638,7 @@ class ErrorFragment extends Fragment {
         let params = { type: "error" };
         let parens = value.match(regexParen);
         if (!parens) {
-            logger$c.throwArgumentError("invalid error signature", "value", value);
+            logger$b.throwArgumentError("invalid error signature", "value", value);
         }
         params.name = parens[1].trim();
         if (params.name) {
@@ -23028,7 +22666,7 @@ function verifyType(type) {
 const regexIdentifier = new RegExp("^[a-zA-Z$_][a-zA-Z0-9$_]*$");
 function verifyIdentifier(value) {
     if (!value || !value.match(regexIdentifier)) {
-        logger$c.throwArgumentError(`invalid identifier "${value}"`, "value", value);
+        logger$b.throwArgumentError(`invalid identifier "${value}"`, "value", value);
     }
     return value;
 }
@@ -23052,7 +22690,7 @@ function splitNesting(value) {
             else if (c === ")") {
                 depth--;
                 if (depth === -1) {
-                    logger$c.throwArgumentError("unbalanced parenthesis", "value", value);
+                    logger$b.throwArgumentError("unbalanced parenthesis", "value", value);
                 }
             }
         }
@@ -23063,7 +22701,7 @@ function splitNesting(value) {
     return result;
 }
 
-const logger$b = new Logger(version$8);
+const logger$a = new Logger(version$7);
 function checkResultErrors(result) {
     // Find the first error (if any)
     const errors = [];
@@ -23094,7 +22732,7 @@ class Coder {
         this.dynamic = dynamic;
     }
     _throwError(message, value) {
-        logger$b.throwArgumentError(message, this.localName, value);
+        logger$a.throwArgumentError(message, this.localName, value);
     }
 }
 class Writer {
@@ -23128,7 +22766,7 @@ class Writer {
     _getValue(value) {
         let bytes = arrayify(BigNumber.from(value));
         if (bytes.length > this.wordSize) {
-            logger$b.throwError("value out-of-bounds", Logger.errors.BUFFER_OVERRUN, {
+            logger$a.throwError("value out-of-bounds", Logger.errors.BUFFER_OVERRUN, {
                 length: this.wordSize,
                 offset: bytes.length
             });
@@ -23182,7 +22820,7 @@ class Reader {
                 alignedLength = length;
             }
             else {
-                logger$b.throwError("data out-of-bounds", Logger.errors.BUFFER_OVERRUN, {
+                logger$a.throwError("data out-of-bounds", Logger.errors.BUFFER_OVERRUN, {
                     length: this._data.length,
                     offset: this._offset + alignedLength
                 });
@@ -23866,9 +23504,9 @@ function keccak256(data) {
     return '0x' + sha3.keccak_256(arrayify(data));
 }
 
-const version$7 = "rlp/5.7.0";
+const version$6 = "rlp/5.7.0";
 
-const logger$a = new Logger(version$7);
+const logger$9 = new Logger(version$6);
 function arrayifyInteger(value) {
     const result = [];
     while (value) {
@@ -23892,7 +23530,7 @@ function _encode(object) {
         return length.concat(payload);
     }
     if (!isBytesLike(object)) {
-        logger$a.throwArgumentError("RLP object must be BytesLike", "object", object);
+        logger$9.throwArgumentError("RLP object must be BytesLike", "object", object);
     }
     const data = Array.prototype.slice.call(arrayify(object));
     if (data.length === 1 && data[0] <= 0x7f) {
@@ -23910,12 +23548,12 @@ function encode(object) {
     return hexlify(_encode(object));
 }
 
-const version$6 = "address/5.7.0";
+const version$5 = "address/5.7.0";
 
-const logger$9 = new Logger(version$6);
+const logger$8 = new Logger(version$5);
 function getChecksumAddress(address) {
     if (!isHexString(address, 20)) {
-        logger$9.throwArgumentError("invalid address", "address", address);
+        logger$8.throwArgumentError("invalid address", "address", address);
     }
     address = address.toLowerCase();
     const chars = address.substring(2).split("");
@@ -23971,7 +23609,7 @@ function ibanChecksum(address) {
 function getAddress(address) {
     let result = null;
     if (typeof (address) !== "string") {
-        logger$9.throwArgumentError("invalid address", "address", address);
+        logger$8.throwArgumentError("invalid address", "address", address);
     }
     if (address.match(/^(0x)?[0-9a-fA-F]{40}$/)) {
         // Missing the 0x prefix
@@ -23981,14 +23619,14 @@ function getAddress(address) {
         result = getChecksumAddress(address);
         // It is a checksummed address with a bad checksum
         if (address.match(/([A-F].*[a-f])|([a-f].*[A-F])/) && result !== address) {
-            logger$9.throwArgumentError("bad address checksum", "address", address);
+            logger$8.throwArgumentError("bad address checksum", "address", address);
         }
         // Maybe ICAP? (we only support direct mode)
     }
     else if (address.match(/^XE[0-9]{2}[0-9A-Za-z]{30,31}$/)) {
         // It is an ICAP address with a bad checksum
         if (address.substring(2, 4) !== ibanChecksum(address)) {
-            logger$9.throwArgumentError("bad icap checksum", "address", address);
+            logger$8.throwArgumentError("bad icap checksum", "address", address);
         }
         result = _base36To16(address.substring(4));
         while (result.length < 40) {
@@ -23997,7 +23635,7 @@ function getAddress(address) {
         result = getChecksumAddress("0x" + result);
     }
     else {
-        logger$9.throwArgumentError("invalid address", "address", address);
+        logger$8.throwArgumentError("invalid address", "address", address);
     }
     return result;
 }
@@ -24016,7 +23654,7 @@ function getContractAddress(transaction) {
         from = getAddress(transaction.from);
     }
     catch (error) {
-        logger$9.throwArgumentError("missing from address", "transaction", transaction);
+        logger$8.throwArgumentError("missing from address", "transaction", transaction);
     }
     const nonce = stripZeros(arrayify(BigNumber.from(transaction.nonce).toHexString()));
     return getAddress(hexDataSlice(keccak256(encode([from, nonce])), 12));
@@ -24060,7 +23698,7 @@ class AnonymousCoder extends Coder {
     }
 }
 
-const logger$8 = new Logger(version$8);
+const logger$7 = new Logger(version$7);
 function pack(writer, coders, values) {
     let arrayValues = null;
     if (Array.isArray(values)) {
@@ -24071,14 +23709,14 @@ function pack(writer, coders, values) {
         arrayValues = coders.map((coder) => {
             const name = coder.localName;
             if (!name) {
-                logger$8.throwError("cannot encode object for signature with missing names", Logger.errors.INVALID_ARGUMENT, {
+                logger$7.throwError("cannot encode object for signature with missing names", Logger.errors.INVALID_ARGUMENT, {
                     argument: "values",
                     coder: coder,
                     value: values
                 });
             }
             if (unique[name]) {
-                logger$8.throwError("cannot encode object for signature with duplicate names", Logger.errors.INVALID_ARGUMENT, {
+                logger$7.throwError("cannot encode object for signature with duplicate names", Logger.errors.INVALID_ARGUMENT, {
                     argument: "values",
                     coder: coder,
                     value: values
@@ -24089,10 +23727,10 @@ function pack(writer, coders, values) {
         });
     }
     else {
-        logger$8.throwArgumentError("invalid tuple value", "tuple", values);
+        logger$7.throwArgumentError("invalid tuple value", "tuple", values);
     }
     if (coders.length !== arrayValues.length) {
-        logger$8.throwArgumentError("types/value length mismatch", "tuple", values);
+        logger$7.throwArgumentError("types/value length mismatch", "tuple", values);
     }
     let staticWriter = new Writer(writer.wordSize);
     let dynamicWriter = new Writer(writer.wordSize);
@@ -24233,7 +23871,7 @@ class ArrayCoder extends Coder {
             count = value.length;
             writer.writeValue(value.length);
         }
-        logger$8.checkArgumentCount(value.length, count, "coder array" + (this.localName ? (" " + this.localName) : ""));
+        logger$7.checkArgumentCount(value.length, count, "coder array" + (this.localName ? (" " + this.localName) : ""));
         let coders = [];
         for (let i = 0; i < value.length; i++) {
             coders.push(this.coder);
@@ -24250,7 +23888,7 @@ class ArrayCoder extends Coder {
             // bytes as a link to the data). This could use a much
             // tighter bound, but we are erroring on the side of safety.
             if (count * 32 > reader._data.length) {
-                logger$8.throwError("insufficient data length", Logger.errors.BUFFER_OVERRUN, {
+                logger$7.throwError("insufficient data length", Logger.errors.BUFFER_OVERRUN, {
                     length: reader._data.length,
                     count: count
                 });
@@ -24346,6 +23984,8 @@ class NullCoder extends Coder {
     }
 }
 
+const AddressZero = "0x0000000000000000000000000000000000000000";
+
 const NegativeOne = ( /*#__PURE__*/BigNumber.from(-1));
 const Zero = ( /*#__PURE__*/BigNumber.from(0));
 const One = ( /*#__PURE__*/BigNumber.from(1));
@@ -24389,9 +24029,9 @@ class NumberCoder extends Coder {
     }
 }
 
-const version$5 = "strings/5.7.0";
+const version$4 = "strings/5.7.0";
 
-const logger$7 = new Logger(version$5);
+const logger$6 = new Logger(version$4);
 ///////////////////////////////
 var UnicodeNormalizationForm;
 (function (UnicodeNormalizationForm) {
@@ -24429,7 +24069,7 @@ var Utf8ErrorReason;
     Utf8ErrorReason["OVERLONG"] = "overlong representation";
 })(Utf8ErrorReason || (Utf8ErrorReason = {}));
 function errorFunc(reason, offset, bytes, output, badCodepoint) {
-    return logger$7.throwArgumentError(`invalid codepoint at offset ${offset}; ${reason}`, "bytes", bytes);
+    return logger$6.throwArgumentError(`invalid codepoint at offset ${offset}; ${reason}`, "bytes", bytes);
 }
 function ignoreFunc(reason, offset, bytes, output, badCodepoint) {
     // If there is an invalid prefix (including stray continuation), skip any additional continuation bytes
@@ -24555,7 +24195,7 @@ function getUtf8CodePoints(bytes, onError) {
 // http://stackoverflow.com/questions/18729405/how-to-convert-utf8-string-to-byte-array
 function toUtf8Bytes(str, form = UnicodeNormalizationForm.current) {
     if (form != UnicodeNormalizationForm.current) {
-        logger$7.checkNormalize();
+        logger$6.checkNormalize();
         str = str.normalize(form);
     }
     let result = [];
@@ -24671,7 +24311,7 @@ class TupleCoder extends Coder {
     }
 }
 
-const logger$6 = new Logger(version$8);
+const logger$5 = new Logger(version$7);
 const paramTypeBytes = new RegExp(/^bytes([0-9]*)$/);
 const paramTypeNumber = new RegExp(/^(u?int)([0-9]*)$/);
 class AbiCoder {
@@ -24702,7 +24342,7 @@ class AbiCoder {
         if (match) {
             let size = parseInt(match[2] || "256");
             if (size === 0 || size > 256 || (size % 8) !== 0) {
-                logger$6.throwArgumentError("invalid " + match[1] + " bit length", "param", param);
+                logger$5.throwArgumentError("invalid " + match[1] + " bit length", "param", param);
             }
             return new NumberCoder(size / 8, (match[1] === "int"), param.name);
         }
@@ -24711,11 +24351,11 @@ class AbiCoder {
         if (match) {
             let size = parseInt(match[1]);
             if (size === 0 || size > 32) {
-                logger$6.throwArgumentError("invalid bytes length", "param", param);
+                logger$5.throwArgumentError("invalid bytes length", "param", param);
             }
             return new FixedBytesCoder(size, param.name);
         }
-        return logger$6.throwArgumentError("invalid type", "type", param.type);
+        return logger$5.throwArgumentError("invalid type", "type", param.type);
     }
     _getWordSize() { return 32; }
     _getReader(data, allowLoose) {
@@ -24731,7 +24371,7 @@ class AbiCoder {
     }
     encode(types, values) {
         if (types.length !== values.length) {
-            logger$6.throwError("types/values length mismatch", Logger.errors.INVALID_ARGUMENT, {
+            logger$5.throwError("types/values length mismatch", Logger.errors.INVALID_ARGUMENT, {
                 count: { types: types.length, values: values.length },
                 value: { types: types, values: values }
             });
@@ -24754,7 +24394,7 @@ function id(text) {
     return keccak256(toUtf8Bytes(text));
 }
 
-const logger$5 = new Logger(version$8);
+const logger$4 = new Logger(version$7);
 class LogDescription extends Description {
 }
 class TransactionDescription extends Description {
@@ -24811,7 +24451,7 @@ class Interface {
             switch (fragment.type) {
                 case "constructor":
                     if (this.deploy) {
-                        logger$5.warn("duplicate definition - constructor");
+                        logger$4.warn("duplicate definition - constructor");
                         return;
                     }
                     //checkNames(fragment, "input", fragment.inputs);
@@ -24834,7 +24474,7 @@ class Interface {
             }
             let signature = fragment.format();
             if (bucket[signature]) {
-                logger$5.warn("duplicate definition - " + signature);
+                logger$4.warn("duplicate definition - " + signature);
                 return;
             }
             bucket[signature] = fragment;
@@ -24853,7 +24493,7 @@ class Interface {
             format = FormatTypes.full;
         }
         if (format === FormatTypes.sighash) {
-            logger$5.throwArgumentError("interface does not support formatting sighash", "format", format);
+            logger$4.throwArgumentError("interface does not support formatting sighash", "format", format);
         }
         const abi = this.fragments.map((fragment) => fragment.format(format));
         // We need to re-bundle the JSON fragments a bit
@@ -24883,24 +24523,24 @@ class Interface {
                     return this.functions[name];
                 }
             }
-            logger$5.throwArgumentError("no matching function", "sighash", nameOrSignatureOrSighash);
+            logger$4.throwArgumentError("no matching function", "sighash", nameOrSignatureOrSighash);
         }
         // It is a bare name, look up the function (will return null if ambiguous)
         if (nameOrSignatureOrSighash.indexOf("(") === -1) {
             const name = nameOrSignatureOrSighash.trim();
             const matching = Object.keys(this.functions).filter((f) => (f.split("(" /* fix:) */)[0] === name));
             if (matching.length === 0) {
-                logger$5.throwArgumentError("no matching function", "name", name);
+                logger$4.throwArgumentError("no matching function", "name", name);
             }
             else if (matching.length > 1) {
-                logger$5.throwArgumentError("multiple matching functions", "name", name);
+                logger$4.throwArgumentError("multiple matching functions", "name", name);
             }
             return this.functions[matching[0]];
         }
         // Normalize the signature and lookup the function
         const result = this.functions[FunctionFragment.fromString(nameOrSignatureOrSighash).format()];
         if (!result) {
-            logger$5.throwArgumentError("no matching function", "signature", nameOrSignatureOrSighash);
+            logger$4.throwArgumentError("no matching function", "signature", nameOrSignatureOrSighash);
         }
         return result;
     }
@@ -24913,24 +24553,24 @@ class Interface {
                     return this.events[name];
                 }
             }
-            logger$5.throwArgumentError("no matching event", "topichash", topichash);
+            logger$4.throwArgumentError("no matching event", "topichash", topichash);
         }
         // It is a bare name, look up the function (will return null if ambiguous)
         if (nameOrSignatureOrTopic.indexOf("(") === -1) {
             const name = nameOrSignatureOrTopic.trim();
             const matching = Object.keys(this.events).filter((f) => (f.split("(" /* fix:) */)[0] === name));
             if (matching.length === 0) {
-                logger$5.throwArgumentError("no matching event", "name", name);
+                logger$4.throwArgumentError("no matching event", "name", name);
             }
             else if (matching.length > 1) {
-                logger$5.throwArgumentError("multiple matching events", "name", name);
+                logger$4.throwArgumentError("multiple matching events", "name", name);
             }
             return this.events[matching[0]];
         }
         // Normalize the signature and lookup the function
         const result = this.events[EventFragment.fromString(nameOrSignatureOrTopic).format()];
         if (!result) {
-            logger$5.throwArgumentError("no matching event", "signature", nameOrSignatureOrTopic);
+            logger$4.throwArgumentError("no matching event", "signature", nameOrSignatureOrTopic);
         }
         return result;
     }
@@ -24944,24 +24584,24 @@ class Interface {
                     return this.errors[name];
                 }
             }
-            logger$5.throwArgumentError("no matching error", "sighash", nameOrSignatureOrSighash);
+            logger$4.throwArgumentError("no matching error", "sighash", nameOrSignatureOrSighash);
         }
         // It is a bare name, look up the function (will return null if ambiguous)
         if (nameOrSignatureOrSighash.indexOf("(") === -1) {
             const name = nameOrSignatureOrSighash.trim();
             const matching = Object.keys(this.errors).filter((f) => (f.split("(" /* fix:) */)[0] === name));
             if (matching.length === 0) {
-                logger$5.throwArgumentError("no matching error", "name", name);
+                logger$4.throwArgumentError("no matching error", "name", name);
             }
             else if (matching.length > 1) {
-                logger$5.throwArgumentError("multiple matching errors", "name", name);
+                logger$4.throwArgumentError("multiple matching errors", "name", name);
             }
             return this.errors[matching[0]];
         }
         // Normalize the signature and lookup the function
         const result = this.errors[FunctionFragment.fromString(nameOrSignatureOrSighash).format()];
         if (!result) {
-            logger$5.throwArgumentError("no matching error", "signature", nameOrSignatureOrSighash);
+            logger$4.throwArgumentError("no matching error", "signature", nameOrSignatureOrSighash);
         }
         return result;
     }
@@ -25004,7 +24644,7 @@ class Interface {
         }
         const bytes = arrayify(data);
         if (hexlify(bytes.slice(0, 4)) !== this.getSighash(fragment)) {
-            logger$5.throwArgumentError(`data signature does not match error ${fragment.name}.`, "data", hexlify(bytes));
+            logger$4.throwArgumentError(`data signature does not match error ${fragment.name}.`, "data", hexlify(bytes));
         }
         return this._decodeParams(fragment.inputs, bytes.slice(4));
     }
@@ -25024,7 +24664,7 @@ class Interface {
         }
         const bytes = arrayify(data);
         if (hexlify(bytes.slice(0, 4)) !== this.getSighash(functionFragment)) {
-            logger$5.throwArgumentError(`data signature does not match function ${functionFragment.name}.`, "data", hexlify(bytes));
+            logger$4.throwArgumentError(`data signature does not match function ${functionFragment.name}.`, "data", hexlify(bytes));
         }
         return this._decodeParams(functionFragment.inputs, bytes.slice(4));
     }
@@ -25085,7 +24725,7 @@ class Interface {
                 break;
             }
         }
-        return logger$5.throwError("call revert exception" + message, Logger.errors.CALL_EXCEPTION, {
+        return logger$4.throwError("call revert exception" + message, Logger.errors.CALL_EXCEPTION, {
             method: functionFragment.format(),
             data: hexlify(data), errorArgs, errorName, errorSignature, reason
         });
@@ -25103,7 +24743,7 @@ class Interface {
             eventFragment = this.getEvent(eventFragment);
         }
         if (values.length > eventFragment.inputs.length) {
-            logger$5.throwError("too many arguments for " + eventFragment.format(), Logger.errors.UNEXPECTED_ARGUMENT, {
+            logger$4.throwError("too many arguments for " + eventFragment.format(), Logger.errors.UNEXPECTED_ARGUMENT, {
                 argument: "values",
                 value: values
             });
@@ -25135,7 +24775,7 @@ class Interface {
             let param = eventFragment.inputs[index];
             if (!param.indexed) {
                 if (value != null) {
-                    logger$5.throwArgumentError("cannot filter non-indexed parameters; must be null", ("contract." + param.name), value);
+                    logger$4.throwArgumentError("cannot filter non-indexed parameters; must be null", ("contract." + param.name), value);
                 }
                 return;
             }
@@ -25143,7 +24783,7 @@ class Interface {
                 topics.push(null);
             }
             else if (param.baseType === "array" || param.baseType === "tuple") {
-                logger$5.throwArgumentError("filtering with tuples or arrays not supported", ("contract." + param.name), value);
+                logger$4.throwArgumentError("filtering with tuples or arrays not supported", ("contract." + param.name), value);
             }
             else if (Array.isArray(value)) {
                 topics.push(value.map((value) => encodeTopic(param, value)));
@@ -25169,7 +24809,7 @@ class Interface {
             topics.push(this.getEventTopic(eventFragment));
         }
         if (values.length !== eventFragment.inputs.length) {
-            logger$5.throwArgumentError("event arguments/values mismatch", "values", values);
+            logger$4.throwArgumentError("event arguments/values mismatch", "values", values);
         }
         eventFragment.inputs.forEach((param, index) => {
             const value = values[index];
@@ -25206,7 +24846,7 @@ class Interface {
         if (topics != null && !eventFragment.anonymous) {
             let topicHash = this.getEventTopic(eventFragment);
             if (!isHexString(topics[0], 32) || topics[0].toLowerCase() !== topicHash) {
-                logger$5.throwError("fragment/topic mismatch", Logger.errors.INVALID_ARGUMENT, { argument: "topics[0]", expected: topicHash, value: topics[0] });
+                logger$4.throwError("fragment/topic mismatch", Logger.errors.INVALID_ARGUMENT, { argument: "topics[0]", expected: topicHash, value: topics[0] });
             }
             topics = topics.slice(1);
         }
@@ -25351,7 +24991,7 @@ class Interface {
     }
 }
 
-const version$4 = "abstract-provider/5.7.0";
+const version$3 = "abstract-provider/5.7.0";
 
 var __awaiter$2 = function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -25362,12 +25002,12 @@ var __awaiter$2 = function (thisArg, _arguments, P, generator) {
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const logger$4 = new Logger(version$4);
+const logger$3 = new Logger(version$3);
 ///////////////////////////////
 // Exported Abstracts
 class Provider {
     constructor() {
-        logger$4.checkAbstract(new.target, Provider);
+        logger$3.checkAbstract(new.target, Provider);
         defineReadOnly(this, "_isProvider", true);
     }
     getFeeData() {
@@ -25405,7 +25045,7 @@ class Provider {
     }
 }
 
-const version$3 = "abstract-signer/5.7.0";
+const version$2 = "abstract-signer/5.7.0";
 
 var __awaiter$1 = function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -25416,7 +25056,7 @@ var __awaiter$1 = function (thisArg, _arguments, P, generator) {
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const logger$3 = new Logger(version$3);
+const logger$2 = new Logger(version$2);
 const allowedTransactionKeys = [
     "accessList", "ccipReadEnabled", "chainId", "customData", "data", "from", "gasLimit", "gasPrice", "maxFeePerGas", "maxPriorityFeePerGas", "nonce", "to", "type", "value"
 ];
@@ -25429,7 +25069,7 @@ class Signer {
     ///////////////////
     // Sub-classes MUST call super
     constructor() {
-        logger$3.checkAbstract(new.target, Signer);
+        logger$2.checkAbstract(new.target, Signer);
         defineReadOnly(this, "_isSigner", true);
     }
     ///////////////////
@@ -25508,7 +25148,7 @@ class Signer {
     checkTransaction(transaction) {
         for (const key in transaction) {
             if (allowedTransactionKeys.indexOf(key) === -1) {
-                logger$3.throwArgumentError("invalid transaction key: " + key, "transaction", transaction);
+                logger$2.throwArgumentError("invalid transaction key: " + key, "transaction", transaction);
             }
         }
         const tx = shallowCopy(transaction);
@@ -25522,7 +25162,7 @@ class Signer {
                 this.getAddress()
             ]).then((result) => {
                 if (result[0].toLowerCase() !== result[1].toLowerCase()) {
-                    logger$3.throwArgumentError("from address mismatch", "transaction", transaction);
+                    logger$2.throwArgumentError("from address mismatch", "transaction", transaction);
                 }
                 return result[0];
             });
@@ -25546,7 +25186,7 @@ class Signer {
                     }
                     const address = yield this.resolveName(to);
                     if (address == null) {
-                        logger$3.throwArgumentError("provided ENS name resolves to null", "tx.to", to);
+                        logger$2.throwArgumentError("provided ENS name resolves to null", "tx.to", to);
                     }
                     return address;
                 }));
@@ -25556,10 +25196,10 @@ class Signer {
             // Do not allow mixing pre-eip-1559 and eip-1559 properties
             const hasEip1559 = (tx.maxFeePerGas != null || tx.maxPriorityFeePerGas != null);
             if (tx.gasPrice != null && (tx.type === 2 || hasEip1559)) {
-                logger$3.throwArgumentError("eip-1559 transaction do not support gasPrice", "transaction", transaction);
+                logger$2.throwArgumentError("eip-1559 transaction do not support gasPrice", "transaction", transaction);
             }
             else if ((tx.type === 0 || tx.type === 1) && hasEip1559) {
-                logger$3.throwArgumentError("pre-eip-1559 transaction do not support maxFeePerGas/maxPriorityFeePerGas", "transaction", transaction);
+                logger$2.throwArgumentError("pre-eip-1559 transaction do not support maxFeePerGas/maxPriorityFeePerGas", "transaction", transaction);
             }
             if ((tx.type === 2 || tx.type == null) && (tx.maxFeePerGas != null && tx.maxPriorityFeePerGas != null)) {
                 // Fully-formed EIP-1559 transaction (skip getFeeData)
@@ -25603,7 +25243,7 @@ class Signer {
                         // Network doesn't support EIP-1559...
                         // ...but they are trying to use EIP-1559 properties
                         if (hasEip1559) {
-                            logger$3.throwError("network does not support EIP-1559", Logger.errors.UNSUPPORTED_OPERATION, {
+                            logger$2.throwError("network does not support EIP-1559", Logger.errors.UNSUPPORTED_OPERATION, {
                                 operation: "populateTransaction"
                             });
                         }
@@ -25616,7 +25256,7 @@ class Signer {
                     }
                     else {
                         // getFeeData has failed us.
-                        logger$3.throwError("failed to get consistent fee data", Logger.errors.UNSUPPORTED_OPERATION, {
+                        logger$2.throwError("failed to get consistent fee data", Logger.errors.UNSUPPORTED_OPERATION, {
                             operation: "signer.getFeeData"
                         });
                     }
@@ -25640,7 +25280,7 @@ class Signer {
                     if (forwardErrors.indexOf(error.code) >= 0) {
                         throw error;
                     }
-                    return logger$3.throwError("cannot estimate gas; transaction may fail or may require manual gas limit", Logger.errors.UNPREDICTABLE_GAS_LIMIT, {
+                    return logger$2.throwError("cannot estimate gas; transaction may fail or may require manual gas limit", Logger.errors.UNPREDICTABLE_GAS_LIMIT, {
                         error: error,
                         tx: tx
                     });
@@ -25655,7 +25295,7 @@ class Signer {
                     this.getChainId()
                 ]).then((results) => {
                     if (results[1] !== 0 && results[0] !== results[1]) {
-                        logger$3.throwArgumentError("chainId address mismatch", "transaction", transaction);
+                        logger$2.throwArgumentError("chainId address mismatch", "transaction", transaction);
                     }
                     return results[0];
                 });
@@ -25667,7 +25307,7 @@ class Signer {
     // Sub-classes SHOULD leave these alone
     _checkProvider(operation) {
         if (!this.provider) {
-            logger$3.throwError("missing provider", Logger.errors.UNSUPPORTED_OPERATION, {
+            logger$2.throwError("missing provider", Logger.errors.UNSUPPORTED_OPERATION, {
                 operation: (operation || "_checkProvider")
             });
         }
@@ -25687,7 +25327,7 @@ class VoidSigner extends Signer {
     }
     _fail(message, operation) {
         return Promise.resolve().then(() => {
-            logger$3.throwError(message, Logger.errors.UNSUPPORTED_OPERATION, { operation: operation });
+            logger$2.throwError(message, Logger.errors.UNSUPPORTED_OPERATION, { operation: operation });
         });
     }
     signMessage(message) {
@@ -25704,9 +25344,9 @@ class VoidSigner extends Signer {
     }
 }
 
-const version$2 = "transactions/5.7.0";
+const version$1 = "transactions/5.7.0";
 
-const logger$2 = new Logger(version$2);
+const logger$1 = new Logger(version$1);
 var TransactionTypes;
 (function (TransactionTypes) {
     TransactionTypes[TransactionTypes["legacy"] = 0] = "legacy";
@@ -25718,7 +25358,7 @@ function accessSetify(addr, storageKeys) {
         address: getAddress(addr),
         storageKeys: (storageKeys || []).map((storageKey, index) => {
             if (hexDataLength(storageKey) !== 32) {
-                logger$2.throwArgumentError("invalid access list storageKey", `accessList[${addr}:${index}]`, storageKey);
+                logger$1.throwArgumentError("invalid access list storageKey", `accessList[${addr}:${index}]`, storageKey);
             }
             return storageKey.toLowerCase();
         })
@@ -25729,7 +25369,7 @@ function accessListify(value) {
         return value.map((set, index) => {
             if (Array.isArray(set)) {
                 if (set.length > 2) {
-                    logger$2.throwArgumentError("access list expected to be [ address, storageKeys[] ]", `value[${index}]`, set);
+                    logger$1.throwArgumentError("access list expected to be [ address, storageKeys[] ]", `value[${index}]`, set);
                 }
                 return accessSetify(set[0], set[1]);
             }
@@ -25747,7 +25387,7 @@ function accessListify(value) {
     return result;
 }
 
-const version$1 = "contracts/5.7.0";
+const version = "contracts/5.7.0";
 
 var __awaiter = function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -25758,12 +25398,12 @@ var __awaiter = function (thisArg, _arguments, P, generator) {
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const logger$1 = new Logger(version$1);
+const logger = new Logger(version);
 function resolveName(resolver, nameOrPromise) {
     return __awaiter(this, void 0, void 0, function* () {
         const name = yield nameOrPromise;
         if (typeof (name) !== "string") {
-            logger$1.throwArgumentError("invalid address or ENS name", "name", name);
+            logger.throwArgumentError("invalid address or ENS name", "name", name);
         }
         // If it is already an address, just use it (after adding checksum)
         try {
@@ -25771,13 +25411,13 @@ function resolveName(resolver, nameOrPromise) {
         }
         catch (error) { }
         if (!resolver) {
-            logger$1.throwError("a provider or signer is needed to resolve ENS names", Logger.errors.UNSUPPORTED_OPERATION, {
+            logger.throwError("a provider or signer is needed to resolve ENS names", Logger.errors.UNSUPPORTED_OPERATION, {
                 operation: "resolveName"
             });
         }
         const address = yield resolver.resolveName(name);
         if (address == null) {
-            logger$1.throwArgumentError("resolver or addr is not configured for ENS name", "name", name);
+            logger.throwArgumentError("resolver or addr is not configured for ENS name", "name", name);
         }
         return address;
     });
@@ -25798,7 +25438,7 @@ function resolveAddresses(resolver, value, paramType) {
         }
         if (paramType.baseType === "array") {
             if (!Array.isArray(value)) {
-                return Promise.reject(logger$1.makeError("invalid value for array", Logger.errors.INVALID_ARGUMENT, {
+                return Promise.reject(logger.makeError("invalid value for array", Logger.errors.INVALID_ARGUMENT, {
                     argument: "value",
                     value
                 }));
@@ -25816,7 +25456,7 @@ function populateTransaction(contract, fragment, args) {
             overrides = shallowCopy(args.pop());
         }
         // Make sure the parameter count matches
-        logger$1.checkArgumentCount(args.length, fragment.inputs.length, "passed to contract");
+        logger.checkArgumentCount(args.length, fragment.inputs.length, "passed to contract");
         // Populate "from" override (allow promises)
         if (contract.signer) {
             if (overrides.from) {
@@ -25827,7 +25467,7 @@ function populateTransaction(contract, fragment, args) {
                     signer: contract.signer.getAddress()
                 }).then((check) => __awaiter(this, void 0, void 0, function* () {
                     if (getAddress(check.signer) !== check.override) {
-                        logger$1.throwError("Contract with a Signer cannot override from", Logger.errors.UNSUPPORTED_OPERATION, {
+                        logger.throwError("Contract with a Signer cannot override from", Logger.errors.UNSUPPORTED_OPERATION, {
                             operation: "overrides.from"
                         });
                     }
@@ -25905,7 +25545,7 @@ function populateTransaction(contract, fragment, args) {
         if (ro.value) {
             const roValue = BigNumber.from(ro.value);
             if (!roValue.isZero() && !fragment.payable) {
-                logger$1.throwError("non-payable method cannot override value", Logger.errors.UNSUPPORTED_OPERATION, {
+                logger.throwError("non-payable method cannot override value", Logger.errors.UNSUPPORTED_OPERATION, {
                     operation: "overrides.value",
                     value: overrides.value
                 });
@@ -25934,7 +25574,7 @@ function populateTransaction(contract, fragment, args) {
         // typo or using an unsupported key.
         const leftovers = Object.keys(overrides).filter((key) => (overrides[key] != null));
         if (leftovers.length) {
-            logger$1.throwError(`cannot override ${leftovers.map((l) => JSON.stringify(l)).join(",")}`, Logger.errors.UNSUPPORTED_OPERATION, {
+            logger.throwError(`cannot override ${leftovers.map((l) => JSON.stringify(l)).join(",")}`, Logger.errors.UNSUPPORTED_OPERATION, {
                 operation: "overrides",
                 overrides: leftovers
             });
@@ -25952,7 +25592,7 @@ function buildEstimate(contract, fragment) {
     return function (...args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!signerOrProvider) {
-                logger$1.throwError("estimate require a provider or signer", Logger.errors.UNSUPPORTED_OPERATION, {
+                logger.throwError("estimate require a provider or signer", Logger.errors.UNSUPPORTED_OPERATION, {
                     operation: "estimateGas"
                 });
             }
@@ -26041,7 +25681,7 @@ function buildSend(contract, fragment) {
     return function (...args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!contract.signer) {
-                logger$1.throwError("sending a transaction requires a signer", Logger.errors.UNSUPPORTED_OPERATION, {
+                logger.throwError("sending a transaction requires a signer", Logger.errors.UNSUPPORTED_OPERATION, {
                     operation: "sendTransaction"
                 });
             }
@@ -26140,7 +25780,7 @@ class FragmentRunningEvent extends RunningEvent {
         let topic = contractInterface.getEventTopic(fragment);
         if (topics) {
             if (topic !== topics[0]) {
-                logger$1.throwArgumentError("topic mismatch", "topics", topics);
+                logger.throwArgumentError("topic mismatch", "topics", topics);
             }
             filter.topics = topics.slice();
         }
@@ -26222,7 +25862,7 @@ class BaseContract {
             defineReadOnly(this, "signer", null);
         }
         else {
-            logger$1.throwArgumentError("invalid signer or provider", "signerOrProvider", signerOrProvider);
+            logger.throwArgumentError("invalid signer or provider", "signerOrProvider", signerOrProvider);
         }
         defineReadOnly(this, "callStatic", {});
         defineReadOnly(this, "estimateGas", {});
@@ -26250,14 +25890,14 @@ class BaseContract {
                     defineReadOnly(this.filters, name, this.filters[filters[0]]);
                 }
                 else {
-                    logger$1.warn(`Duplicate definition of ${name} (${filters.join(", ")})`);
+                    logger.warn(`Duplicate definition of ${name} (${filters.join(", ")})`);
                 }
             });
         }
         defineReadOnly(this, "_runningEvents", {});
         defineReadOnly(this, "_wrappedEmits", {});
         if (addressOrName == null) {
-            logger$1.throwArgumentError("invalid contract address or ENS name", "addressOrName", addressOrName);
+            logger.throwArgumentError("invalid contract address or ENS name", "addressOrName", addressOrName);
         }
         defineReadOnly(this, "address", addressOrName);
         if (this.provider) {
@@ -26269,7 +25909,7 @@ class BaseContract {
             }
             catch (error) {
                 // Without a provider, we cannot use ENS names
-                logger$1.throwError("provider is required to use ENS name as contract address", Logger.errors.UNSUPPORTED_OPERATION, {
+                logger.throwError("provider is required to use ENS name as contract address", Logger.errors.UNSUPPORTED_OPERATION, {
                     operation: "new Contract"
                 });
             }
@@ -26283,7 +25923,7 @@ class BaseContract {
             // Check that the signature is unique; if not the ABI generation has
             // not been cleaned or may be incorrectly generated
             if (uniqueSignatures[signature]) {
-                logger$1.warn(`Duplicate ABI entry for ${JSON.stringify(signature)}`);
+                logger.warn(`Duplicate ABI entry for ${JSON.stringify(signature)}`);
                 return;
             }
             uniqueSignatures[signature] = true;
@@ -26372,7 +26012,7 @@ class BaseContract {
                 // Otherwise, poll for our code to be deployed
                 this._deployedPromise = this.provider.getCode(this.address, blockTag).then((code) => {
                     if (code === "0x") {
-                        logger$1.throwError("contract not deployed", Logger.errors.UNSUPPORTED_OPERATION, {
+                        logger.throwError("contract not deployed", Logger.errors.UNSUPPORTED_OPERATION, {
                             contractAddress: this.address,
                             operation: "getDeployed"
                         });
@@ -26389,14 +26029,14 @@ class BaseContract {
     // estimateDeploy(bytecode: string, ...args): Promise<BigNumber>
     fallback(overrides) {
         if (!this.signer) {
-            logger$1.throwError("sending a transactions require a signer", Logger.errors.UNSUPPORTED_OPERATION, { operation: "sendTransaction(fallback)" });
+            logger.throwError("sending a transactions require a signer", Logger.errors.UNSUPPORTED_OPERATION, { operation: "sendTransaction(fallback)" });
         }
         const tx = shallowCopy(overrides || {});
         ["from", "to"].forEach(function (key) {
             if (tx[key] == null) {
                 return;
             }
-            logger$1.throwError("cannot override " + key, Logger.errors.UNSUPPORTED_OPERATION, { operation: key });
+            logger.throwError("cannot override " + key, Logger.errors.UNSUPPORTED_OPERATION, { operation: key });
         });
         tx.to = this.resolvedAddress;
         return this.deployed().then(() => {
@@ -26499,7 +26139,7 @@ class BaseContract {
     }
     _addEventListener(runningEvent, listener, once) {
         if (!this.provider) {
-            logger$1.throwError("events require a provider or a signer with a provider", Logger.errors.UNSUPPORTED_OPERATION, { operation: "once" });
+            logger.throwError("events require a provider or a signer with a provider", Logger.errors.UNSUPPORTED_OPERATION, { operation: "once" });
         }
         runningEvent.addListener(listener, once);
         // Track this running event and its listeners (may already be there; but no hard in updating)
@@ -26539,7 +26179,7 @@ class BaseContract {
         const filter = shallowCopy(runningEvent.filter);
         if (typeof (fromBlockOrBlockhash) === "string" && isHexString(fromBlockOrBlockhash, 32)) {
             if (toBlock != null) {
-                logger$1.throwArgumentError("cannot specify toBlock with blockhash", "toBlock", toBlock);
+                logger.throwArgumentError("cannot specify toBlock with blockhash", "toBlock", toBlock);
             }
             filter.blockHash = fromBlockOrBlockhash;
         }
@@ -26629,31 +26269,6 @@ class BaseContract {
 class Contract extends BaseContract {
 }
 
-const version = "units/5.7.0";
-
-const logger = new Logger(version);
-const names = [
-    "wei",
-    "kwei",
-    "mwei",
-    "gwei",
-    "szabo",
-    "finney",
-    "ether",
-];
-function parseUnits(value, unitName) {
-    if (typeof (value) !== "string") {
-        logger.throwArgumentError("value must be a string", "value", value);
-    }
-    if (typeof (unitName) === "string") {
-        const index = names.indexOf(unitName);
-        if (index !== -1) {
-            unitName = 3 * index;
-        }
-    }
-    return parseFixed(value, (unitName != null) ? unitName : 18);
-}
-
 /* eslint-disable @typescript-eslint/naming-convention */
 /**
  * @constant {string} ETH_SEPOLIA_CHAIN_ID - The chain ID for the Ethereum Sepolia testnet (EIP-155 compatible format).
@@ -26675,6 +26290,10 @@ const ZKEVM_TESTNET_CHAIN_ID = '13473';
  * @constant {string} ZKEVM_MAINNET_CHAIN_ID - The chain ID for the zkEVM mainnet (EIP-155 compatible format).
  */
 const ZKEVM_MAINNET_CHAIN_ID = '13371'; // @TODO confirm this is still correct
+/**
+ * @constant {string} CHILD_CHAIN_NATIVE_TOKEN_ADDRESS - Address of the native token on the child chain.
+ */
+const ETHEREUM_NATIVE_TOKEN_ADDRESS = '0x0000000000000000000000000000000000000eee';
 /**
  * @constant {BridgeInstance} ETH_SEPOLIA_TO_ZKEVM_DEVNET - A bridge instance configuration for bridging between
  * the Ethereum Sepolia testnet and the zkEVM devnet.
@@ -29014,6 +28633,7 @@ var BridgeErrorType;
     BridgeErrorType["AXELAR_GAS_ESTIMATE_FAILED"] = "AXELAR_GAS_ESTIMATE_FAILED";
     BridgeErrorType["INVALID_RECIPIENT"] = "INVALID_RECIPIENT";
     BridgeErrorType["FLOW_RATE_ERROR"] = "FLOW_RATE_ERROR";
+    BridgeErrorType["INVALID_FLOWRATE_INDEX"] = "INVALID_FLOWRATE_INDEX";
 })(BridgeErrorType || (BridgeErrorType = {}));
 /**
  * Represents a custom error for bridge operations.
@@ -30953,6 +30573,7 @@ class TokenBridge {
             }, BridgeErrorType.INTERNAL_ERROR);
         }
         const flowRatePromises = [];
+        const flowRateLengthPromises = [];
         const flowRatePromisesReceivers = [];
         for (let i = 0, l = statusResponses.length; i < l; i++) {
             let metaStatus;
@@ -31000,26 +30621,40 @@ class TokenBridge {
                     ...txItem,
                     token: decodedData[1],
                     sender: decodedData[2],
-                    receiver: decodedData[3],
+                    recipient: decodedData[3],
                     amount: decodedData[4],
                 };
             }
-            let flowRatePromiseIndex;
+            let flowRatePromiseIndex = flowRatePromisesReceivers.findIndex((el) => el === txItem.recipient);
             if (metaStatus === StatusResponse.COMPLETE
-                && isWithdraw && txItem.receiver) {
+                && isWithdraw && txItem.recipient) {
                 // consolidate the calls we have to make to the flow rate by receiver
-                if (!flowRatePromisesReceivers.includes(txItem.receiver)) {
-                    flowRatePromises.push(rootBridge.getPendingWithdrawals(txItem.receiver, [0]));
-                    flowRatePromisesReceivers.push(txItem.receiver);
+                if (flowRatePromiseIndex === -1) {
+                    flowRatePromisesReceivers.push(txItem.recipient);
                     flowRatePromiseIndex = flowRatePromisesReceivers.length - 1;
                 }
-                else {
-                    flowRatePromiseIndex = flowRatePromisesReceivers.findIndex((el) => el === txItem.receiver);
-                }
                 txItem.data.flowRatePromiseIndex = flowRatePromiseIndex;
             }
             txStatusResponse.transactions.push(txItem);
         } // for
+        for (const flowRateReceiver of flowRatePromisesReceivers) {
+            flowRateLengthPromises.push(rootBridge.getPendingWithdrawalsLength(flowRateReceiver));
+        }
+        let flowRateLengthResponses = [];
+        try {
+            flowRateLengthResponses = await Promise.all(flowRateLengthPromises);
+        }
+        catch (err) {
+            throw new BridgeError(`Failed to fetch the Flow Rate pending lengths with the reason: ${err}`, BridgeErrorType.FLOW_RATE_ERROR);
+        }
+        for (let i = 0, l = flowRatePromisesReceivers.length; i < l; i++) {
+            const indices = [];
+            const indicesLength = flowRateLengthResponses[i].toNumber();
+            for (let j = 0; j < indicesLength; j++) {
+                indices.push(j);
+            }
+            flowRatePromises.push(rootBridge.getPendingWithdrawals(flowRatePromisesReceivers[i], indices));
+        }
         let flowRateResponses = [];
         if (flowRatePromises.length > 0) {
             try {
@@ -31054,33 +30689,49 @@ class TokenBridge {
    * @throws {BridgeError} - If an error occurs during the query, a BridgeError will be thrown with a specific error type.
    * @dev this SDK method is currently stubbed
    */
-    async getFlowRateInfo(req = {}) {
-        // eslint-disable-next-line no-console
-        console.log('stubbed response with req', req);
+    async getFlowRateInfo(req) {
+        if (!req.tokens || req.tokens.length === 0) {
+            throw new BridgeError(`invalid tokens array ${req.tokens}`, BridgeErrorType.INVALID_TOKEN);
+        }
+        const rootBridge = await withBridgeError(async () => {
+            const contract = new Contract(this.config.bridgeContracts.rootERC20BridgeFlowRate, ROOT_ERC20_BRIDGE_FLOW_RATE, this.config.rootProvider);
+            return contract;
+        }, BridgeErrorType.INTERNAL_ERROR);
+        const contractPromises = [];
+        contractPromises.push(rootBridge.withdrawalQueueActivated());
+        contractPromises.push(rootBridge.withdrawalDelay());
+        for (let token of req.tokens) {
+            if (token.toUpperCase() === 'NATIVE') {
+                token = ETHEREUM_NATIVE_TOKEN_ADDRESS;
+            }
+            contractPromises.push(rootBridge.flowRateBuckets(token));
+        }
+        let contractPromisesRes;
+        try {
+            contractPromisesRes = await Promise.all(contractPromises);
+        }
+        catch (err) {
+            throw new BridgeError('unable to query contract for flowrate info', BridgeErrorType.INTERNAL_ERROR);
+        }
+        const tokensRes = {};
+        // @note it's i + 2 because the first 2 promises are not token buckets
+        for (let i = 0, l = req.tokens.length; i < l; i++) {
+            tokensRes[req.tokens[i]] = {
+                capacity: contractPromisesRes[i + 2].capacity,
+                depth: contractPromisesRes[i + 2].depth,
+                refillTime: contractPromisesRes[i + 2].refillTime.toNumber(),
+                refillRate: contractPromisesRes[i + 2].refillRate,
+            };
+        }
         // Return the token mappings
         return {
-            withdrawalQueueActivated: false,
-            withdrawalDelay: 86400,
-            tokens: {
-                // eslint-disable-next-line @typescript-eslint/naming-convention
-                NATIVE: {
-                    capacity: parseUnits('10', 18).toString(),
-                    depth: parseUnits('10', 18).toString(),
-                    refillTime: 1701227629,
-                    refillRate: parseUnits('10', 18).toString(),
-                },
-                // eslint-disable-next-line @typescript-eslint/naming-convention
-                '0xF57e7e7C23978C3cAEC3C3548E3D615c346e79fF': {
-                    capacity: parseUnits('10', 18).toString(),
-                    depth: parseUnits('10', 18).toString(),
-                    refillTime: 1701227629,
-                    refillRate: parseUnits('10', 18).toString(),
-                },
-            },
+            withdrawalQueueActivated: contractPromisesRes[0],
+            withdrawalDelay: contractPromisesRes[1].toNumber(),
+            tokens: tokensRes,
         };
     }
     /**
-   * Queries the status of a bridge transaction.
+   * Fetches the pending withdrawals for a given address.
    *
    * @param {PendingWithdrawalsRequest} req - The request object containing the reciever address.
    * @returns {Promise<PendingWithdrawalsResponse>} - A promise that resolves to an object containing the child token address.
@@ -31089,25 +30740,46 @@ class TokenBridge {
    */
     async getPendingWithdrawals(req) {
         // eslint-disable-next-line no-console
-        console.log('stubbed response with req', req);
-        return {
-            pending: [{
-                    canWithdraw: true,
-                    withdrawer: '0xEac347177DbA4a190B632C7d9b8da2AbfF57c772',
-                    token: '0xF57e7e7C23978C3cAEC3C3548E3D615c346e79fF',
-                    amount: parseUnits('1', 18).toString(),
-                    timeoutStart: 1698502429,
-                    timeoutEnd: 1701227629,
-                },
-                {
-                    canWithdraw: false,
-                    withdrawer: '0xEac347177DbA4a190B632C7d9b8da2AbfF57c772',
-                    token: '0xF57e7e7C23978C3cAEC3C3548E3D615c346e79fF',
-                    amount: parseUnits('2', 18).toString(),
-                    timeoutStart: 1698416029,
-                    timeoutEnd: 1698502429,
-                }],
+        if (!req.recipient) {
+            throw new BridgeError(`invalid recipient ${req.recipient}`, BridgeErrorType.INVALID_RECIPIENT);
+        }
+        const rootBridge = await withBridgeError(async () => {
+            const contract = new Contract(this.config.bridgeContracts.rootERC20BridgeFlowRate, ROOT_ERC20_BRIDGE_FLOW_RATE, this.config.rootProvider);
+            return contract;
+        }, BridgeErrorType.INTERNAL_ERROR);
+        const pendingLength = await rootBridge.getPendingWithdrawalsLength(req.recipient);
+        const pendingWithdrawals = {
+            pending: [],
         };
+        if (pendingLength.toNumber() === 0) {
+            return pendingWithdrawals;
+        }
+        const indices = [];
+        for (let i = 0; i < pendingLength.toNumber(); i++) {
+            indices.push(i);
+        }
+        const pending = await rootBridge.getPendingWithdrawals(req.recipient, indices);
+        const timestampNow = Math.floor(Date.now() / 1000);
+        const withdrawalDelay = await rootBridge.withdrawalDelay();
+        for (let i = 0, l = pending.length; i < l; i++) {
+            const timeoutEnd = pending[i].timestamp.add(withdrawalDelay).toNumber();
+            if (timeoutEnd > timestampNow) {
+                pendingWithdrawals.pending[i] = {
+                    canWithdraw: false,
+                };
+            }
+            else {
+                pendingWithdrawals.pending[i] = {
+                    canWithdraw: true,
+                };
+            }
+            pendingWithdrawals.pending[i].withdrawer = pending[i].withdrawer;
+            pendingWithdrawals.pending[i].token = pending[i].token;
+            pendingWithdrawals.pending[i].amount = pending[i].amount;
+            pendingWithdrawals.pending[i].timeoutStart = pending[i].timestamp.toNumber();
+            pendingWithdrawals.pending[i].timeoutEnd = timeoutEnd;
+        }
+        return pendingWithdrawals;
     }
     /**
    * Retrieves the unsigned flow rate withdrawal transaction
@@ -31119,12 +30791,54 @@ class TokenBridge {
    */
     async getFlowRateWithdrawTx(req) {
         // eslint-disable-next-line no-console
-        console.log('stubbed response with req', req);
+        if (!req.recipient) {
+            throw new BridgeError(`invalid recipient ${req.recipient}`, BridgeErrorType.INVALID_RECIPIENT);
+        }
+        if (req.index < 0) {
+            throw new BridgeError(`invalid index ${req.index}`, BridgeErrorType.INVALID_FLOWRATE_INDEX);
+        }
+        const rootBridge = await withBridgeError(async () => {
+            const contract = new Contract(this.config.bridgeContracts.rootERC20BridgeFlowRate, ROOT_ERC20_BRIDGE_FLOW_RATE, this.config.rootProvider);
+            return contract;
+        }, BridgeErrorType.INTERNAL_ERROR);
+        const pending = await rootBridge.getPendingWithdrawals(req.recipient, [req.index]);
+        if (pending[0].withdrawer === AddressZero
+            || pending[0].token === AddressZero
+            || pending[0].amount === BigNumber.from(0)
+            || pending[0].timestamp === BigNumber.from(0)) {
+            throw new BridgeError(`pending withdrawal not found for ${req.recipient} at index ${req.index}`, BridgeErrorType.FLOW_RATE_ERROR);
+        }
+        const withdrawalDelay = await rootBridge.withdrawalDelay();
+        const timeoutEnd = pending[0].timestamp.add(withdrawalDelay).toNumber();
+        const timestampNow = Math.floor(Date.now() / 1000);
+        if (timeoutEnd > timestampNow) {
+            return {
+                pendingWithdrawal: {
+                    canWithdraw: false,
+                    withdrawer: pending[0].withdrawer,
+                    token: pending[0].token,
+                    amount: pending[0].amount,
+                    timeoutStart: pending[0].timestamp.toNumber(),
+                    timeoutEnd,
+                },
+                unsignedTx: null,
+            };
+        }
+        const data = await withBridgeError(async () => rootBridge.interface.encodeFunctionData('finaliseQueuedWithdrawal', [req.recipient, req.index]), BridgeErrorType.INTERNAL_ERROR);
         return {
+            pendingWithdrawal: {
+                canWithdraw: true,
+                withdrawer: pending[0].withdrawer,
+                token: pending[0].token,
+                amount: pending[0].amount,
+                timeoutStart: pending[0].timestamp.toNumber(),
+                timeoutEnd,
+            },
             unsignedTx: {
-                data: 'stubbed flow rate withdrawal data',
-                to: '0x0',
+                data,
+                to: this.config.bridgeContracts.rootERC20BridgeFlowRate,
                 value: 0,
+                chainId: parseInt(this.config.bridgeInstance.rootChainID, 10),
             },
         };
     }
@@ -31178,17 +30892,26 @@ const CONTRACTS_FOR_BRIDGE = new Map()
     .set(ETH_SEPOLIA_TO_ZKEVM_DEVNET, {
     rootERC20BridgeFlowRate: '0x0',
     childERC20Bridge: '0x0',
-    wrappedIMX: '0x0',
+    rootChainIMX: '0x0',
+    rootChainWrappedETH: '0x0',
+    childChainWrappedETH: '0x0',
+    childChainWrappedIMX: '0x0',
 })
     .set(ETH_SEPOLIA_TO_ZKEVM_TESTNET, {
     rootERC20BridgeFlowRate: '0x0D3C59c779Fd552C27b23F723E80246c840100F5',
     childERC20Bridge: '0x0D3C59c779Fd552C27b23F723E80246c840100F5',
-    wrappedIMX: '0x1CcCa691501174B4A623CeDA58cC8f1a76dc3439',
+    rootChainIMX: '0xe2629e08f4125d14e446660028bD98ee60EE69F2',
+    rootChainWrappedETH: '0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9',
+    childChainWrappedETH: '0xe9E96d1aad82562b7588F03f49aD34186f996478',
+    childChainWrappedIMX: '0x1CcCa691501174B4A623CeDA58cC8f1a76dc3439',
 })
     .set(ETH_MAINNET_TO_ZKEVM_MAINNET, {
-    rootERC20BridgeFlowRate: '0x0',
-    childERC20Bridge: '0x0',
-    wrappedIMX: '0x0',
+    rootERC20BridgeFlowRate: '0xBa5E35E26Ae59c7aea6F029B68c6460De2d13eB6',
+    childERC20Bridge: '0xBa5E35E26Ae59c7aea6F029B68c6460De2d13eB6',
+    rootChainIMX: '0xF57e7e7C23978C3cAEC3C3548E3D615c346e79fF',
+    rootChainWrappedETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+    childChainWrappedETH: '0x52a6c53869ce09a731cd772f245b97a4401d3348',
+    childChainWrappedIMX: '0x3a0c2ba54d6cbd3121f01b96dfd20e99d1696c9d',
 });
 /**
  * Represents the configuration for a bridge between two chains.
@@ -31551,134 +31274,6 @@ class ERC20__factory {
 /* tslint:disable */
 /* eslint-disable */
 const _abi$2 = [
-    {
-        inputs: [],
-        name: "getCurrentBlockTimestamp",
-        outputs: [
-            {
-                internalType: "uint256",
-                name: "timestamp",
-                type: "uint256",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-    },
-    {
-        inputs: [
-            {
-                internalType: "address",
-                name: "addr",
-                type: "address",
-            },
-        ],
-        name: "getEthBalance",
-        outputs: [
-            {
-                internalType: "uint256",
-                name: "balance",
-                type: "uint256",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-    },
-    {
-        inputs: [
-            {
-                components: [
-                    {
-                        internalType: "address",
-                        name: "target",
-                        type: "address",
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "gasLimit",
-                        type: "uint256",
-                    },
-                    {
-                        internalType: "bytes",
-                        name: "callData",
-                        type: "bytes",
-                    },
-                ],
-                internalType: "struct UniswapInterfaceMulticall.Call[]",
-                name: "calls",
-                type: "tuple[]",
-            },
-        ],
-        name: "multicall",
-        outputs: [
-            {
-                internalType: "uint256",
-                name: "blockNumber",
-                type: "uint256",
-            },
-            {
-                components: [
-                    {
-                        internalType: "bool",
-                        name: "success",
-                        type: "bool",
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "gasUsed",
-                        type: "uint256",
-                    },
-                    {
-                        internalType: "bytes",
-                        name: "returnData",
-                        type: "bytes",
-                    },
-                ],
-                internalType: "struct UniswapInterfaceMulticall.Result[]",
-                name: "returnData",
-                type: "tuple[]",
-            },
-        ],
-        stateMutability: "nonpayable",
-        type: "function",
-    },
-];
-const _bytecode$2 = "0x608060405234801561001057600080fd5b50610567806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80630f28c97d146100465780631749e1e3146100645780634d2301cc14610085575b600080fd5b61004e610098565b60405161005b919061041f565b60405180910390f35b6100776100723660046102a7565b61009c565b60405161005b929190610428565b61004e610093366004610286565b610220565b4290565b8051439060609067ffffffffffffffff811180156100b957600080fd5b506040519080825280602002602001820160405280156100f357816020015b6100e061023a565b8152602001906001900390816100d85790505b50905060005b835181101561021a57600080600086848151811061011357fe5b60200260200101516000015187858151811061012b57fe5b60200260200101516020015188868151811061014357fe5b60200260200101516040015192509250925060005a90506000808573ffffffffffffffffffffffffffffffffffffffff1685856040516101839190610403565b60006040518083038160008787f1925050503d80600081146101c1576040519150601f19603f3d011682016040523d82523d6000602084013e6101c6565b606091505b509150915060005a8403905060405180606001604052808415158152602001828152602001838152508989815181106101fb57fe5b60200260200101819052505050505050505080806001019150506100f9565b50915091565b73ffffffffffffffffffffffffffffffffffffffff163190565b604051806060016040528060001515815260200160008152602001606081525090565b803573ffffffffffffffffffffffffffffffffffffffff8116811461028157600080fd5b919050565b600060208284031215610297578081fd5b6102a08261025d565b9392505050565b600060208083850312156102b9578182fd5b823567ffffffffffffffff808211156102d0578384fd5b818501915085601f8301126102e3578384fd5b8135818111156102ef57fe5b6102fc8485830201610506565b81815284810190848601875b848110156103f457813587017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0606081838f03011215610346578a8bfd5b60408051606081018181108b8211171561035c57fe5b8252610369848d0161025d565b8152818401358c82015260608401358a811115610384578d8efd5b8085019450508e603f850112610398578c8dfd5b8b8401358a8111156103a657fe5b6103b68d85601f84011601610506565b93508084528f838287010111156103cb578d8efd5b808386018e86013783018c018d9052908101919091528552509287019290870190600101610308565b50909998505050505050505050565b6000825161041581846020870161052a565b9190910192915050565b90815260200190565b600060408083018584526020828186015281865180845260609350838701915083838202880101838901875b838110156104f6578983037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa001855281518051151584528681015187850152880151888401889052805188850181905260806104b582828801858c0161052a565b96880196601f919091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01694909401909301925090850190600101610454565b50909a9950505050505050505050565b60405181810167ffffffffffffffff8111828210171561052257fe5b604052919050565b60005b8381101561054557818101518382015260200161052d565b83811115610554576000848401525b5050505056fea164736f6c6343000706000a";
-const isSuperArgs$2 = (xs) => xs.length > 1;
-class Multicall__factory extends ContractFactory {
-    constructor(...args) {
-        if (isSuperArgs$2(args)) {
-            super(...args);
-        }
-        else {
-            super(_abi$2, _bytecode$2, args[0]);
-        }
-    }
-    deploy(overrides) {
-        return super.deploy(overrides || {});
-    }
-    getDeployTransaction(overrides) {
-        return super.getDeployTransaction(overrides || {});
-    }
-    attach(address) {
-        return super.attach(address);
-    }
-    connect(signer) {
-        return super.connect(signer);
-    }
-    static bytecode = _bytecode$2;
-    static abi = _abi$2;
-    static createInterface() {
-        return new utils$2.Interface(_abi$2);
-    }
-    static connect(address, signerOrProvider) {
-        return new Contract$1(address, _abi$2, signerOrProvider);
-    }
-}
-
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-const _abi$1 = [
     {
         inputs: [
             {
@@ -31962,7 +31557,7 @@ const _abi$1 = [
                         type: "uint256",
                     },
                 ],
-                internalType: "struct ISecondaryFee.SecondaryFeeParams[]",
+                internalType: "struct IImmutableSwapProxy.SecondaryFeeParams[]",
                 name: "secondaryFees",
                 type: "tuple[]",
             },
@@ -32035,7 +31630,7 @@ const _abi$1 = [
                         type: "uint256",
                     },
                 ],
-                internalType: "struct ISecondaryFee.SecondaryFeeParams[]",
+                internalType: "struct IImmutableSwapProxy.SecondaryFeeParams[]",
                 name: "secondaryFees",
                 type: "tuple[]",
             },
@@ -32093,7 +31688,7 @@ const _abi$1 = [
                         type: "uint256",
                     },
                 ],
-                internalType: "struct ISecondaryFee.SecondaryFeeParams[]",
+                internalType: "struct IImmutableSwapProxy.SecondaryFeeParams[]",
                 name: "secondaryFees",
                 type: "tuple[]",
             },
@@ -32144,7 +31739,7 @@ const _abi$1 = [
         outputs: [
             {
                 internalType: "uint256",
-                name: "",
+                name: "amountIn",
                 type: "uint256",
             },
         ],
@@ -32166,7 +31761,7 @@ const _abi$1 = [
                         type: "uint256",
                     },
                 ],
-                internalType: "struct ISecondaryFee.SecondaryFeeParams[]",
+                internalType: "struct IImmutableSwapProxy.SecondaryFeeParams[]",
                 name: "secondaryFees",
                 type: "tuple[]",
             },
@@ -32202,7 +31797,7 @@ const _abi$1 = [
         outputs: [
             {
                 internalType: "uint256",
-                name: "",
+                name: "amountIn",
                 type: "uint256",
             },
         ],
@@ -32444,15 +32039,15 @@ const _abi$1 = [
         type: "receive",
     },
 ];
-const _bytecode$1 = "0x60806040523480156200001157600080fd5b50604051620031e1380380620031e183398101604081905262000034916200015c565b6001805460ff191690556200004b6000846200009e565b600180546001600160a01b039384166101008102610100600160a81b03199092169190911790915560038054929093166001600160a01b03199283161790925560028054909116909117905550620001a6565b6000828152602081815260408083206001600160a01b038516845290915290205460ff166200013b576000828152602081815260408083206001600160a01b03851684529091529020805460ff19166001179055620000fa3390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45b5050565b80516001600160a01b03811681146200015757600080fd5b919050565b6000806000606084860312156200017257600080fd5b6200017d846200013f565b92506200018d602085016200013f565b91506200019d604085016200013f565b90509250925092565b61302b80620001b66000396000f3fe6080604052600436106101175760003560e01c806358e81a50116100a05780638456cb59116100645780638456cb59146102c457806391d14854146102d9578063a217fddf146102f9578063ac9650d81461030e578063d547741f1461032e57600080fd5b806358e81a50146102465780635ae401dc146102595780635c975abb146102795780635ebca7991461029157806368742da6146102a457600080fd5b80632f2ff15d116100e75780632f2ff15d146101cb57806336568abe146101eb578063383ebb0b1461020b5780633f4ba83a1461021e5780635640f6591461023357600080fd5b80620fa9fb1461012357806301ffc9a714610145578063116944b21461017a578063248a9ca31461019b57600080fd5b3661011e57005b600080fd5b34801561012f57600080fd5b5061014361013e3660046127c3565b61034e565b005b34801561015157600080fd5b506101656101603660046127fc565b61041a565b60405190151581526020015b60405180910390f35b61018d61018836600461298d565b610451565b604051908152602001610171565b3480156101a757600080fd5b5061018d6101b63660046129e2565b60009081526020819052604090206001015490565b3480156101d757600080fd5b506101436101e63660046129fb565b6106d3565b3480156101f757600080fd5b506101436102063660046129fb565b6106f8565b61018d610219366004612ae3565b61077b565b34801561022a57600080fd5b50610143610ae7565b61018d610241366004612ae3565b610b37565b61018d61025436600461298d565b610db2565b61026c610267366004612b8f565b6110e4565b6040516101719190612c2a565b34801561028557600080fd5b5060015460ff16610165565b61014361029f3660046129e2565b611119565b3480156102b057600080fd5b506101436102bf366004612c8c565b611266565b3480156102d057600080fd5b506101436112e1565b3480156102e557600080fd5b506101656102f43660046129fb565b61132f565b34801561030557600080fd5b5061018d600081565b34801561031a57600080fd5b5061026c610329366004612ca9565b611358565b34801561033a57600080fd5b506101436103493660046129fb565b61144c565b6103787f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e9828693361132f565b610394576040516282b42960e81b815260040160405180910390fd5b6040516370a0823160e01b81523060048201526000906001600160a01b038316906370a0823190602401602060405180830381865afa1580156103db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ff9190612cea565b90506104156001600160a01b0383168483611471565b505050565b60006001600160e01b03198216637965db0b60e01b148061044b57506301ffc9a760e01b6001600160e01b03198316145b92915050565b600061045f60015460ff1690565b1561047d5760405163ab35696f60e01b815260040160405180910390fd5b61048a82606001516114d4565b6104a75760405163519bdea760e01b815260040160405180910390fd5b4780156105e757826080015181146104d2576040516342f7487960e11b815260040160405180910390fd5b60035483516001600160a01b03908116911614610502576040516324d0121760e01b815260040160405180910390fd5b61056283608001518686808060200260200160405190810160405280939291908181526020016000905b828210156105585761054960408302860136819003810190612d03565b8152602001906001019061052c565b50505050506114fa565b608084018190526001546040516304e45aaf60e01b81526101009091046001600160a01b0316916304e45aaf9161059d908790600401612d5a565b60206040518083038185885af11580156105bb573d6000803e3d6000fd5b50505050506040513d601f19601f820116820180604052508101906105e09190612cea565b91506106cb565b61064c836000015184608001518787808060200260200160405190810160405280939291908181526020016000905b828210156106425761063360408302860136819003810190612d03565b81526020019060010190610616565b505050505061154c565b60808401526001546040516304e45aaf60e01b81526101009091046001600160a01b0316906304e45aaf90610685908690600401612d5a565b6020604051808303816000875af11580156106a4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106c89190612cea565b91505b509392505050565b6000828152602081905260409020600101546106ee816115a9565b61041583836115b3565b6001600160a01b038116331461076d5760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b60648201526084015b60405180910390fd5b6107778282611637565b5050565b600061078960015460ff1690565b156107a75760405163ab35696f60e01b815260040160405180910390fd5b6107b482602001516114d4565b6107d15760405163519bdea760e01b815260040160405180910390fd5b60006107e0836000015161169c565b9050478015610992576003546001600160a01b03838116911614610817576040516324d0121760e01b815260040160405180910390fd5b8360600151811461083b576040516342f7487960e11b815260040160405180910390fd5b60008061089e86606001518989808060200260200160405190810160405280939291908181526020016000905b828210156108945761088560408302860136819003810190612d03565b81526020019060010190610868565b50505050506116ca565b606088018190526001546040516304dc09a360e11b81529294509092506000916101009091046001600160a01b0316906309b813469084906108e4908b90600401612e00565b60206040518083038185885af1158015610902573d6000803e3d6000fd5b50505050506040513d601f19601f820116820180604052508101906109279190612cea565b905061098681848b8b808060200260200160405190810160405280939291908181526020016000905b8282101561097c5761096d60408302860136819003810190612d03565b81526020019060010190610950565b505050505061171d565b95505050505050610ae0565b6000806109f68487606001518a8a808060200260200160405190810160405280939291908181526020016000905b828210156109ec576109dd60408302860136819003810190612d03565b815260200190600101906109c0565b5050505050611811565b606088018190526001546040516304dc09a360e11b81529294509092506000916101009091046001600160a01b0316906309b8134690610a3a908a90600401612e00565b6020604051808303816000875af1158015610a59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a7d9190612cea565b90506109868582858c8c808060200260200160405190810160405280939291908181526020016000905b82821015610ad357610ac460408302860136819003810190612d03565b81526020019060010190610aa7565b505050505061186b565b50505b9392505050565b610b117fe7276a2a84d8de556657ec9cf93a55a7d66f096e529d0582ed08e9e2208b92b53361132f565b610b2d576040516282b42960e81b815260040160405180910390fd5b610b356118c7565b565b6000610b4560015460ff1690565b15610b635760405163ab35696f60e01b815260040160405180910390fd5b610b7082602001516114d4565b610b8d5760405163519bdea760e01b815260040160405180910390fd5b6000610b9c8360000151611919565b9050478015610cd25783604001518114610bc9576040516342f7487960e11b815260040160405180910390fd5b6003546001600160a01b03838116911614610bf7576040516324d0121760e01b815260040160405180910390fd5b610c4d84604001518787808060200260200160405190810160405280939291908181526020016000905b8282101561055857610c3e60408302860136819003810190612d03565b81526020019060010190610c21565b6040858101829052600154905163b858183f60e01b81526101009091046001600160a01b03169163b858183f91610c88908890600401612e00565b60206040518083038185885af1158015610ca6573d6000803e3d6000fd5b50505050506040513d601f19601f82011682018060405250810190610ccb9190612cea565b9250610add565b610d298285604001518888808060200260200160405190810160405280939291908181526020016000905b8282101561064257610d1a60408302860136819003810190612d03565b81526020019060010190610cfd565b604085810191909152600154905163b858183f60e01b81526101009091046001600160a01b03169063b858183f90610d65908790600401612e00565b6020604051808303816000875af1158015610d84573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610da89190612cea565b9695505050505050565b6000610dc060015460ff1690565b15610dde5760405163ab35696f60e01b815260040160405180910390fd5b610deb82606001516114d4565b610e085760405163519bdea760e01b815260040160405180910390fd5b478015610fa55760035483516001600160a01b03908116911614610e3f576040516324d0121760e01b815260040160405180910390fd5b8260a001518114610e63576040516342f7487960e11b815260040160405180910390fd5b600080610ebc8560a001518888808060200260200160405190810160405280939291908181526020016000905b8282101561089457610ead60408302860136819003810190612d03565b81526020019060010190610e90565b60a08701819052600154604051635023b4df60e01b81529294509092506000916101009091046001600160a01b031690635023b4df908490610f02908a90600401612d5a565b60206040518083038185885af1158015610f20573d6000803e3d6000fd5b50505050506040513d601f19601f82011682018060405250810190610f459190612cea565b9050610f9a81848a8a808060200260200160405190810160405280939291908181526020016000905b8282101561097c57610f8b60408302860136819003810190612d03565b81526020019060010190610f6e565b945050505050610ae0565b60008061100385600001518660a001518989808060200260200160405190810160405280939291908181526020016000905b828210156109ec57610ff460408302860136819003810190612d03565b81526020019060010190610fd7565b60a08701819052600154604051635023b4df60e01b81529294509092506000916101009091046001600160a01b031690635023b4df90611047908990600401612d5a565b6020604051808303816000875af1158015611066573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061108a9190612cea565b9050610f9a866000015182858b8b808060200260200160405190810160405280939291908181526020016000905b82821015610ad3576110d560408302860136819003810190612d03565b815260200190600101906110b8565b6060834211156111075760405163387b2e5560e11b815260040160405180910390fd5b6111118383611358565b949350505050565b6003546040516370a0823160e01b81523060048201526000916001600160a01b0316906370a0823190602401602060405180830381865afa158015611162573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111869190612cea565b9050818110156111cc5760405162461bcd60e51b8152602060048201526011602482015270092dce6eaccccd2c6d2cadce840ae929ab607b1b6044820152606401610764565b801561077757600354604051632e1a7d4d60e01b8152600481018390526001600160a01b0390911690632e1a7d4d90602401600060405180830381600087803b15801561121857600080fd5b505af115801561122c573d6000803e3d6000fd5b50505050600061123c3383611925565b905080610415576040516342fb4ceb60e11b81526004810184905260248101839052604401610764565b6112907f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e9828693361132f565b6112ac576040516282b42960e81b815260040160405180910390fd5b47156112de5760006112be8247611925565b90508061077757604051633398652560e11b815260040160405180910390fd5b50565b61130b7ffcb9fcbfa83b897fb2d5cf4b58962164105c1e71489a37ef3ae0db3fdce576f63361132f565b611327576040516282b42960e81b815260040160405180910390fd5b610b356119cf565b6000918252602082815260408084206001600160a01b0393909316845291905290205460ff1690565b6060816001600160401b038111156113725761137261286a565b6040519080825280602002602001820160405280156113a557816020015b60608152602001906001900390816113905790505b50905060005b8281101561144557611415308585848181106113c9576113c9612e13565b90506020028101906113db9190612e29565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250611a0a92505050565b82828151811061142757611427612e13565b6020026020010181905250808061143d90612e85565b9150506113ab565b5092915050565b600082815260208190526040902060010154611467816115a9565b6104158383611637565b6040516001600160a01b03831660248201526044810182905261041590849063a9059cbb60e01b906064015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152611a2f565b60006001600160a01b03821633148061044b57506001600160a01b038216301492915050565b600061150582611b04565b506000806115138585611b77565b90925090506115228286612e9e565b945061152d81611ca0565b600354611543906001600160a01b031686611d7f565b50929392505050565b600061155782611b04565b506000806115658585611b77565b90925090506115748286612e9e565b94506115808682611e7c565b6115956001600160a01b038716333088611f85565b61159f8686611d7f565b5092949350505050565b6112de8133611fc3565b6115bd828261132f565b610777576000828152602081815260408083206001600160a01b03851684529091529020805460ff191660011790556115f33390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b611641828261132f565b15610777576000828152602081815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b600080601483516116ad9190612e9e565b905060006116bd8483601461201c565b9050611111816000612129565b60008060006116d884611b04565b905060006116e882612710612eb1565b90506116f7866127108361218e565b600354909350611710906001600160a01b031684611d7f565b85935050505b9250929050565b600080600061172c8685611b77565b9150915061173981611ca0565b600260009054906101000a90046001600160a01b03166001600160a01b03166312210e8a6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561178957600080fd5b505af115801561179d573d6000803e3d6000fd5b5050505060008287876117b09190612e9e565b6117ba9190612e9e565b604051909150600090339083156108fc0290849084818181858888f193505050509050806117fb576040516382e4f46960e01b815260040160405180910390fd5b6118058489612eb1565b98975050505050505050565b600080600061181f84611b04565b9050600061182f82612710612eb1565b905061183e866127108361218e565b925061184a8784611d7f565b61185f6001600160a01b038816333089611f85565b50939590945092505050565b600080600061187a8685611b77565b9150915061188887826121ce565b6118b233836118978989612e9e565b6118a19190612e9e565b6001600160a01b038a169190611471565b6118bc8287612eb1565b979650505050505050565b6118cf6122d5565b6001805460ff191690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b6040516001600160a01b03909116815260200160405180910390a1565b600061044b8282612129565b6000814710156119775760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a20696e73756666696369656e742062616c616e63650000006044820152606401610764565b6040516001600160a01b038416908390600081818185875af1925050503d80600081146119c0576040519150601f19603f3d011682016040523d82523d6000602084013e6119c5565b606091505b5090949350505050565b6119d761231e565b6001805460ff1916811790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a258336118fc565b6060610ae08383604051806060016040528060278152602001612fcf60279139612364565b6000611a84826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166123d29092919063ffffffff16565b9050805160001480611aa5575080806020019051810190611aa59190612ec4565b6104155760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610764565b6000805b8251811015611b4e57828181518110611b2357611b23612e13565b60200260200101516020015182611b3a9190612eb1565b915080611b4681612e85565b915050611b08565b506103e8811115611b725760405163cd4e616760e01b815260040160405180910390fd5b919050565b6000606082516001600160401b03811115611b9457611b9461286a565b604051908082528060200260200182016040528015611bd957816020015b6040805180820190915260008082526020820152815260200190600190039081611bb25790505b50905060005b8351811015611c98576000611c1e858381518110611bff57611bff612e13565b602002602001015160200151612710886123e19092919063ffffffff16565b90506040518060400160405280868481518110611c3d57611c3d612e13565b6020026020010151600001516001600160a01b0316815260200182815250838381518110611c6d57611c6d612e13565b6020908102919091010152611c828185612eb1565b9350508080611c9090612e85565b915050611bdf565b509250929050565b60005b8151811015610777576000828281518110611cc057611cc0612e13565b602002602001015190506000611cde82600001518360200151611925565b905080611d1557815160208301516040516208c3b360e61b81526001600160a01b0390921660048301526024820152604401610764565b81600001516001600160a01b0316336001600160a01b03167fe0e765ab26c1caf691c510426951246128b96830e49cc81d8c093fd551abac358460200151604051611d6291815260200190565b60405180910390a350508080611d7790612e85565b915050611ca3565b600154604051636eb1769f60e11b81523060048201526001600160a01b0361010090920482166024820152829184169063dd62ed3e90604401602060405180830381865afa158015611dd5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611df99190612cea565b10156107775760015460405163095ea7b360e01b81526101009091046001600160a01b039081166004830152600019602483015283169063095ea7b3906044016020604051808303816000875af1158015611e58573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104159190612ec4565b60005b815181101561041557611ee233838381518110611e9e57611e9e612e13565b602002602001015160000151848481518110611ebc57611ebc612e13565b602002602001015160200151866001600160a01b0316611f85909392919063ffffffff16565b818181518110611ef457611ef4612e13565b6020026020010151600001516001600160a01b0316336001600160a01b0316846001600160a01b03167f1f9a9fdac86b6ca3c5300bec0b61555cded1f1a234378602dcca6c27085eac8e858581518110611f5057611f50612e13565b602002602001015160200151604051611f6b91815260200190565b60405180910390a480611f7d81612e85565b915050611e7f565b6040516001600160a01b0380851660248301528316604482015260648101829052611fbd9085906323b872dd60e01b9060840161149d565b50505050565b611fcd828261132f565b61077757611fda81612483565b611fe5836020612495565b604051602001611ff6929190612ee6565b60408051601f198184030181529082905262461bcd60e51b825261076491600401612f5b565b60608161202a81601f612eb1565b10156120695760405162461bcd60e51b815260206004820152600e60248201526d736c6963655f6f766572666c6f7760901b6044820152606401610764565b6120738284612eb1565b845110156120b75760405162461bcd60e51b8152602060048201526011602482015270736c6963655f6f75744f66426f756e647360781b6044820152606401610764565b6060821580156120d65760405191506000825260208201604052612120565b6040519150601f8416801560200281840101858101878315602002848b0101015b8183101561210f5780518352602092830192016120f7565b5050858452601f01601f1916604052505b50949350505050565b6000612136826014612eb1565b8351101561217e5760405162461bcd60e51b8152602060048201526015602482015274746f416464726573735f6f75744f66426f756e647360581b6044820152606401610764565b500160200151600160601b900490565b600061219b8484846123e1565b9050600082806121ad576121ad612f6e565b8486091115610ae05760001981106121c457600080fd5b6001019392505050565b60005b8151811015610415576122328282815181106121ef576121ef612e13565b60200260200101516000015183838151811061220d5761220d612e13565b602002602001015160200151856001600160a01b03166114719092919063ffffffff16565b81818151811061224457612244612e13565b6020026020010151600001516001600160a01b0316336001600160a01b0316846001600160a01b03167f1f9a9fdac86b6ca3c5300bec0b61555cded1f1a234378602dcca6c27085eac8e8585815181106122a0576122a0612e13565b6020026020010151602001516040516122bb91815260200190565b60405180910390a4806122cd81612e85565b9150506121d1565b60015460ff16610b355760405162461bcd60e51b815260206004820152601460248201527314185d5cd8589b194e881b9bdd081c185d5cd95960621b6044820152606401610764565b60015460ff1615610b355760405162461bcd60e51b815260206004820152601060248201526f14185d5cd8589b194e881c185d5cd95960821b6044820152606401610764565b6060600080856001600160a01b0316856040516123819190612f84565b600060405180830381855af49150503d80600081146123bc576040519150601f19603f3d011682016040523d82523d6000602084013e6123c1565b606091505b5091509150610da886838387612630565b606061111184846000856126a9565b6000838302816000198587098281108382030391505080841161240357600080fd5b8060000361241657508290049050610ae0565b6000848688096000868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b606061044b6001600160a01b03831660145b606060006124a4836002612fa0565b6124af906002612eb1565b6001600160401b038111156124c6576124c661286a565b6040519080825280601f01601f1916602001820160405280156124f0576020820181803683370190505b509050600360fc1b8160008151811061250b5761250b612e13565b60200101906001600160f81b031916908160001a905350600f60fb1b8160018151811061253a5761253a612e13565b60200101906001600160f81b031916908160001a905350600061255e846002612fa0565b612569906001612eb1565b90505b60018111156125e1576f181899199a1a9b1b9c1cb0b131b232b360811b85600f166010811061259d5761259d612e13565b1a60f81b8282815181106125b3576125b3612e13565b60200101906001600160f81b031916908160001a90535060049490941c936125da81612fb7565b905061256c565b508315610ae05760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610764565b6060831561269f578251600003612698576001600160a01b0385163b6126985760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610764565b5081611111565b6111118383612779565b60608247101561270a5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401610764565b600080866001600160a01b031685876040516127269190612f84565b60006040518083038185875af1925050503d8060008114612763576040519150601f19603f3d011682016040523d82523d6000602084013e612768565b606091505b50915091506118bc87838387612630565b8151156127895781518083602001fd5b8060405162461bcd60e51b81526004016107649190612f5b565b6001600160a01b03811681146112de57600080fd5b8035611b72816127a3565b600080604083850312156127d657600080fd5b82356127e1816127a3565b915060208301356127f1816127a3565b809150509250929050565b60006020828403121561280e57600080fd5b81356001600160e01b031981168114610ae057600080fd5b60008083601f84011261283857600080fd5b5081356001600160401b0381111561284f57600080fd5b6020830191508360208260061b850101111561171657600080fd5b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b03811182821017156128a2576128a261286a565b60405290565b604051608081016001600160401b03811182821017156128a2576128a261286a565b604051601f8201601f191681016001600160401b03811182821017156128f2576128f261286a565b604052919050565b600060e0828403121561290c57600080fd5b612914612880565b90508135612921816127a3565b81526020820135612931816127a3565b6020820152604082013562ffffff8116811461294c57600080fd5b604082015261295d606083016127b8565b60608201526080820135608082015260a082013560a082015261298260c083016127b8565b60c082015292915050565b600080600061010084860312156129a357600080fd5b83356001600160401b038111156129b957600080fd5b6129c586828701612826565b90945092506129d9905085602086016128fa565b90509250925092565b6000602082840312156129f457600080fd5b5035919050565b60008060408385031215612a0e57600080fd5b8235915060208301356127f1816127a3565b600060808284031215612a3257600080fd5b612a3a6128a8565b905081356001600160401b0380821115612a5357600080fd5b818401915084601f830112612a6757600080fd5b8135602082821115612a7b57612a7b61286a565b612a8d601f8301601f191682016128ca565b92508183528681838601011115612aa357600080fd5b81818501828501376000818385010152828552612ac18187016127b8565b8186015250505050604082013560408201526060820135606082015292915050565b600080600060408486031215612af857600080fd5b83356001600160401b0380821115612b0f57600080fd5b612b1b87838801612826565b90955093506020860135915080821115612b3457600080fd5b50612b4186828701612a20565b9150509250925092565b60008083601f840112612b5d57600080fd5b5081356001600160401b03811115612b7457600080fd5b6020830191508360208260051b850101111561171657600080fd5b600080600060408486031215612ba457600080fd5b8335925060208401356001600160401b03811115612bc157600080fd5b612bcd86828701612b4b565b9497909650939450505050565b60005b83811015612bf5578181015183820152602001612bdd565b50506000910152565b60008151808452612c16816020860160208601612bda565b601f01601f19169290920160200192915050565b6000602080830181845280855180835260408601915060408160051b870101925083870160005b82811015612c7f57603f19888603018452612c6d858351612bfe565b94509285019290850190600101612c51565b5092979650505050505050565b600060208284031215612c9e57600080fd5b8135610ae0816127a3565b60008060208385031215612cbc57600080fd5b82356001600160401b03811115612cd257600080fd5b612cde85828601612b4b565b90969095509350505050565b600060208284031215612cfc57600080fd5b5051919050565b600060408284031215612d1557600080fd5b604051604081018181106001600160401b0382111715612d3757612d3761286a565b6040528235612d45816127a3565b81526020928301359281019290925250919050565b60e0810161044b828480516001600160a01b03908116835260208083015182169084015260408083015162ffffff16908401526060808301518216908401526080808301519084015260a0828101519084015260c09182015116910152565b6000815160808452612dce6080850182612bfe565b6020848101516001600160a01b0316908601526040808501519086015260609384015193909401929092525090919050565b602081526000610ae06020830184612db9565b634e487b7160e01b600052603260045260246000fd5b6000808335601e19843603018112612e4057600080fd5b8301803591506001600160401b03821115612e5a57600080fd5b60200191503681900382131561171657600080fd5b634e487b7160e01b600052601160045260246000fd5b600060018201612e9757612e97612e6f565b5060010190565b8181038181111561044b5761044b612e6f565b8082018082111561044b5761044b612e6f565b600060208284031215612ed657600080fd5b81518015158114610ae057600080fd5b7f416363657373436f6e74726f6c3a206163636f756e7420000000000000000000815260008351612f1e816017850160208801612bda565b7001034b99036b4b9b9b4b733903937b6329607d1b6017918401918201528351612f4f816028840160208801612bda565b01602801949350505050565b602081526000610ae06020830184612bfe565b634e487b7160e01b600052601260045260246000fd5b60008251612f96818460208701612bda565b9190910192915050565b808202811582820484141761044b5761044b612e6f565b600081612fc657612fc6612e6f565b50600019019056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122060463b8c42f8b619093981b0f594938e67042d40ad9d5eadd4922e9bc3000dde64736f6c63430008130033";
-const isSuperArgs$1 = (xs) => xs.length > 1;
-class SecondaryFee__factory extends ContractFactory {
+const _bytecode$2 = "0x60806040523480156200001157600080fd5b50604051620034dd380380620034dd83398101604081905262000034916200015c565b6001805460ff191690556200004b6000846200009e565b600180546001600160a01b039384166101008102610100600160a81b03199092169190911790915560038054929093166001600160a01b03199283161790925560028054909116909117905550620001a6565b6000828152602081815260408083206001600160a01b038516845290915290205460ff166200013b576000828152602081815260408083206001600160a01b03851684529091529020805460ff19166001179055620000fa3390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45b5050565b80516001600160a01b03811681146200015757600080fd5b919050565b6000806000606084860312156200017257600080fd5b6200017d846200013f565b92506200018d602085016200013f565b91506200019d604085016200013f565b90509250925092565b61332780620001b66000396000f3fe6080604052600436106101175760003560e01c806358e81a50116100a05780638456cb59116100645780638456cb59146102c457806391d14854146102d9578063a217fddf146102f9578063ac9650d81461030e578063d547741f1461032e57600080fd5b806358e81a50146102465780635ae401dc146102595780635c975abb146102795780635ebca7991461029157806368742da6146102a457600080fd5b80632f2ff15d116100e75780632f2ff15d146101cb57806336568abe146101eb578063383ebb0b1461020b5780633f4ba83a1461021e5780635640f6591461023357600080fd5b80620fa9fb1461012357806301ffc9a714610145578063116944b21461017a578063248a9ca31461019b57600080fd5b3661011e57005b600080fd5b34801561012f57600080fd5b5061014361013e366004612ab8565b61034e565b005b34801561015157600080fd5b50610165610160366004612af1565b61041a565b60405190151581526020015b60405180910390f35b61018d610188366004612c89565b610451565b604051908152602001610171565b3480156101a757600080fd5b5061018d6101b6366004612cde565b60009081526020819052604090206001015490565b3480156101d757600080fd5b506101436101e6366004612cf7565b610771565b3480156101f757600080fd5b50610143610206366004612cf7565b610796565b61018d610219366004612ddf565b610819565b34801561022a57600080fd5b50610143610b86565b61018d610241366004612ddf565b610bd6565b61018d610254366004612c89565b610ee4565b61026c610267366004612e8b565b61121e565b6040516101719190612f26565b34801561028557600080fd5b5060015460ff16610165565b61014361029f366004612cde565b611255565b3480156102b057600080fd5b506101436102bf366004612f88565b6113ad565b3480156102d057600080fd5b50610143611428565b3480156102e557600080fd5b506101656102f4366004612cf7565b611476565b34801561030557600080fd5b5061018d600081565b34801561031a57600080fd5b5061026c610329366004612fa5565b61149f565b34801561033a57600080fd5b50610143610349366004612cf7565b611593565b6103787f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286933611476565b610394576040516282b42960e81b815260040160405180910390fd5b6040516370a0823160e01b81523060048201526000906001600160a01b038316906370a0823190602401602060405180830381865afa1580156103db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ff9190612fe6565b90506104156001600160a01b03831684836115b8565b505050565b60006001600160e01b03198216637965db0b60e01b148061044b57506301ffc9a760e01b6001600160e01b03198316145b92915050565b600061045f60015460ff1690565b1561047d5760405163ab35696f60e01b815260040160405180910390fd5b61048a826060015161161b565b6104a75760405163519bdea760e01b815260040160405180910390fd5b608082015134801561065a57836080015181146104d7576040516342f7487960e11b815260040160405180910390fd5b60035484516001600160a01b03908116911614610507576040516324d0121760e01b815260040160405180910390fd5b60008061056f866000015187608001518a8a808060200260200160405190810160405280939291908181526020016000905b828210156105655761055660408302860136819003810190612fff565b81526020019060010190610539565b5050505050611641565b608088018290526001546040516304e45aaf60e01b815292945090925061010090046001600160a01b0316906304e45aaf9084906105b1908a90600401613056565b60206040518083038185885af11580156105cf573d6000803e3d6000fd5b50505050506040513d601f19601f820116820180604052508101906105f49190612fe6565b945061065384828a8a808060200260200160405190810160405280939291908181526020016000905b828210156106495761063a60408302860136819003810190612fff565b8152602001906001019061061d565b5050505050611679565b5050610768565b6000806106b8866000015187608001518a8a808060200260200160405190810160405280939291908181526020016000905b82821015610565576106a960408302860136819003810190612fff565b8152602001906001019061068c565b60808801829052875191935091506106db906001600160a01b031633308561170c565b6001546040516304e45aaf60e01b81526101009091046001600160a01b0316906304e45aaf9061070f908990600401613056565b6020604051808303816000875af115801561072e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107529190612fe6565b9450610765866000015185838b8b61174a565b50505b50509392505050565b60008281526020819052604090206001015461078c8161184b565b6104158383611855565b6001600160a01b038116331461080b5760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b60648201526084015b60405180910390fd5b61081582826118d9565b5050565b600061082760015460ff1690565b156108455760405163ab35696f60e01b815260040160405180910390fd5b610852826020015161161b565b61086f5760405163519bdea760e01b815260040160405180910390fd5b600061087e836000015161193e565b606084015190915034908115610a30576003546001600160a01b038481169116146108bc576040516324d0121760e01b815260040160405180910390fd5b846060015182146108e0576040516342f7487960e11b815260040160405180910390fd5b600061094286606001518989808060200260200160405190810160405280939291908181526020016000905b828210156109385761092960408302860136819003810190612fff565b8152602001906001019061090c565b5050505050611974565b606087018190526001546040516304dc09a360e11b81529192506000916101009091046001600160a01b0316906309b81346908490610985908b906004016130fc565b60206040518083038185885af11580156109a3573d6000803e3d6000fd5b50505050506040513d601f19601f820116820180604052508101906109c89190612fe6565b9050610a2781848b8b808060200260200160405190810160405280939291908181526020016000905b82821015610a1d57610a0e60408302860136819003810190612fff565b815260200190600101906109f1565b50505050506119c3565b95505050610b7c565b6000610a938487606001518a8a808060200260200160405190810160405280939291908181526020016000905b82821015610a8957610a7a60408302860136819003810190612fff565b81526020019060010190610a5d565b5050505050611aab565b606087018190526001546040516304dc09a360e11b81529192506000916101009091046001600160a01b0316906309b8134690610ad4908a906004016130fc565b6020604051808303816000875af1158015610af3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b179190612fe6565b9050610b778582858c8c808060200260200160405190810160405280939291908181526020016000905b82821015610b6d57610b5e60408302860136819003810190612fff565b81526020019060010190610b41565b5050505050611b03565b955050505b5050509392505050565b610bb07fe7276a2a84d8de556657ec9cf93a55a7d66f096e529d0582ed08e9e2208b92b533611476565b610bcc576040516282b42960e81b815260040160405180910390fd5b610bd4611b57565b565b6000610be460015460ff1690565b15610c025760405163ab35696f60e01b815260040160405180910390fd5b610c0f826020015161161b565b610c2c5760405163519bdea760e01b815260040160405180910390fd5b6000610c3b8360000151611ba9565b6040840151909150348015610dd75784604001518114610c6e576040516342f7487960e11b815260040160405180910390fd5b6003546001600160a01b03848116911614610c9c576040516324d0121760e01b815260040160405180910390fd5b600080610cf68588604001518b8b808060200260200160405190810160405280939291908181526020016000905b8282101561056557610ce760408302860136819003810190612fff565b81526020019060010190610cca565b6040898101839052600154905163b858183f60e01b815292945090925061010090046001600160a01b03169063b858183f908490610d38908b906004016130fc565b60206040518083038185885af1158015610d56573d6000803e3d6000fd5b50505050506040513d601f19601f82011682018060405250810190610d7b9190612fe6565b9550610dd084828b8b808060200260200160405190810160405280939291908181526020016000905b8282101561064957610dc160408302860136819003810190612fff565b81526020019060010190610da4565b5050610b7c565b600080610e318588604001518b8b808060200260200160405190810160405280939291908181526020016000905b8282101561056557610e2260408302860136819003810190612fff565b81526020019060010190610e05565b604089018290529092509050610e526001600160a01b03861633308561170c565b60015460405163b858183f60e01b81526101009091046001600160a01b03169063b858183f90610e86908a906004016130fc565b6020604051808303816000875af1158015610ea5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ec99190612fe6565b9550610ed88585838c8c61174a565b50505050509392505050565b6000610ef260015460ff1690565b15610f105760405163ab35696f60e01b815260040160405180910390fd5b610f1d826060015161161b565b610f3a5760405163519bdea760e01b815260040160405180910390fd5b60a0820151349081156110d75760035484516001600160a01b03908116911614610f77576040516324d0121760e01b815260040160405180910390fd5b8360a001518214610f9b576040516342f7487960e11b815260040160405180910390fd5b6000610ff38560a001518888808060200260200160405190810160405280939291908181526020016000905b8282101561093857610fe460408302860136819003810190612fff565b81526020019060010190610fc7565b60a08601819052600154604051635023b4df60e01b81529192506000916101009091046001600160a01b031690635023b4df908490611036908a90600401613056565b60206040518083038185885af1158015611054573d6000803e3d6000fd5b50505050506040513d601f19601f820116820180604052508101906110799190612fe6565b90506110ce81848a8a808060200260200160405190810160405280939291908181526020016000905b82821015610a1d576110bf60408302860136819003810190612fff565b815260200190600101906110a2565b94505050610768565b600061113485600001518660a001518989808060200260200160405190810160405280939291908181526020016000905b82821015610a895761112560408302860136819003810190612fff565b81526020019060010190611108565b60a08601819052600154604051635023b4df60e01b81529192506000916101009091046001600160a01b031690635023b4df90611175908990600401613056565b6020604051808303816000875af1158015611194573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111b89190612fe6565b9050611212866000015182858b8b808060200260200160405190810160405280939291908181526020016000905b82821015610b6d5761120360408302860136819003810190612fff565b815260200190600101906111e6565b98975050505050505050565b6060834211156112415760405163387b2e5560e11b815260040160405180910390fd5b61124b838361149f565b90505b9392505050565b60015460ff16156112795760405163ab35696f60e01b815260040160405180910390fd5b6003546040516370a0823160e01b81523060048201526000916001600160a01b0316906370a0823190602401602060405180830381865afa1580156112c2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112e69190612fe6565b905081811015611313576040516342fb4ceb60e11b81526004810183905260248101829052604401610802565b801561081557600354604051632e1a7d4d60e01b8152600481018390526001600160a01b0390911690632e1a7d4d90602401600060405180830381600087803b15801561135f57600080fd5b505af1158015611373573d6000803e3d6000fd5b5050505060006113833383611bb5565b905080610415576040516342fb4ceb60e11b81526004810184905260248101839052604401610802565b6113d77f7a8dc26796a1e50e6e190b70259f58f6a4edd5b22280ceecc82b687b8e98286933611476565b6113f3576040516282b42960e81b815260040160405180910390fd5b47156114255760006114058247611bb5565b90508061081557604051633398652560e11b815260040160405180910390fd5b50565b6114527ffcb9fcbfa83b897fb2d5cf4b58962164105c1e71489a37ef3ae0db3fdce576f633611476565b61146e576040516282b42960e81b815260040160405180910390fd5b610bd4611c5f565b6000918252602082815260408084206001600160a01b0393909316845291905290205460ff1690565b6060816001600160401b038111156114b9576114b9612b66565b6040519080825280602002602001820160405280156114ec57816020015b60608152602001906001900390816114d75790505b50905060005b8281101561158c5761155c308585848181106115105761151061310f565b90506020028101906115229190613125565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250611c9a92505050565b82828151811061156e5761156e61310f565b6020026020010181905250808061158490613181565b9150506114f2565b5092915050565b6000828152602081905260409020600101546115ae8161184b565b61041583836118d9565b6040516001600160a01b03831660248201526044810182905261041590849063a9059cbb60e01b906064015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152611cbf565b60006001600160a01b03821633148061044b57506001600160a01b038216301492915050565b60008061164d83611d94565b506116588484611e07565b509050611665818561319a565b91506116718583611f30565b935093915050565b600061168361202d565b905060006116928583866120a4565b90506000806116a18386611e07565b915091506116ae816120d0565b8315611703576000826116c1858a61319a565b6116cb919061319a565b905080156117015760006116df3383611bb5565b9050806116ff576040516382e4f46960e01b815260040160405180910390fd5b505b505b50505050505050565b6040516001600160a01b03808516602483015283166044820152606481018290526117449085906323b872dd60e01b906084016115e4565b50505050565b6040516370a0823160e01b81523060048201526000906001600160a01b038716906370a0823190602401602060405180830381865afa158015611791573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117b59190612fe6565b905060006117c48683876120a4565b90506000611824828686808060200260200160405190810160405280939291908181526020016000905b8282101561181a5761180b60408302860136819003810190612fff565b815260200190600101906117ee565b5050505050611e07565b91505061183188826121af565b8215611701576117016001600160a01b03891633856115b8565b61142581336122b8565b61185f8282611476565b610815576000828152602081815260408083206001600160a01b03851684529091529020805460ff191660011790556118953390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b6118e38282611476565b15610815576000828152602081815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b6000806014835161194f919061319a565b9050600061195f84836014612311565b905061196c81600061241e565b949350505050565b60008061198083611d94565b90506000611990826127106131ad565b905060006119a18661271084612483565b6003549091506119ba906001600160a01b031682611f30565b95945050505050565b60008060006119d28685611e07565b915091506119df816120d0565b600260009054906101000a90046001600160a01b03166001600160a01b03166312210e8a6040518163ffffffff1660e01b8152600401600060405180830381600087803b158015611a2f57600080fd5b505af1158015611a43573d6000803e3d6000fd5b505050506000828787611a56919061319a565b611a60919061319a565b90508015611a96576000611a743383611bb5565b905080611a94576040516382e4f46960e01b815260040160405180910390fd5b505b611aa083886131ad565b979650505050505050565b600080611ab783611d94565b90506000611ac7826127106131ad565b90506000611ad88661271084612483565b9050611ae48782611f30565b611af96001600160a01b03881633308961170c565b9695505050505050565b6000806000611b128685611e07565b91509150611b2087826124c3565b600082611b2d888861319a565b611b37919061319a565b9050611b4d6001600160a01b03891633836115b8565b61121283886131ad565b611b5f6125ca565b6001805460ff191690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b6040516001600160a01b03909116815260200160405180910390a1565b600061044b828261241e565b600081471015611c075760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a20696e73756666696369656e742062616c616e63650000006044820152606401610802565b6040516001600160a01b038416908390600081818185875af1925050503d8060008114611c50576040519150601f19603f3d011682016040523d82523d6000602084013e611c55565b606091505b5090949350505050565b611c67612613565b6001805460ff1916811790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a25833611b8c565b606061124e83836040518060600160405280602781526020016132cb60279139612659565b6000611d14826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166126c79092919063ffffffff16565b9050805160001480611d35575080806020019051810190611d3591906131c0565b6104155760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610802565b6000805b8251811015611dde57828181518110611db357611db361310f565b60200260200101516020015182611dca91906131ad565b915080611dd681613181565b915050611d98565b506103e8811115611e025760405163cd4e616760e01b815260040160405180910390fd5b919050565b6000606082516001600160401b03811115611e2457611e24612b66565b604051908082528060200260200182016040528015611e6957816020015b6040805180820190915260008082526020820152815260200190600190039081611e425790505b50905060005b8351811015611f28576000611eae858381518110611e8f57611e8f61310f565b602002602001015160200151612710886126d69092919063ffffffff16565b90506040518060400160405280868481518110611ecd57611ecd61310f565b6020026020010151600001516001600160a01b0316815260200182815250838381518110611efd57611efd61310f565b6020908102919091010152611f1281856131ad565b9350508080611f2090613181565b915050611e6f565b509250929050565b600154604051636eb1769f60e11b81523060048201526001600160a01b0361010090920482166024820152829184169063dd62ed3e90604401602060405180830381865afa158015611f86573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611faa9190612fe6565b10156108155760015460405163095ea7b360e01b81526101009091046001600160a01b039081166004830152600019602483015283169063095ea7b3906044016020604051808303816000875af1158015612009573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061041591906131c0565b60025460408051630910874560e11b8152905160009247926001600160a01b03909116916312210e8a91600480820192879290919082900301818387803b15801561207757600080fd5b505af115801561208b573d6000803e3d6000fd5b5047925061209d91508390508261319a565b9250505090565b600082156120c857816120b7848661319a565b6120c1919061319a565b905061124e565b509192915050565b60005b81518110156108155760008282815181106120f0576120f061310f565b60200260200101519050600061210e82600001518360200151611bb5565b90508061214557815160208301516040516208c3b360e61b81526001600160a01b0390921660048301526024820152604401610802565b81600001516001600160a01b0316336001600160a01b03167fe0e765ab26c1caf691c510426951246128b96830e49cc81d8c093fd551abac35846020015160405161219291815260200190565b60405180910390a3505080806121a790613181565b9150506120d3565b60005b815181101561041557612215338383815181106121d1576121d161310f565b6020026020010151600001518484815181106121ef576121ef61310f565b602002602001015160200151866001600160a01b031661170c909392919063ffffffff16565b8181815181106122275761222761310f565b6020026020010151600001516001600160a01b0316336001600160a01b0316846001600160a01b03167f1f9a9fdac86b6ca3c5300bec0b61555cded1f1a234378602dcca6c27085eac8e8585815181106122835761228361310f565b60200260200101516020015160405161229e91815260200190565b60405180910390a4806122b081613181565b9150506121b2565b6122c28282611476565b610815576122cf81612778565b6122da83602061278a565b6040516020016122eb9291906131e2565b60408051601f198184030181529082905262461bcd60e51b825261080291600401613257565b60608161231f81601f6131ad565b101561235e5760405162461bcd60e51b815260206004820152600e60248201526d736c6963655f6f766572666c6f7760901b6044820152606401610802565b61236882846131ad565b845110156123ac5760405162461bcd60e51b8152602060048201526011602482015270736c6963655f6f75744f66426f756e647360781b6044820152606401610802565b6060821580156123cb5760405191506000825260208201604052612415565b6040519150601f8416801560200281840101858101878315602002848b0101015b818310156124045780518352602092830192016123ec565b5050858452601f01601f1916604052505b50949350505050565b600061242b8260146131ad565b835110156124735760405162461bcd60e51b8152602060048201526015602482015274746f416464726573735f6f75744f66426f756e647360581b6044820152606401610802565b500160200151600160601b900490565b60006124908484846126d6565b9050600082806124a2576124a261326a565b848609111561124e5760001981106124b957600080fd5b6001019392505050565b60005b8151811015610415576125278282815181106124e4576124e461310f565b6020026020010151600001518383815181106125025761250261310f565b602002602001015160200151856001600160a01b03166115b89092919063ffffffff16565b8181815181106125395761253961310f565b6020026020010151600001516001600160a01b0316336001600160a01b0316846001600160a01b03167f1f9a9fdac86b6ca3c5300bec0b61555cded1f1a234378602dcca6c27085eac8e8585815181106125955761259561310f565b6020026020010151602001516040516125b091815260200190565b60405180910390a4806125c281613181565b9150506124c6565b60015460ff16610bd45760405162461bcd60e51b815260206004820152601460248201527314185d5cd8589b194e881b9bdd081c185d5cd95960621b6044820152606401610802565b60015460ff1615610bd45760405162461bcd60e51b815260206004820152601060248201526f14185d5cd8589b194e881c185d5cd95960821b6044820152606401610802565b6060600080856001600160a01b0316856040516126769190613280565b600060405180830381855af49150503d80600081146126b1576040519150601f19603f3d011682016040523d82523d6000602084013e6126b6565b606091505b5091509150611af986838387612925565b606061124b848460008561299e565b600083830281600019858709828110838203039150508084116126f857600080fd5b8060000361270b5750829004905061124e565b6000848688096000868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b606061044b6001600160a01b03831660145b6060600061279983600261329c565b6127a49060026131ad565b6001600160401b038111156127bb576127bb612b66565b6040519080825280601f01601f1916602001820160405280156127e5576020820181803683370190505b509050600360fc1b816000815181106128005761280061310f565b60200101906001600160f81b031916908160001a905350600f60fb1b8160018151811061282f5761282f61310f565b60200101906001600160f81b031916908160001a905350600061285384600261329c565b61285e9060016131ad565b90505b60018111156128d6576f181899199a1a9b1b9c1cb0b131b232b360811b85600f16601081106128925761289261310f565b1a60f81b8282815181106128a8576128a861310f565b60200101906001600160f81b031916908160001a90535060049490941c936128cf816132b3565b9050612861565b50831561124e5760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610802565b6060831561299457825160000361298d576001600160a01b0385163b61298d5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610802565b508161196c565b61196c8383612a6e565b6060824710156129ff5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401610802565b600080866001600160a01b03168587604051612a1b9190613280565b60006040518083038185875af1925050503d8060008114612a58576040519150601f19603f3d011682016040523d82523d6000602084013e612a5d565b606091505b5091509150611aa087838387612925565b815115612a7e5781518083602001fd5b8060405162461bcd60e51b81526004016108029190613257565b6001600160a01b038116811461142557600080fd5b8035611e0281612a98565b60008060408385031215612acb57600080fd5b8235612ad681612a98565b91506020830135612ae681612a98565b809150509250929050565b600060208284031215612b0357600080fd5b81356001600160e01b03198116811461124e57600080fd5b60008083601f840112612b2d57600080fd5b5081356001600160401b03811115612b4457600080fd5b6020830191508360208260061b8501011115612b5f57600080fd5b9250929050565b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b0381118282101715612b9e57612b9e612b66565b60405290565b604051608081016001600160401b0381118282101715612b9e57612b9e612b66565b604051601f8201601f191681016001600160401b0381118282101715612bee57612bee612b66565b604052919050565b600060e08284031215612c0857600080fd5b612c10612b7c565b90508135612c1d81612a98565b81526020820135612c2d81612a98565b6020820152604082013562ffffff81168114612c4857600080fd5b6040820152612c5960608301612aad565b60608201526080820135608082015260a082013560a0820152612c7e60c08301612aad565b60c082015292915050565b60008060006101008486031215612c9f57600080fd5b83356001600160401b03811115612cb557600080fd5b612cc186828701612b1b565b9094509250612cd590508560208601612bf6565b90509250925092565b600060208284031215612cf057600080fd5b5035919050565b60008060408385031215612d0a57600080fd5b823591506020830135612ae681612a98565b600060808284031215612d2e57600080fd5b612d36612ba4565b905081356001600160401b0380821115612d4f57600080fd5b818401915084601f830112612d6357600080fd5b8135602082821115612d7757612d77612b66565b612d89601f8301601f19168201612bc6565b92508183528681838601011115612d9f57600080fd5b81818501828501376000818385010152828552612dbd818701612aad565b8186015250505050604082013560408201526060820135606082015292915050565b600080600060408486031215612df457600080fd5b83356001600160401b0380821115612e0b57600080fd5b612e1787838801612b1b565b90955093506020860135915080821115612e3057600080fd5b50612e3d86828701612d1c565b9150509250925092565b60008083601f840112612e5957600080fd5b5081356001600160401b03811115612e7057600080fd5b6020830191508360208260051b8501011115612b5f57600080fd5b600080600060408486031215612ea057600080fd5b8335925060208401356001600160401b03811115612ebd57600080fd5b612ec986828701612e47565b9497909650939450505050565b60005b83811015612ef1578181015183820152602001612ed9565b50506000910152565b60008151808452612f12816020860160208601612ed6565b601f01601f19169290920160200192915050565b6000602080830181845280855180835260408601915060408160051b870101925083870160005b82811015612f7b57603f19888603018452612f69858351612efa565b94509285019290850190600101612f4d565b5092979650505050505050565b600060208284031215612f9a57600080fd5b813561124e81612a98565b60008060208385031215612fb857600080fd5b82356001600160401b03811115612fce57600080fd5b612fda85828601612e47565b90969095509350505050565b600060208284031215612ff857600080fd5b5051919050565b60006040828403121561301157600080fd5b604051604081018181106001600160401b038211171561303357613033612b66565b604052823561304181612a98565b81526020928301359281019290925250919050565b60e0810161044b828480516001600160a01b03908116835260208083015182169084015260408083015162ffffff16908401526060808301518216908401526080808301519084015260a0828101519084015260c09182015116910152565b60008151608084526130ca6080850182612efa565b6020848101516001600160a01b0316908601526040808501519086015260609384015193909401929092525090919050565b60208152600061124e60208301846130b5565b634e487b7160e01b600052603260045260246000fd5b6000808335601e1984360301811261313c57600080fd5b8301803591506001600160401b0382111561315657600080fd5b602001915036819003821315612b5f57600080fd5b634e487b7160e01b600052601160045260246000fd5b6000600182016131935761319361316b565b5060010190565b8181038181111561044b5761044b61316b565b8082018082111561044b5761044b61316b565b6000602082840312156131d257600080fd5b8151801515811461124e57600080fd5b7f416363657373436f6e74726f6c3a206163636f756e742000000000000000000081526000835161321a816017850160208801612ed6565b7001034b99036b4b9b9b4b733903937b6329607d1b601791840191820152835161324b816028840160208801612ed6565b01602801949350505050565b60208152600061124e6020830184612efa565b634e487b7160e01b600052601260045260246000fd5b60008251613292818460208701612ed6565b9190910192915050565b808202811582820484141761044b5761044b61316b565b6000816132c2576132c261316b565b50600019019056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220162c0f9d1b47c666f486fc65c7c7502bb0e7378e3166be6f93d98943154831c364736f6c63430008130033";
+const isSuperArgs$2 = (xs) => xs.length > 1;
+class ImmutableSwapProxy__factory extends ContractFactory {
     constructor(...args) {
-        if (isSuperArgs$1(args)) {
+        if (isSuperArgs$2(args)) {
             super(...args);
         }
         else {
-            super(_abi$1, _bytecode$1, args[0]);
+            super(_abi$2, _bytecode$2, args[0]);
         }
     }
     deploy(_admin, _uniRouter, _wimx, overrides) {
@@ -32467,6 +32062,134 @@ class SecondaryFee__factory extends ContractFactory {
     connect(signer) {
         return super.connect(signer);
     }
+    static bytecode = _bytecode$2;
+    static abi = _abi$2;
+    static createInterface() {
+        return new utils$2.Interface(_abi$2);
+    }
+    static connect(address, signerOrProvider) {
+        return new Contract$1(address, _abi$2, signerOrProvider);
+    }
+}
+
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+const _abi$1 = [
+    {
+        inputs: [],
+        name: "getCurrentBlockTimestamp",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "timestamp",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "addr",
+                type: "address",
+            },
+        ],
+        name: "getEthBalance",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "balance",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                components: [
+                    {
+                        internalType: "address",
+                        name: "target",
+                        type: "address",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "gasLimit",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "bytes",
+                        name: "callData",
+                        type: "bytes",
+                    },
+                ],
+                internalType: "struct UniswapInterfaceMulticall.Call[]",
+                name: "calls",
+                type: "tuple[]",
+            },
+        ],
+        name: "multicall",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "blockNumber",
+                type: "uint256",
+            },
+            {
+                components: [
+                    {
+                        internalType: "bool",
+                        name: "success",
+                        type: "bool",
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "gasUsed",
+                        type: "uint256",
+                    },
+                    {
+                        internalType: "bytes",
+                        name: "returnData",
+                        type: "bytes",
+                    },
+                ],
+                internalType: "struct UniswapInterfaceMulticall.Result[]",
+                name: "returnData",
+                type: "tuple[]",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+];
+const _bytecode$1 = "0x608060405234801561001057600080fd5b50610567806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80630f28c97d146100465780631749e1e3146100645780634d2301cc14610085575b600080fd5b61004e610098565b60405161005b919061041f565b60405180910390f35b6100776100723660046102a7565b61009c565b60405161005b929190610428565b61004e610093366004610286565b610220565b4290565b8051439060609067ffffffffffffffff811180156100b957600080fd5b506040519080825280602002602001820160405280156100f357816020015b6100e061023a565b8152602001906001900390816100d85790505b50905060005b835181101561021a57600080600086848151811061011357fe5b60200260200101516000015187858151811061012b57fe5b60200260200101516020015188868151811061014357fe5b60200260200101516040015192509250925060005a90506000808573ffffffffffffffffffffffffffffffffffffffff1685856040516101839190610403565b60006040518083038160008787f1925050503d80600081146101c1576040519150601f19603f3d011682016040523d82523d6000602084013e6101c6565b606091505b509150915060005a8403905060405180606001604052808415158152602001828152602001838152508989815181106101fb57fe5b60200260200101819052505050505050505080806001019150506100f9565b50915091565b73ffffffffffffffffffffffffffffffffffffffff163190565b604051806060016040528060001515815260200160008152602001606081525090565b803573ffffffffffffffffffffffffffffffffffffffff8116811461028157600080fd5b919050565b600060208284031215610297578081fd5b6102a08261025d565b9392505050565b600060208083850312156102b9578182fd5b823567ffffffffffffffff808211156102d0578384fd5b818501915085601f8301126102e3578384fd5b8135818111156102ef57fe5b6102fc8485830201610506565b81815284810190848601875b848110156103f457813587017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0606081838f03011215610346578a8bfd5b60408051606081018181108b8211171561035c57fe5b8252610369848d0161025d565b8152818401358c82015260608401358a811115610384578d8efd5b8085019450508e603f850112610398578c8dfd5b8b8401358a8111156103a657fe5b6103b68d85601f84011601610506565b93508084528f838287010111156103cb578d8efd5b808386018e86013783018c018d9052908101919091528552509287019290870190600101610308565b50909998505050505050505050565b6000825161041581846020870161052a565b9190910192915050565b90815260200190565b600060408083018584526020828186015281865180845260609350838701915083838202880101838901875b838110156104f6578983037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa001855281518051151584528681015187850152880151888401889052805188850181905260806104b582828801858c0161052a565b96880196601f919091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01694909401909301925090850190600101610454565b50909a9950505050505050505050565b60405181810167ffffffffffffffff8111828210171561052257fe5b604052919050565b60005b8381101561054557818101518382015260200161052d565b83811115610554576000848401525b5050505056fea164736f6c6343000706000a";
+const isSuperArgs$1 = (xs) => xs.length > 1;
+class Multicall__factory extends ContractFactory {
+    constructor(...args) {
+        if (isSuperArgs$1(args)) {
+            super(...args);
+        }
+        else {
+            super(_abi$1, _bytecode$1, args[0]);
+        }
+    }
+    deploy(overrides) {
+        return super.deploy(overrides || {});
+    }
+    getDeployTransaction(overrides) {
+        return super.getDeployTransaction(overrides || {});
+    }
+    attach(address) {
+        return super.attach(address);
+    }
+    connect(signer) {
+        return super.connect(signer);
+    }
     static bytecode = _bytecode$1;
     static abi = _abi$1;
     static createInterface() {
@@ -34285,14 +34008,14 @@ function buildSinglePoolSwap(tokenIn, tokenOut, recipient, trade, route, amountI
     }
     return calldatas;
 }
-function buildSinglePoolSwapWithFees(recipient, trade, route, amountIn, amountOut, secondaryFees, secondaryFeeContract, tokenOut) {
+function buildSinglePoolSwapWithFees(recipient, trade, route, amountIn, amountOut, secondaryFees, swapProxyContract, tokenOut) {
     const secondaryFeeValues = secondaryFees.map((fee) => ({
         feeBasisPoints: fee.basisPoints,
         recipient: fee.recipient,
     }));
     const calldatas = [];
     if (trade.tradeType === Uniswap.TradeType.EXACT_INPUT) {
-        calldatas.push(secondaryFeeContract.encodeFunctionData('exactInputSingleWithSecondaryFee', [
+        calldatas.push(swapProxyContract.encodeFunctionData('exactInputSingleWithSecondaryFee', [
             secondaryFeeValues,
             {
                 tokenIn: route.tokenPath[0].address,
@@ -34306,7 +34029,7 @@ function buildSinglePoolSwapWithFees(recipient, trade, route, amountIn, amountOu
         ]));
     }
     if (trade.tradeType === Uniswap.TradeType.EXACT_OUTPUT) {
-        calldatas.push(secondaryFeeContract.encodeFunctionData('exactOutputSingleWithSecondaryFee', [
+        calldatas.push(swapProxyContract.encodeFunctionData('exactOutputSingleWithSecondaryFee', [
             secondaryFeeValues,
             {
                 tokenIn: route.tokenPath[0].address,
@@ -34322,7 +34045,7 @@ function buildSinglePoolSwapWithFees(recipient, trade, route, amountIn, amountOu
     const shouldUnwrapTokens = isNative(tokenOut);
     if (shouldUnwrapTokens) {
         // Unwrap the output token if the user specified a native token as the output
-        calldatas.push(secondaryFeeContract.encodeFunctionData('unwrapNativeToken', [amountOut]));
+        calldatas.push(swapProxyContract.encodeFunctionData('unwrapNativeToken', [amountOut]));
     }
     return calldatas;
 }
@@ -34364,7 +34087,7 @@ function buildMultiPoolSwap(tokenIn, tokenOut, recipient, trade, route, amountIn
     }
     return calldatas;
 }
-function buildMultiPoolSwapWithFees(recipient, trade, route, amountIn, amountOut, secondaryFees, secondaryFeeContract, tokenOut) {
+function buildMultiPoolSwapWithFees(recipient, trade, route, amountIn, amountOut, secondaryFees, swapProxyContract, tokenOut) {
     const path = encodeRouteToPath(route, trade.tradeType === Uniswap.TradeType.EXACT_OUTPUT);
     const secondaryFeeValues = secondaryFees.map((fee) => ({
         feeBasisPoints: fee.basisPoints,
@@ -34372,7 +34095,7 @@ function buildMultiPoolSwapWithFees(recipient, trade, route, amountIn, amountOut
     }));
     const calldatas = [];
     if (trade.tradeType === Uniswap.TradeType.EXACT_INPUT) {
-        calldatas.push(secondaryFeeContract.encodeFunctionData('exactInputWithSecondaryFee', [
+        calldatas.push(swapProxyContract.encodeFunctionData('exactInputWithSecondaryFee', [
             secondaryFeeValues,
             {
                 path,
@@ -34383,7 +34106,7 @@ function buildMultiPoolSwapWithFees(recipient, trade, route, amountIn, amountOut
         ]));
     }
     if (trade.tradeType === Uniswap.TradeType.EXACT_OUTPUT) {
-        calldatas.push(secondaryFeeContract.encodeFunctionData('exactOutputWithSecondaryFee', [
+        calldatas.push(swapProxyContract.encodeFunctionData('exactOutputWithSecondaryFee', [
             secondaryFeeValues,
             {
                 path,
@@ -34396,7 +34119,7 @@ function buildMultiPoolSwapWithFees(recipient, trade, route, amountIn, amountOut
     const shouldUnwrapTokens = isNative(tokenOut);
     if (shouldUnwrapTokens) {
         // Unwrap the output token if the user specified a native token as the output
-        calldatas.push(secondaryFeeContract.encodeFunctionData('unwrapNativeToken', [amountOut]));
+        calldatas.push(swapProxyContract.encodeFunctionData('unwrapNativeToken', [amountOut]));
     }
     return calldatas;
 }
@@ -34407,14 +34130,14 @@ function buildMultiPoolSwapWithFees(recipient, trade, route, amountIn, amountOut
  * @param fromAddress The address of the user
  * @param trade The trade to be executed
  * @param secondaryFees Secondary fees to be applied to the swap
- * @param secondaryFeeContract The SecondaryFee contract interface
+ * @param swapProxyContract The SecondaryFee contract interface
  * @param routerContract The SwapRouter02 contract interface
  * @param paymentsContract The PaymentsExtended contract interface
  * @param maximumAmountIn The maximum amount of tokenIn to be swapped
  * @param minimumAmountOut The minimum amount of tokenOut to be received
  * @returns calldatas that make up the swap transaction
  */
-function buildSwapParameters(tokenIn, tokenOut, recipient, trade, secondaryFees, secondaryFeeContract, routerContract, paymentsContract, maximumAmountIn, minimumAmountOut) {
+function buildSwapParameters(tokenIn, tokenOut, recipient, trade, secondaryFees, swapProxyContract, routerContract, paymentsContract, maximumAmountIn, minimumAmountOut) {
     // @dev we don't support multiple swaps in a single transaction
     // there will always be only one swap in the trade regardless of the trade type
     const { route } = trade.swaps[0];
@@ -34422,22 +34145,22 @@ function buildSwapParameters(tokenIn, tokenOut, recipient, trade, secondaryFees,
     const hasSecondaryFees = secondaryFees.length > 0;
     if (isSinglePoolSwap) {
         if (hasSecondaryFees) {
-            return buildSinglePoolSwapWithFees(recipient, trade, route, maximumAmountIn, minimumAmountOut, secondaryFees, secondaryFeeContract, tokenOut);
+            return buildSinglePoolSwapWithFees(recipient, trade, route, maximumAmountIn, minimumAmountOut, secondaryFees, swapProxyContract, tokenOut);
         }
         return buildSinglePoolSwap(tokenIn, tokenOut, recipient, trade, route, maximumAmountIn, minimumAmountOut, routerContract, paymentsContract);
     }
     if (hasSecondaryFees) {
-        return buildMultiPoolSwapWithFees(recipient, trade, route, maximumAmountIn, minimumAmountOut, secondaryFees, secondaryFeeContract, tokenOut);
+        return buildMultiPoolSwapWithFees(recipient, trade, route, maximumAmountIn, minimumAmountOut, secondaryFees, swapProxyContract, tokenOut);
     }
     return buildMultiPoolSwap(tokenIn, tokenOut, recipient, trade, route, maximumAmountIn, minimumAmountOut, routerContract, paymentsContract);
 }
 function createSwapCallParameters(tokenIn, tokenOut, trade, recipient, swapOptions, secondaryFees, maximumAmountIn, minimumAmountOut) {
-    const secondaryFeeContract = SecondaryFee__factory.createInterface();
+    const swapProxyContract = ImmutableSwapProxy__factory.createInterface();
     const routerContract = SwapRouter.INTERFACE;
     const paymentsContract = PaymentsExtended.INTERFACE;
-    const calldatas = buildSwapParameters(tokenIn, tokenOut, recipient, trade, secondaryFees, secondaryFeeContract, routerContract, paymentsContract, maximumAmountIn, minimumAmountOut);
+    const calldatas = buildSwapParameters(tokenIn, tokenOut, recipient, trade, secondaryFees, swapProxyContract, routerContract, paymentsContract, maximumAmountIn, minimumAmountOut);
     // Create the multicall transaction using the calldatas generated above
-    return secondaryFeeContract.encodeFunctionData(multicallWithDeadlineFunctionSignature, [
+    return swapProxyContract.encodeFunctionData(multicallWithDeadlineFunctionSignature, [
         swapOptions.deadlineOrPreviousBlockhash,
         calldatas,
     ]);
@@ -34630,7 +34353,7 @@ class Exchange {
     wrappedNativeToken;
     secondaryFees;
     nativeTokenService;
-    secondaryFeeContractAddress;
+    swapProxyContractAddress;
     routerContractAddress;
     constructor(configuration) {
         const config = new ExchangeConfiguration(configuration);
@@ -34640,7 +34363,7 @@ class Exchange {
         this.nativeTokenService = new NativeTokenService(this.nativeToken, this.wrappedNativeToken);
         this.secondaryFees = config.secondaryFees;
         this.routerContractAddress = config.chain.contracts.peripheryRouter;
-        this.secondaryFeeContractAddress = config.chain.contracts.secondaryFee;
+        this.swapProxyContractAddress = config.chain.contracts.secondaryFee;
         this.provider = new ethers.providers.StaticJsonRpcProvider({
             url: config.chain.rpcUrl,
             skipFetchSetup: true,
@@ -34666,8 +34389,8 @@ class Exchange {
         if (this.secondaryFees.length === 0) {
             return [];
         }
-        const secondaryFeeContract = SecondaryFee__factory.connect(this.secondaryFeeContractAddress, provider);
-        if (await secondaryFeeContract.paused()) {
+        const swapProxyContract = ImmutableSwapProxy__factory.connect(this.swapProxyContractAddress, provider);
+        if (await swapProxyContract.paused()) {
             // Do not use secondary fees if the contract is paused
             return [];
         }
@@ -34704,11 +34427,11 @@ class Exchange {
         // Quotes will always use ERC20s. If the user-specified token is Native, we use the Wrapped Native Token pool
         const ourQuote = await this.router.findOptimalRoute(ourQuoteReqAmount, this.nativeTokenService.maybeWrapToken(otherToken), tradeType, maxHops);
         const adjustedQuote = adjustQuoteWithFees(ourQuote, amountSpecified, fees, this.nativeTokenService);
-        const swap = getSwap(tokenIn, tokenOut, adjustedQuote, fromAddress, slippagePercent, deadline, this.routerContractAddress, this.secondaryFeeContractAddress, gasPrice, secondaryFees);
+        const swap = getSwap(tokenIn, tokenOut, adjustedQuote, fromAddress, slippagePercent, deadline, this.routerContractAddress, this.swapProxyContractAddress, gasPrice, secondaryFees);
         const { quotedAmount, quotedAmountWithMaxSlippage } = prepareUserQuote(this.nativeTokenService, adjustedQuote, slippagePercent, otherToken);
         const preparedApproval = prepareApproval(tradeType, amountSpecified, quotedAmountWithMaxSlippage, {
             routerAddress: this.routerContractAddress,
-            secondaryFeeAddress: this.secondaryFeeContractAddress,
+            secondaryFeeAddress: this.swapProxyContractAddress,
         }, secondaryFees);
         // preparedApproval always uses the tokenIn address because we are always selling the tokenIn
         const approval = preparedApproval
@@ -35239,7 +34962,11 @@ async function addNetworkToWallet(networkMap, web3Provider, chainId) {
 async function getNetworkAllowList(config, { type = NetworkFilterTypes.ALL, exclude }) {
     const { networkMap } = config;
     const allowedNetworkConfig = (await config.remote.getConfig('allowedNetworks'));
-    const list = allowedNetworkConfig.filter((network) => {
+    if (!allowedNetworkConfig) {
+        // eslint-disable-next-line no-console
+        console.warn('No allowed networks configured');
+    }
+    const list = (allowedNetworkConfig || []).filter((network) => {
         const allowAllTokens = type === NetworkFilterTypes.ALL;
         const networkNotExcluded = !(exclude || [])
             .map((exc) => exc.chainId)
@@ -35679,7 +35406,7 @@ const GAS_OVERRIDES = {
     maxPriorityFeePerGas: BigNumber$1.from(101e9),
 };
 
-const SDK_VERSION_MARKER = '0.38.0';
+const SDK_VERSION_MARKER = '0.39.1';
 // This SDK version is replaced by the `yarn build` command ran on the root level
 const globalPackageVersion = () => SDK_VERSION_MARKER;
 
@@ -35702,18 +35429,33 @@ class RemoteConfigFetcher {
             return CHECKOUT_CDN_BASE_URL[Environment$1.PRODUCTION];
         return CHECKOUT_CDN_BASE_URL[Environment$1.SANDBOX];
     };
+    // eslint-disable-next-line class-methods-use-this
+    parseResponse(response) {
+        let responseData = response.data;
+        if (response.data && typeof response.data !== 'object') {
+            try {
+                responseData = JSON.parse(response.data);
+            }
+            catch (jsonError) {
+                throw new CheckoutError('Invalid configuration', CheckoutErrorType.API_ERROR);
+            }
+        }
+        return responseData;
+    }
     async loadConfig() {
         if (this.configCache)
             return this.configCache;
         const response = await this.httpClient.get(`${this.getEndpoint()}/${this.version}/config`);
-        this.configCache = response.data;
+        // Ensure that the configuration is valid
+        this.configCache = this.parseResponse(response);
         return this.configCache;
     }
     async loadConfigTokens() {
         if (this.tokensCache)
             return this.tokensCache;
         const response = await this.httpClient.get(`${this.getEndpoint()}/${this.version}/config/tokens`);
-        this.tokensCache = response.data;
+        // Ensure that the configuration is valid
+        this.tokensCache = this.parseResponse(response);
         return this.tokensCache;
     }
     async getConfig(key) {
@@ -37867,8 +37609,8 @@ const bridgeRoute = async (config, readOnlyProviders, availableRoutingOptions, b
     if (tokenBalanceResult === undefined || tokenBalanceResult.success === false)
         return undefined;
     // todo: revert this back to using the allowlist
-    const allowedTokenList = await allowListCheckForBridge(config, tokenBalanceResults, availableRoutingOptions);
-    if (allowedTokenList.length === 0)
+    const allowedL1TokenList = await allowListCheckForBridge(config, tokenBalanceResults, availableRoutingOptions);
+    if (allowedL1TokenList.length === 0)
         return undefined;
     const l1RepresentationResult = await fetchL1Representation(config, bridgeRequirement.l2address);
     if (!l1RepresentationResult)
@@ -37876,10 +37618,10 @@ const bridgeRoute = async (config, readOnlyProviders, availableRoutingOptions, b
     // Ensure l1address is in the allowed token list
     const { l1address } = l1RepresentationResult;
     if (isNativeToken(l1address)) {
-        if (!allowedTokenList.find((token) => !('address' in token)))
+        if (!allowedL1TokenList.find((token) => isNativeToken(token.address)))
             return undefined;
     }
-    else if (!allowedTokenList.find((token) => token.address === l1address)) {
+    else if (!allowedL1TokenList.find((token) => token.address === l1address)) {
         return undefined;
     }
     const feesFromBridge = await getBridgeFeeEstimate(config, readOnlyProviders, l1ChainId, l2ChainId);