@juiceswapxyz/uniswapx-sdk 3.0.0 → 3.0.2

package/dist/esm/src/trade/V3DutchOrderTrade.test.js

@@ -0,0 +1,220 @@
+import { Ether, Token, TradeType } from "@juiceswapxyz/sdk-core";
+import { BigNumber, constants, ethers } from "ethers";
+import { V3DutchOrderTrade } from "./V3DutchOrderTrade";
+import { NativeAssets } from "./utils";
+const USDC = new Token(1, "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", 6, "USDC");
+const DAI = new Token(1, "0x6B175474E89094C44Da98b954EedeAC495271d0F", 18, "DAI");
+describe("V3DutchOrderTrade", () => {
+    const NON_FEE_OUTPUT_AMOUNT = BigNumber.from("1000000000000000000");
+    const NON_FEE_MINIMUM_AMOUNT_OUT = BigNumber.from("900000000000000000");
+    const orderInfo = {
+        deadline: Math.floor(new Date().getTime() / 1000) + 1000,
+        reactor: "0x0000000000000000000000000000000000000000",
+        swapper: "0x0000000000000000000000000000000000000000",
+        nonce: BigNumber.from(10),
+        cosigner: "0x0000000000000000000000000000000000000000",
+        startingBaseFee: BigNumber.from(0),
+        additionalValidationContract: ethers.constants.AddressZero,
+        additionalValidationData: "0x",
+        input: {
+            token: USDC.address,
+            startAmount: BigNumber.from(1000),
+            curve: {
+                relativeBlocks: [],
+                relativeAmounts: [],
+            },
+            maxAmount: BigNumber.from(1000),
+            adjustmentPerGweiBaseFee: BigNumber.from(0),
+        },
+        outputs: [
+            {
+                token: DAI.address,
+                startAmount: NON_FEE_OUTPUT_AMOUNT,
+                curve: {
+                    relativeBlocks: [21],
+                    relativeAmounts: [BigInt("100000000000000000")],
+                },
+                recipient: "0x0000000000000000000000000000000000000000",
+                minAmount: NON_FEE_MINIMUM_AMOUNT_OUT,
+                adjustmentPerGweiBaseFee: BigNumber.from(0),
+            },
+            {
+                token: DAI.address,
+                startAmount: BigNumber.from("1000"),
+                curve: {
+                    relativeBlocks: [21],
+                    relativeAmounts: [BigInt("100")],
+                },
+                recipient: "0x0000000000000000000000000000000000000000",
+                minAmount: BigNumber.from("900"),
+                adjustmentPerGweiBaseFee: BigNumber.from(0),
+            },
+        ],
+    };
+    const trade = new V3DutchOrderTrade({
+        currencyIn: USDC,
+        currenciesOut: [DAI],
+        orderInfo,
+        tradeType: TradeType.EXACT_INPUT,
+    });
+    describe("Exact input", () => {
+        it("returns the right input amount for an exact-in trade", () => {
+            expect(trade.inputAmount.quotient.toString()).toEqual(orderInfo.input.startAmount.toString());
+        });
+        it("returns the correct non-fee output amount", () => {
+            expect(trade.outputAmount.quotient.toString()).toEqual(NON_FEE_OUTPUT_AMOUNT.toString());
+        });
+        it("returns the correct minimum amount out", () => {
+            expect(trade.minimumAmountOut().quotient.toString()).toEqual(NON_FEE_MINIMUM_AMOUNT_OUT.toString());
+        });
+    });
+    describe("Exact output", () => {
+        const outOrderInfo = {
+            deadline: Math.floor(new Date().getTime() / 1000) + 1000,
+            reactor: "0x0000000000000000000000000000000000000000",
+            swapper: "0x0000000000000000000000000000000000000000",
+            nonce: BigNumber.from(10),
+            cosigner: "0x0000000000000000000000000000000000000000",
+            startingBaseFee: BigNumber.from(0),
+            additionalValidationContract: ethers.constants.AddressZero,
+            additionalValidationData: "0x",
+            input: {
+                token: USDC.address,
+                startAmount: BigNumber.from(1000),
+                curve: {
+                    relativeBlocks: [10],
+                    relativeAmounts: [BigInt(-100)],
+                },
+                maxAmount: BigNumber.from(1100),
+                adjustmentPerGweiBaseFee: BigNumber.from(0),
+            },
+            outputs: [
+                {
+                    token: DAI.address,
+                    startAmount: NON_FEE_OUTPUT_AMOUNT,
+                    curve: {
+                        relativeBlocks: [],
+                        relativeAmounts: [],
+                    },
+                    recipient: "0x0000000000000000000000000000000000000000",
+                    minAmount: NON_FEE_OUTPUT_AMOUNT,
+                    adjustmentPerGweiBaseFee: BigNumber.from(0),
+                },
+                {
+                    token: DAI.address,
+                    startAmount: BigNumber.from("1000"),
+                    curve: {
+                        relativeBlocks: [],
+                        relativeAmounts: [],
+                    },
+                    recipient: "0x0000000000000000000000000000000000000000",
+                    minAmount: BigNumber.from("1000"),
+                    adjustmentPerGweiBaseFee: BigNumber.from(0),
+                },
+            ],
+        };
+        const trade = new V3DutchOrderTrade({
+            currencyIn: USDC,
+            currenciesOut: [DAI],
+            orderInfo: outOrderInfo,
+            tradeType: TradeType.EXACT_OUTPUT,
+        });
+        it("returns the correct maximum amount in", () => {
+            expect(trade.maximumAmountIn().quotient.toString()).toEqual(outOrderInfo.input.maxAmount.toString());
+        });
+    });
+    describe("Qualitative tests", () => {
+        it("works for native output trades", () => {
+            const ethOutputOrderInfo = Object.assign(Object.assign({}, orderInfo), { outputs: [
+                    {
+                        token: NativeAssets.ETH,
+                        startAmount: NON_FEE_OUTPUT_AMOUNT,
+                        curve: {
+                            relativeBlocks: [21],
+                            relativeAmounts: [BigInt("100000000000000000")],
+                        },
+                        recipient: "0x0000000000000000000000000000000000000000",
+                        minAmount: NON_FEE_MINIMUM_AMOUNT_OUT,
+                        adjustmentPerGweiBaseFee: BigNumber.from(0),
+                    },
+                ] });
+            const ethOutputTrade = new V3DutchOrderTrade({
+                currencyIn: USDC,
+                currenciesOut: [Ether.onChain(1)],
+                orderInfo: ethOutputOrderInfo,
+                tradeType: TradeType.EXACT_INPUT,
+            });
+            expect(ethOutputTrade.outputAmount.currency).toEqual(Ether.onChain(1));
+        });
+        it("works for native output trades where order info has 0 address", () => {
+            const ethOutputOrderInfo = Object.assign(Object.assign({}, orderInfo), { outputs: [
+                    {
+                        token: constants.AddressZero,
+                        startAmount: NON_FEE_OUTPUT_AMOUNT,
+                        curve: {
+                            relativeBlocks: [21],
+                            relativeAmounts: [BigInt("100000000000000000")],
+                        },
+                        recipient: "0x0000000000000000000000000000000000000000",
+                        minAmount: NON_FEE_MINIMUM_AMOUNT_OUT,
+                        adjustmentPerGweiBaseFee: BigNumber.from(0),
+                    },
+                ] });
+            const ethOutputTrade = new V3DutchOrderTrade({
+                currencyIn: USDC,
+                currenciesOut: [Ether.onChain(1)],
+                orderInfo: ethOutputOrderInfo,
+                tradeType: TradeType.EXACT_INPUT,
+            });
+            expect(ethOutputTrade.outputAmount.currency).toEqual(Ether.onChain(1));
+        });
+    });
+    describe("Expected amounts", () => {
+        const expectedAmounts = {
+            expectedAmountIn: "800",
+            expectedAmountOut: "900",
+        };
+        const tradeWithExpectedAmounts = new V3DutchOrderTrade({
+            currencyIn: USDC,
+            currenciesOut: [DAI],
+            orderInfo,
+            tradeType: TradeType.EXACT_INPUT,
+            expectedAmounts,
+        });
+        it("uses expectedAmountIn when provided", () => {
+            expect(tradeWithExpectedAmounts.inputAmount.quotient.toString()).toEqual(expectedAmounts.expectedAmountIn);
+        });
+        it("uses expectedAmountOut when provided", () => {
+            expect(tradeWithExpectedAmounts.outputAmount.quotient.toString()).toEqual(expectedAmounts.expectedAmountOut);
+        });
+        it("falls back to order amounts when expectedAmounts is not provided", () => {
+            expect(trade.inputAmount.quotient.toString()).toEqual(orderInfo.input.startAmount.toString());
+            expect(trade.outputAmount.quotient.toString()).toEqual(NON_FEE_OUTPUT_AMOUNT.toString());
+        });
+        it("throws when accessing expectedAmountIn that wasn't provided", () => {
+            const tradeWithoutExpected = new V3DutchOrderTrade({
+                currencyIn: USDC,
+                currenciesOut: [DAI],
+                orderInfo,
+                tradeType: TradeType.EXACT_INPUT,
+            });
+            // Using private method through any to test error case
+            expect(() => {
+                tradeWithoutExpected.getExpectedAmountIn();
+            }).toThrow("expectedAmountIn not set");
+        });
+        it("throws when accessing expectedAmountOut that wasn't provided", () => {
+            const tradeWithoutExpected = new V3DutchOrderTrade({
+                currencyIn: USDC,
+                currenciesOut: [DAI],
+                orderInfo,
+                tradeType: TradeType.EXACT_INPUT,
+            });
+            // Using private method through any to test error case
+            expect(() => {
+                tradeWithoutExpected.getExpectedAmountOut();
+            }).toThrow("expectedAmountOut not set");
+        });
+    });
+});
+//# sourceMappingURL=V3DutchOrderTrade.test.js.map

package/dist/esm/src/trade/V3DutchOrderTrade.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"V3DutchOrderTrade.test.js","sourceRoot":"","sources":["../../../../src/trade/V3DutchOrderTrade.test.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/trade/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./DutchOrderTrade";
+export * from "./V2DutchOrderTrade";
+export * from "./PriorityOrderTrade";
+export * from "./RelayOrderTrade";
+export * from "./V3DutchOrderTrade";

package/dist/esm/src/trade/index.js

@@ -0,0 +1,6 @@
+export * from "./DutchOrderTrade";
+export * from "./V2DutchOrderTrade";
+export * from "./PriorityOrderTrade";
+export * from "./RelayOrderTrade";
+export * from "./V3DutchOrderTrade";
+//# sourceMappingURL=index.js.map

package/dist/esm/src/trade/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/trade/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC"}

package/dist/esm/src/trade/utils.d.ts

@@ -0,0 +1,8 @@
+import { Currency } from "@juiceswapxyz/sdk-core";
+export declare enum NativeAssets {
+    MATIC = "MATIC",
+    BNB = "BNB",
+    AVAX = "AVAX",
+    ETH = "ETH"
+}
+export declare function areCurrenciesEqual(currency: Currency, address: string | null, chainId: number): boolean;

package/dist/esm/src/trade/utils.js

@@ -0,0 +1,31 @@
+import { ChainId } from "@juiceswapxyz/sdk-core";
+import { constants } from "ethers";
+export var NativeAssets;
+(function (NativeAssets) {
+    NativeAssets["MATIC"] = "MATIC";
+    NativeAssets["BNB"] = "BNB";
+    NativeAssets["AVAX"] = "AVAX";
+    NativeAssets["ETH"] = "ETH";
+})(NativeAssets || (NativeAssets = {}));
+function nativeCurrencyAddressString(chainId) {
+    switch (chainId) {
+        case ChainId.POLYGON:
+            return NativeAssets.MATIC;
+        case ChainId.BNB:
+            return NativeAssets.BNB;
+        case ChainId.AVALANCHE:
+            return NativeAssets.AVAX;
+        default:
+            return NativeAssets.ETH;
+    }
+}
+export function areCurrenciesEqual(currency, address, chainId) {
+    if (currency.chainId !== chainId)
+        return false;
+    if (currency.isNative) {
+        return (address === constants.AddressZero ||
+            address === nativeCurrencyAddressString(chainId));
+    }
+    return currency.address.toLowerCase() === (address === null || address === void 0 ? void 0 : address.toLowerCase());
+}
+//# sourceMappingURL=utils.js.map

package/dist/esm/src/trade/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/trade/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAY,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,MAAM,CAAN,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,+BAAe,CAAA;IACf,2BAAW,CAAA;IACX,6BAAa,CAAA;IACb,2BAAW,CAAA;AACb,CAAC,EALW,YAAY,KAAZ,YAAY,QAKvB;AAED,SAAS,2BAA2B,CAAC,OAAe;IAClD,QAAQ,OAAO,EAAE;QACf,KAAK,OAAO,CAAC,OAAO;YAClB,OAAO,YAAY,CAAC,KAAK,CAAC;QAC5B,KAAK,OAAO,CAAC,GAAG;YACd,OAAO,YAAY,CAAC,GAAG,CAAC;QAC1B,KAAK,OAAO,CAAC,SAAS;YACpB,OAAO,YAAY,CAAC,IAAI,CAAC;QAC3B;YACE,OAAO,YAAY,CAAC,GAAG,CAAC;KAC3B;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,QAAkB,EAClB,OAAsB,EACtB,OAAe;IAEf,IAAI,QAAQ,CAAC,OAAO,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IAE/C,IAAI,QAAQ,CAAC,QAAQ,EAAE;QACrB,OAAO,CACL,OAAO,KAAK,SAAS,CAAC,WAAW;YACjC,OAAO,KAAK,2BAA2B,CAAC,OAAO,CAAC,CACjD,CAAC;KACH;IAED,OAAO,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,MAAK,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,EAAE,CAAA,CAAC;AACnE,CAAC"}

package/dist/esm/src/utils/EventWatcher.d.ts

@@ -0,0 +1,46 @@
+import { BaseProvider, Log } from "@ethersproject/providers";
+import { BaseContract, BigNumber, Event } from "ethers";
+import { ExclusiveDutchOrderReactor, RelayOrderReactor } from "../contracts";
+import { FillEvent } from "../contracts/DutchOrderReactor";
+export type TokenTransfer = {
+    token: string;
+    amount: BigNumber;
+};
+export interface FillData {
+    orderHash: string;
+    filler: string;
+    nonce: BigNumber;
+    swapper: string;
+}
+export interface FillInfo extends FillData {
+    blockNumber: number;
+    txHash: string;
+    inputs: TokenTransfer[];
+    outputs: TokenTransfer[];
+}
+/**
+ * Helper for watching events
+ */
+declare abstract class EventWatcher<TReactor extends BaseContract> {
+    protected reactor: TReactor;
+    constructor(reactor: TReactor);
+    abstract getFillLogs(fromBlock: number, toBlock?: number): Promise<FillEvent[]>;
+    abstract onFill(callback: (fillData: FillData, event: Event) => void): void;
+    getFillEvents(fromBlock: number, toBlock?: number): Promise<FillData[]>;
+    getFillInfo(fromBlock: number, toBlock?: number): Promise<FillInfo[]>;
+    getTokenTransfers(logs: Log[], recipient: string): {
+        token: string;
+        amount: BigNumber;
+    }[];
+}
+export declare class UniswapXEventWatcher extends EventWatcher<ExclusiveDutchOrderReactor> {
+    constructor(provider: BaseProvider, reactorAddress: string);
+    getFillLogs(fromBlock: number, toBlock?: number): Promise<FillEvent[]>;
+    onFill(callback: (fillData: FillData, event: Event) => void): void;
+}
+export declare class RelayEventWatcher extends EventWatcher<RelayOrderReactor> {
+    constructor(provider: BaseProvider, reactorAddress: string);
+    getFillLogs(fromBlock: number, toBlock?: number): Promise<FillEvent[]>;
+    onFill(callback: (fillData: FillData, event: Event) => void): void;
+}
+export {};

package/dist/esm/src/utils/EventWatcher.js

@@ -0,0 +1,114 @@
+import { __awaiter } from "tslib";
+import { utils } from "ethers";
+import MockERC20Abi from "../../abis/MockERC20.json";
+import { ExclusiveDutchOrderReactor__factory, RelayOrderReactor__factory, } from "../contracts";
+const TRANSFER = "Transfer";
+/**
+ * Helper for watching events
+ */
+class EventWatcher {
+    constructor(reactor) {
+        this.reactor = reactor;
+    }
+    getFillEvents(fromBlock, toBlock) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const logs = yield this.getFillLogs(fromBlock, toBlock);
+            return logs.map((log) => log.args);
+        });
+    }
+    getFillInfo(fromBlock, toBlock) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const logs = yield this.getFillLogs(fromBlock, toBlock);
+            const events = logs.map((log) => log.args);
+            // TODO: deal with batch fills for orders with the same swapper and outToken
+            const txs = logs.reduce((acc, log) => acc.add(this.reactor.provider.getTransactionReceipt(log.transactionHash)), new Set());
+            const txReceipts = yield Promise.all(txs);
+            const fills = events.map((e, i) => {
+                return {
+                    orderHash: e.orderHash,
+                    swapper: e.swapper,
+                    filler: e.filler,
+                    nonce: e.nonce,
+                    txLogs: txReceipts[i].logs,
+                    blockNumber: txReceipts[i].blockNumber,
+                    txHash: txReceipts[i].transactionHash,
+                };
+            });
+            return fills.map((fill) => {
+                const outputs = this.getTokenTransfers(fill.txLogs, fill.swapper);
+                const inputs = this.getTokenTransfers(fill.txLogs, fill.filler);
+                return {
+                    orderHash: fill.orderHash,
+                    swapper: fill.swapper,
+                    filler: fill.filler,
+                    nonce: fill.nonce,
+                    blockNumber: fill.blockNumber,
+                    txHash: fill.txHash,
+                    inputs: inputs,
+                    outputs: outputs,
+                };
+            });
+        });
+    }
+    getTokenTransfers(logs, recipient) {
+        const ERC20Interface = new utils.Interface(MockERC20Abi.abi);
+        return logs.reduce((logAcc, log) => {
+            try {
+                const parsedLog = ERC20Interface.parseLog(log);
+                if (parsedLog.name === TRANSFER && parsedLog.args.to === recipient) {
+                    logAcc.push({
+                        token: log.address,
+                        amount: parsedLog.args.amount,
+                    });
+                }
+                return logAcc;
+            }
+            catch (e) {
+                return logAcc;
+            }
+        }, []);
+    }
+}
+export class UniswapXEventWatcher extends EventWatcher {
+    constructor(provider, reactorAddress) {
+        const reactor = ExclusiveDutchOrderReactor__factory.connect(reactorAddress, provider);
+        super(reactor);
+    }
+    getFillLogs(fromBlock, toBlock) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.reactor.queryFilter(this.reactor.filters.Fill(), fromBlock, toBlock);
+        });
+    }
+    onFill(callback) {
+        this.reactor.on(this.reactor.filters.Fill(), (orderHash, filler, swapper, nonce, event) => {
+            callback({
+                orderHash,
+                filler,
+                nonce,
+                swapper,
+            }, event);
+        });
+    }
+}
+export class RelayEventWatcher extends EventWatcher {
+    constructor(provider, reactorAddress) {
+        const reactor = RelayOrderReactor__factory.connect(reactorAddress, provider);
+        super(reactor);
+    }
+    getFillLogs(fromBlock, toBlock) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.reactor.queryFilter(this.reactor.filters.Relay(), fromBlock, toBlock);
+        });
+    }
+    onFill(callback) {
+        this.reactor.on(this.reactor.filters.Relay(), (orderHash, filler, swapper, nonce, event) => {
+            callback({
+                orderHash,
+                filler,
+                nonce,
+                swapper,
+            }, event);
+        });
+    }
+}
+//# sourceMappingURL=EventWatcher.js.map

package/dist/esm/src/utils/EventWatcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventWatcher.js","sourceRoot":"","sources":["../../../../src/utils/EventWatcher.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/utils/NonceManager.d.ts

@@ -0,0 +1,36 @@
+import { BaseProvider } from "@ethersproject/providers";
+import { BigNumber } from "ethers";
+/**
+ * Helper to track Permit2 nonces for addresses
+ */
+export declare class NonceManager {
+    private provider;
+    private permit2;
+    private currentWord;
+    private currentBitmap;
+    constructor(provider: BaseProvider, chainId: number, permit2Address?: string);
+    /**
+     * Finds the next unused nonce and returns it
+     * Marks the nonce as used so it won't be returned again from this instance
+     * NOTE: if any nonce usages are in-flight and created outside of this instance,
+     * this function will not know about them and will return duplicates
+     */
+    useNonce(address: string): Promise<BigNumber>;
+    isUsed(address: string, nonce: BigNumber): Promise<boolean>;
+    private getNextOpenWord;
+}
+interface SplitNonce {
+    word: BigNumber;
+    bitPos: BigNumber;
+}
+export declare function splitNonce(nonce: BigNumber): SplitNonce;
+export declare function buildNonce(word: BigNumber, bitPos: number): BigNumber;
+export declare function getFirstUnsetBit(bitmap: BigNumber): number;
+export declare function setBit(bitmap: BigNumber, bitPos: number): BigNumber;
+interface CancelParams {
+    word: BigNumber;
+    mask: BigNumber;
+}
+export declare function getCancelSingleParams(nonceToCancel: BigNumber): CancelParams;
+export declare function getCancelMultipleParams(noncesToCancel: BigNumber[]): CancelParams[];
+export {};

package/dist/esm/src/utils/NonceManager.js

@@ -0,0 +1,124 @@
+import { __awaiter } from "tslib";
+import { BigNumber, ethers } from "ethers";
+import { PERMIT2_MAPPING } from "../constants";
+import { Permit2__factory } from "../contracts";
+import { MissingConfiguration } from "../errors";
+/**
+ * Helper to track Permit2 nonces for addresses
+ */
+export class NonceManager {
+    constructor(provider, chainId, permit2Address) {
+        this.provider = provider;
+        if (permit2Address) {
+            this.permit2 = Permit2__factory.connect(permit2Address, provider);
+        }
+        else if (PERMIT2_MAPPING[chainId]) {
+            this.permit2 = Permit2__factory.connect(PERMIT2_MAPPING[chainId], this.provider);
+        }
+        else {
+            throw new MissingConfiguration("permit2", chainId.toString());
+        }
+        this.currentWord = new Map();
+        this.currentBitmap = new Map();
+    }
+    /**
+     * Finds the next unused nonce and returns it
+     * Marks the nonce as used so it won't be returned again from this instance
+     * NOTE: if any nonce usages are in-flight and created outside of this instance,
+     * this function will not know about them and will return duplicates
+     */
+    useNonce(address) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { word, bitmap } = yield this.getNextOpenWord(address);
+            const bitPos = getFirstUnsetBit(bitmap);
+            this.currentWord.set(address, word);
+            this.currentBitmap.set(address, setBit(bitmap, bitPos));
+            return buildNonce(word, bitPos);
+        });
+    }
+    isUsed(address, nonce) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { word, bitPos } = splitNonce(nonce);
+            const bitmap = yield this.permit2.nonceBitmap(address, word);
+            return bitmap.div(BigNumber.from(2).pow(bitPos)).mod(2).eq(1);
+        });
+    }
+    // Returns the first word that contains empty bits
+    getNextOpenWord(address) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let currentWord = this.currentWord.get(address) || BigNumber.from(0);
+            let bitmap = this.currentBitmap.get(address) ||
+                (yield this.permit2.nonceBitmap(address, currentWord));
+            while (bitmap.eq(ethers.constants.MaxUint256)) {
+                currentWord = currentWord.add(1);
+                bitmap = yield this.permit2.nonceBitmap(address, currentWord);
+            }
+            return {
+                word: currentWord,
+                bitmap: bitmap,
+            };
+        });
+    }
+}
+// Splits a permit2 nonce into the word and bitPos
+export function splitNonce(nonce) {
+    const word = nonce.div(256);
+    const bitPos = nonce.mod(256);
+    return { word, bitPos };
+}
+// Builds a permit2 nonce from the given word and bitPos
+export function buildNonce(word, bitPos) {
+    // word << 8
+    const shiftedWord = word.mul(256);
+    return shiftedWord.add(bitPos);
+}
+// Returns the position of the first unset bit
+// Returns -1 if all bits are set
+export function getFirstUnsetBit(bitmap) {
+    // Optimization if switch to library w/ bitwise operators:
+    // return ~bitmap + (bitmap + 1)
+    // instead we have to do a loop
+    for (let i = 0; i < 256; i++) {
+        if (bitmap.div(BigNumber.from(2).pow(i)).mod(2).eq(0)) {
+            return i;
+        }
+    }
+    return -1;
+}
+// Returns the given bignumber with the given bit set
+// Does nothing if the given bit is already set
+export function setBit(bitmap, bitPos) {
+    // Optimization if switch to library w/ bitwise operators:
+    // return bitmap & (1 << bitPos)
+    const mask = BigNumber.from(2).pow(bitPos);
+    if (bitmap.div(mask).mod(2).eq(1)) {
+        return bitmap;
+    }
+    return bitmap.add(mask);
+}
+// Get parameters to cancel a nonce
+export function getCancelSingleParams(nonceToCancel) {
+    const { word, bitPos } = splitNonce(nonceToCancel);
+    const mask = BigNumber.from(2).pow(bitPos);
+    return { word, mask };
+}
+// Get parameters to cancel multiple nonces
+export function getCancelMultipleParams(noncesToCancel) {
+    const splitNonces = noncesToCancel.map(splitNonce);
+    const splitNoncesByWord = {};
+    splitNonces.forEach((splitNonce) => {
+        const word = splitNonce.word.toString();
+        if (!splitNoncesByWord[word]) {
+            splitNoncesByWord[word] = [];
+        }
+        splitNoncesByWord[word].push(splitNonce);
+    });
+    return Object.entries(splitNoncesByWord).map(([word, splitNonce]) => {
+        let mask = BigNumber.from(0);
+        splitNonce.forEach((splitNonce) => {
+            mask = mask.or(BigNumber.from(2).pow(splitNonce.bitPos));
+        });
+        return { word: BigNumber.from(word), mask };
+    });
+}
+//# sourceMappingURL=NonceManager.js.map

package/dist/esm/src/utils/NonceManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NonceManager.js","sourceRoot":"","sources":["../../../../src/utils/NonceManager.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/utils/NonceManager.test.d.ts

@@ -0,0 +1 @@
+export {};