@juiceswapxyz/uniswapx-sdk 0.1.2-beta.0 → 3.0.0

package/dist/esm/src/order/V2DutchOrder.js

@@ -1,384 +0,0 @@
-import { SignatureTransfer, } from "@uniswap/permit2-sdk";
-import { BigNumber, ethers } from "ethers";
-import { getPermit2 } from "../utils";
-import { getDecayedAmount } from "../utils/dutchDecay";
-import { originalIfZero } from "../utils/order";
-import { parseValidation } from "./validation";
-const COSIGNER_DATA_TUPLE_ABI = "tuple(uint256,uint256,address,uint256,uint256,uint256[])";
-const V2_DUTCH_ORDER_TYPES = {
-    V2DutchOrder: [
-        { name: "info", type: "OrderInfo" },
-        { name: "cosigner", type: "address" },
-        { name: "baseInputToken", type: "address" },
-        { name: "baseInputStartAmount", type: "uint256" },
-        { name: "baseInputEndAmount", type: "uint256" },
-        { name: "baseOutputs", type: "DutchOutput[]" },
-    ],
-    OrderInfo: [
-        { name: "reactor", type: "address" },
-        { name: "swapper", type: "address" },
-        { name: "nonce", type: "uint256" },
-        { name: "deadline", type: "uint256" },
-        { name: "additionalValidationContract", type: "address" },
-        { name: "additionalValidationData", type: "bytes" },
-    ],
-    DutchOutput: [
-        { name: "token", type: "address" },
-        { name: "startAmount", type: "uint256" },
-        { name: "endAmount", type: "uint256" },
-        { name: "recipient", type: "address" },
-    ],
-};
-const V2_DUTCH_ORDER_ABI = [
-    "tuple(" +
-        [
-            "tuple(address,address,uint256,uint256,address,bytes)",
-            "address",
-            "tuple(address,uint256,uint256)",
-            "tuple(address,uint256,uint256,address)[]",
-            COSIGNER_DATA_TUPLE_ABI,
-            "bytes", // cosignature
-        ].join(",") +
-        ")",
-];
-export class UnsignedV2DutchOrder {
-    constructor(info, chainId, _permit2Address) {
-        this.info = info;
-        this.chainId = chainId;
-        this.permit2Address = getPermit2(chainId, _permit2Address);
-    }
-    static fromJSON(json, chainId, _permit2Address) {
-        return new UnsignedV2DutchOrder(Object.assign(Object.assign({}, json), { nonce: BigNumber.from(json.nonce), input: {
-                token: json.input.token,
-                startAmount: BigNumber.from(json.input.startAmount),
-                endAmount: BigNumber.from(json.input.endAmount),
-            }, outputs: json.outputs.map((output) => ({
-                token: output.token,
-                startAmount: BigNumber.from(output.startAmount),
-                endAmount: BigNumber.from(output.endAmount),
-                recipient: output.recipient,
-            })) }), chainId, _permit2Address);
-    }
-    static parse(encoded, chainId, permit2) {
-        return new UnsignedV2DutchOrder(parseSerializedOrder(encoded), chainId, permit2);
-    }
-    /**
-     * @inheritdoc order
-     */
-    toJSON() {
-        return {
-            chainId: this.chainId,
-            permit2Address: this.permit2Address,
-            reactor: this.info.reactor,
-            swapper: this.info.swapper,
-            nonce: this.info.nonce.toString(),
-            deadline: this.info.deadline,
-            additionalValidationContract: this.info.additionalValidationContract,
-            additionalValidationData: this.info.additionalValidationData,
-            input: {
-                token: this.info.input.token,
-                startAmount: this.info.input.startAmount.toString(),
-                endAmount: this.info.input.endAmount.toString(),
-            },
-            outputs: this.info.outputs.map((output) => ({
-                token: output.token,
-                startAmount: output.startAmount.toString(),
-                endAmount: output.endAmount.toString(),
-                recipient: output.recipient,
-            })),
-            cosigner: this.info.cosigner,
-        };
-    }
-    /**
-     * @inheritdoc order
-     */
-    get blockOverrides() {
-        return undefined;
-    }
-    /**
-     * @inheritdoc order
-     */
-    serialize() {
-        const abiCoder = new ethers.utils.AbiCoder();
-        return abiCoder.encode(V2_DUTCH_ORDER_ABI, [
-            [
-                [
-                    this.info.reactor,
-                    this.info.swapper,
-                    this.info.nonce,
-                    this.info.deadline,
-                    this.info.additionalValidationContract,
-                    this.info.additionalValidationData,
-                ],
-                this.info.cosigner,
-                [
-                    this.info.input.token,
-                    this.info.input.startAmount,
-                    this.info.input.endAmount,
-                ],
-                this.info.outputs.map((output) => [
-                    output.token,
-                    output.startAmount,
-                    output.endAmount,
-                    output.recipient,
-                ]),
-                // use empty default for cosignerData and cosignature
-                [0, 0, ethers.constants.AddressZero, 0, 0, [0]],
-                "0x",
-            ],
-        ]);
-    }
-    /**
-     * @inheritdoc Order
-     */
-    getSigner(signature) {
-        return ethers.utils.computeAddress(ethers.utils.recoverPublicKey(SignatureTransfer.hash(this.toPermit(), this.permit2Address, this.chainId, this.witness()), signature));
-    }
-    /**
-     * @inheritdoc Order
-     */
-    permitData() {
-        return SignatureTransfer.getPermitData(this.toPermit(), this.permit2Address, this.chainId, this.witness());
-    }
-    /**
-     * @inheritdoc Order
-     */
-    hash() {
-        return ethers.utils._TypedDataEncoder
-            .from(V2_DUTCH_ORDER_TYPES)
-            .hash(this.witnessInfo());
-    }
-    /**
-     * Returns the resolved order with the given options
-     * @return The resolved order
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    resolve(_options) {
-        // no cosigner data so no resolution possible
-        throw new Error("Method not implemented");
-    }
-    /**
-     * Returns the parsed validation
-     * @return The parsed validation data for the order
-     */
-    get validation() {
-        return parseValidation(this.info);
-    }
-    toPermit() {
-        return {
-            permitted: {
-                token: this.info.input.token,
-                amount: this.info.input.endAmount,
-            },
-            spender: this.info.reactor,
-            nonce: this.info.nonce,
-            deadline: this.info.deadline,
-        };
-    }
-    witnessInfo() {
-        return {
-            info: {
-                reactor: this.info.reactor,
-                swapper: this.info.swapper,
-                nonce: this.info.nonce,
-                deadline: this.info.deadline,
-                additionalValidationContract: this.info.additionalValidationContract,
-                additionalValidationData: this.info.additionalValidationData,
-            },
-            cosigner: this.info.cosigner,
-            baseInputToken: this.info.input.token,
-            baseInputStartAmount: this.info.input.startAmount,
-            baseInputEndAmount: this.info.input.endAmount,
-            baseOutputs: this.info.outputs,
-        };
-    }
-    witness() {
-        return {
-            witness: this.witnessInfo(),
-            witnessTypeName: "V2DutchOrder",
-            witnessType: V2_DUTCH_ORDER_TYPES,
-        };
-    }
-    /**
-     * Full order hash that should be signed over by the cosigner
-     */
-    cosignatureHash(cosignerData) {
-        const abiCoder = new ethers.utils.AbiCoder();
-        return ethers.utils.solidityKeccak256(["bytes32", "bytes"], [
-            this.hash(),
-            abiCoder.encode([COSIGNER_DATA_TUPLE_ABI], [
-                [
-                    cosignerData.decayStartTime,
-                    cosignerData.decayEndTime,
-                    cosignerData.exclusiveFiller,
-                    cosignerData.exclusivityOverrideBps,
-                    cosignerData.inputOverride,
-                    cosignerData.outputOverrides,
-                ],
-            ]),
-        ]);
-    }
-}
-export class CosignedV2DutchOrder extends UnsignedV2DutchOrder {
-    // build a cosigned order from an unsigned order plus cosigner data
-    static fromUnsignedOrder(order, cosignerData, cosignature) {
-        return new CosignedV2DutchOrder(Object.assign(Object.assign({}, order.info), { cosignerData,
-            cosignature }), order.chainId, order.permit2Address);
-    }
-    // build a cosigned order from json
-    static fromJSON(json, chainId, _permit2Address) {
-        return new CosignedV2DutchOrder(Object.assign(Object.assign({}, json), { nonce: BigNumber.from(json.nonce), input: {
-                token: json.input.token,
-                startAmount: BigNumber.from(json.input.startAmount),
-                endAmount: BigNumber.from(json.input.endAmount),
-            }, outputs: json.outputs.map((output) => ({
-                token: output.token,
-                startAmount: BigNumber.from(output.startAmount),
-                endAmount: BigNumber.from(output.endAmount),
-                recipient: output.recipient,
-            })), cosignerData: {
-                decayStartTime: json.cosignerData.decayStartTime,
-                decayEndTime: json.cosignerData.decayEndTime,
-                exclusiveFiller: json.cosignerData.exclusiveFiller,
-                exclusivityOverrideBps: BigNumber.from(json.cosignerData.exclusivityOverrideBps),
-                inputOverride: BigNumber.from(json.cosignerData.inputOverride),
-                outputOverrides: json.cosignerData.outputOverrides.map(BigNumber.from),
-            }, cosignature: json.cosignature }), chainId, _permit2Address);
-    }
-    // build a cosigned order from serialized
-    static parse(encoded, chainId, permit2) {
-        return new CosignedV2DutchOrder(parseSerializedOrder(encoded), chainId, permit2);
-    }
-    constructor(info, chainId, _permit2Address) {
-        super(info, chainId, _permit2Address);
-        this.info = info;
-        this.chainId = chainId;
-    }
-    /**
-     * @inheritdoc order
-     */
-    toJSON() {
-        return Object.assign(Object.assign({}, super.toJSON()), { cosignerData: {
-                decayStartTime: this.info.cosignerData.decayStartTime,
-                decayEndTime: this.info.cosignerData.decayEndTime,
-                exclusiveFiller: this.info.cosignerData.exclusiveFiller,
-                exclusivityOverrideBps: this.info.cosignerData.exclusivityOverrideBps.toNumber(),
-                inputOverride: this.info.cosignerData.inputOverride.toString(),
-                outputOverrides: this.info.cosignerData.outputOverrides.map((o) => o.toString()),
-            }, cosignature: this.info.cosignature });
-    }
-    /**
-     * @inheritdoc Order
-     */
-    resolve(options) {
-        return {
-            input: {
-                token: this.info.input.token,
-                amount: getDecayedAmount({
-                    decayStartTime: this.info.cosignerData.decayStartTime,
-                    decayEndTime: this.info.cosignerData.decayEndTime,
-                    startAmount: originalIfZero(this.info.cosignerData.inputOverride, this.info.input.startAmount),
-                    endAmount: this.info.input.endAmount,
-                }, options.timestamp),
-            },
-            outputs: this.info.outputs.map((output, idx) => {
-                return {
-                    token: output.token,
-                    amount: getDecayedAmount({
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        decayStartTime: this.info.cosignerData.decayStartTime,
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        decayEndTime: this.info.cosignerData.decayEndTime,
-                        startAmount: originalIfZero(
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        this.info.cosignerData.outputOverrides[idx], output.startAmount),
-                        endAmount: output.endAmount,
-                    }, options.timestamp),
-                };
-            }),
-        };
-    }
-    /**
-     * @inheritdoc order
-     */
-    serialize() {
-        const abiCoder = new ethers.utils.AbiCoder();
-        return abiCoder.encode(V2_DUTCH_ORDER_ABI, [
-            [
-                [
-                    this.info.reactor,
-                    this.info.swapper,
-                    this.info.nonce,
-                    this.info.deadline,
-                    this.info.additionalValidationContract,
-                    this.info.additionalValidationData,
-                ],
-                this.info.cosigner,
-                [
-                    this.info.input.token,
-                    this.info.input.startAmount,
-                    this.info.input.endAmount,
-                ],
-                this.info.outputs.map((output) => [
-                    output.token,
-                    output.startAmount,
-                    output.endAmount,
-                    output.recipient,
-                ]),
-                [
-                    this.info.cosignerData.decayStartTime,
-                    this.info.cosignerData.decayEndTime,
-                    this.info.cosignerData.exclusiveFiller,
-                    this.info.cosignerData.exclusivityOverrideBps,
-                    this.info.cosignerData.inputOverride.toString(),
-                    this.info.cosignerData.outputOverrides.map((o) => o.toString()),
-                ],
-                this.info.cosignature,
-            ],
-        ]);
-    }
-    /**
-     *  recovers co-signer address from cosignature and full order hash
-     *  @returns The address which co-signed the order
-     */
-    recoverCosigner() {
-        return ethers.utils.verifyMessage(this.cosignatureHash(this.info.cosignerData), this.info.cosignature);
-    }
-}
-function parseSerializedOrder(serialized) {
-    const abiCoder = new ethers.utils.AbiCoder();
-    const decoded = abiCoder.decode(V2_DUTCH_ORDER_ABI, serialized);
-    const [[[reactor, swapper, nonce, deadline, additionalValidationContract, additionalValidationData,], cosigner, [inputToken, inputStartAmount, inputEndAmount], outputs, [decayStartTime, decayEndTime, exclusiveFiller, exclusivityOverrideBps, inputOverride, outputOverrides,], cosignature,],] = decoded;
-    return {
-        reactor,
-        swapper,
-        nonce,
-        deadline: deadline.toNumber(),
-        additionalValidationContract,
-        additionalValidationData,
-        cosigner,
-        input: {
-            token: inputToken,
-            startAmount: inputStartAmount,
-            endAmount: inputEndAmount,
-        },
-        outputs: outputs.map(([token, startAmount, endAmount, recipient]) => {
-            return {
-                token,
-                startAmount,
-                endAmount,
-                recipient,
-            };
-        }),
-        cosignerData: {
-            decayStartTime: decayStartTime.toNumber(),
-            decayEndTime: decayEndTime.toNumber(),
-            exclusiveFiller,
-            exclusivityOverrideBps,
-            inputOverride,
-            outputOverrides,
-        },
-        cosignature,
-    };
-}
-//# sourceMappingURL=V2DutchOrder.js.map

package/dist/esm/src/order/V2DutchOrder.js.map

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

package/dist/esm/src/order/V2DutchOrder.test.d.ts

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

package/dist/esm/src/order/V2DutchOrder.test.js

@@ -1,270 +0,0 @@
-import { __awaiter } from "tslib";
-import { BigNumber, ethers } from "ethers";
-import { CosignedV2DutchOrder, UnsignedV2DutchOrder, } from "./V2DutchOrder";
-const NOW = Math.floor(new Date().getTime() / 1000);
-const RAW_AMOUNT = BigNumber.from("1000000");
-const INPUT_TOKEN = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
-const OUTPUT_TOKEN = "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2";
-const COSIGNER_DATA = {
-    decayStartTime: NOW,
-    decayEndTime: NOW + 1000,
-    exclusiveFiller: ethers.constants.AddressZero,
-    exclusivityOverrideBps: BigNumber.from(0),
-    inputOverride: RAW_AMOUNT,
-    outputOverrides: [RAW_AMOUNT.mul(102).div(100)],
-};
-describe("V2DutchOrder", () => {
-    const getFullOrderInfo = (data) => {
-        return Object.assign({
-            deadline: NOW + 1000,
-            reactor: ethers.constants.AddressZero,
-            swapper: ethers.constants.AddressZero,
-            nonce: BigNumber.from(10),
-            additionalValidationContract: ethers.constants.AddressZero,
-            additionalValidationData: "0x",
-            cosigner: ethers.constants.AddressZero,
-            cosignerData: COSIGNER_DATA,
-            input: {
-                token: INPUT_TOKEN,
-                startAmount: RAW_AMOUNT,
-                endAmount: RAW_AMOUNT,
-            },
-            outputs: [
-                {
-                    token: OUTPUT_TOKEN,
-                    startAmount: RAW_AMOUNT,
-                    endAmount: RAW_AMOUNT.mul(90).div(100),
-                    recipient: ethers.constants.AddressZero,
-                },
-            ],
-            cosignature: "0x",
-        }, data);
-    };
-    const getOrderInfo = (data) => {
-        return Object.assign({
-            deadline: NOW + 1000,
-            reactor: ethers.constants.AddressZero,
-            swapper: ethers.constants.AddressZero,
-            nonce: BigNumber.from(10),
-            additionalValidationContract: ethers.constants.AddressZero,
-            additionalValidationData: "0x",
-            cosigner: ethers.constants.AddressZero,
-            cosignerData: undefined,
-            input: {
-                token: INPUT_TOKEN,
-                startAmount: RAW_AMOUNT,
-                endAmount: RAW_AMOUNT,
-            },
-            outputs: [
-                {
-                    token: OUTPUT_TOKEN,
-                    startAmount: RAW_AMOUNT,
-                    endAmount: RAW_AMOUNT.mul(90).div(100),
-                    recipient: ethers.constants.AddressZero,
-                },
-            ],
-            cosignature: undefined,
-        }, data);
-    };
-    it("parses a serialized order", () => {
-        const orderInfo = getFullOrderInfo({});
-        const order = new CosignedV2DutchOrder(orderInfo, 1);
-        const serialized = order.serialize();
-        const parsed = CosignedV2DutchOrder.parse(serialized, 1);
-        expect(parsed.info).toEqual(orderInfo);
-    });
-    it("parses the inner v2 order with no cosignerOverrides", () => {
-        const orderInfoJSON = Object.assign(Object.assign({}, getOrderInfo({})), { nonce: "10", input: {
-                token: INPUT_TOKEN,
-                startAmount: "1000000",
-                endAmount: "1000000",
-            }, outputs: [
-                {
-                    token: OUTPUT_TOKEN,
-                    startAmount: "1000000",
-                    endAmount: "900000",
-                    recipient: ethers.constants.AddressZero,
-                },
-            ], cosignerData: undefined });
-        const order = UnsignedV2DutchOrder.fromJSON(orderInfoJSON, 1);
-        expect(order.info.input.startAmount).toEqual(BigNumber.from("1000000"));
-        expect(order.info.outputs[0].startAmount).toEqual(BigNumber.from("1000000"));
-    });
-    it("valid signature over inner order", () => __awaiter(void 0, void 0, void 0, function* () {
-        const fullOrderInfo = getFullOrderInfo({});
-        const order = new UnsignedV2DutchOrder(fullOrderInfo, 1);
-        const wallet = ethers.Wallet.createRandom();
-        const { domain, types, values } = order.permitData();
-        const signature = yield wallet._signTypedData(domain, types, values);
-        expect(order.getSigner(signature)).toEqual(yield wallet.getAddress());
-        const fullOrder = CosignedV2DutchOrder.fromUnsignedOrder(order, fullOrderInfo.cosignerData, fullOrderInfo.cosignature);
-        expect(fullOrder.getSigner(signature)).toEqual(yield wallet.getAddress());
-    }));
-    it("validates cosignature over (hash || cosignerData)", () => __awaiter(void 0, void 0, void 0, function* () {
-        const wallet = ethers.Wallet.createRandom();
-        const orderInfo = getFullOrderInfo({
-            cosigner: yield wallet.getAddress(),
-        });
-        const order = new UnsignedV2DutchOrder(orderInfo, 1);
-        const fullOrderHash = order.cosignatureHash(orderInfo.cosignerData);
-        const cosignature = yield wallet.signMessage(fullOrderHash);
-        const signedOrder = CosignedV2DutchOrder.fromUnsignedOrder(order, COSIGNER_DATA, cosignature);
-        expect(signedOrder.recoverCosigner()).toEqual(yield wallet.getAddress());
-    }));
-    describe("resolve", () => {
-        it("resolves before decayStartTime", () => {
-            const order = new CosignedV2DutchOrder(getFullOrderInfo({}), 1);
-            const resolved = order.resolve({
-                timestamp: order.info.cosignerData.decayStartTime - 100,
-            });
-            expect(resolved.input.token).toEqual(order.info.input.token);
-            expect(resolved.input.amount).toEqual(order.info.cosignerData.inputOverride);
-            expect(resolved.outputs[0].token).toEqual(order.info.outputs[0].token);
-            expect(resolved.outputs[0].amount).toEqual(order.info.cosignerData.outputOverrides[0]);
-        });
-        it("resolves with original value when overrides == 0", () => {
-            const order = new CosignedV2DutchOrder(getFullOrderInfo({
-                cosignerData: {
-                    decayStartTime: Math.floor(new Date().getTime() / 1000),
-                    decayEndTime: Math.floor(new Date().getTime() / 1000) + 1000,
-                    exclusiveFiller: ethers.constants.AddressZero,
-                    exclusivityOverrideBps: BigNumber.from(0),
-                    inputOverride: BigNumber.from(0),
-                    outputOverrides: [BigNumber.from(0)],
-                },
-            }), 1);
-            const resolved = order.resolve({
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                timestamp: order.info.cosignerData.decayStartTime - 100,
-            });
-            expect(resolved.input.token).toEqual(order.info.input.token);
-            expect(resolved.input.amount).toEqual(order.info.input.startAmount);
-            expect(resolved.outputs[0].token).toEqual(order.info.outputs[0].token);
-            expect(resolved.outputs[0].amount).toEqual(order.info.outputs[0].startAmount);
-        });
-        it("resolves at decayStartTime", () => {
-            const order = new CosignedV2DutchOrder(getFullOrderInfo({}), 1);
-            const resolved = order.resolve({
-                timestamp: order.info.cosignerData.decayStartTime,
-            });
-            expect(resolved.input.token).toEqual(order.info.input.token);
-            expect(resolved.input.amount).toEqual(order.info.cosignerData.inputOverride);
-            expect(resolved.outputs.length).toEqual(1);
-            expect(resolved.outputs[0].token).toEqual(order.info.outputs[0].token);
-            expect(resolved.outputs[0].amount).toEqual(order.info.cosignerData.outputOverrides[0]);
-        });
-        it("resolves at decayEndTime", () => {
-            const order = new CosignedV2DutchOrder(getFullOrderInfo({}), 1);
-            const resolved = order.resolve({
-                timestamp: order.info.cosignerData.decayEndTime,
-            });
-            expect(resolved.input.token).toEqual(order.info.input.token);
-            expect(resolved.input.amount).toEqual(order.info.cosignerData.inputOverride);
-            expect(resolved.outputs.length).toEqual(1);
-            expect(resolved.outputs[0].token).toEqual(order.info.outputs[0].token);
-            expect(resolved.outputs[0].amount).toEqual(order.info.outputs[0].endAmount);
-        });
-        it("resolves after decayEndTime", () => {
-            const order = new CosignedV2DutchOrder(getFullOrderInfo({}), 1);
-            const resolved = order.resolve({
-                timestamp: order.info.cosignerData.decayEndTime + 100,
-            });
-            expect(resolved.input.token).toEqual(order.info.input.token);
-            expect(resolved.input.amount).toEqual(order.info.cosignerData.inputOverride);
-            expect(resolved.outputs.length).toEqual(1);
-            expect(resolved.outputs[0].token).toEqual(order.info.outputs[0].token);
-            expect(resolved.outputs[0].amount).toEqual(order.info.outputs[0].endAmount);
-        });
-        //TODO: The tests below this line are not testing anything
-        it("resolves when filler has exclusivity", () => {
-            const exclusiveFiller = "0x0000000000000000000000000000000000000001";
-            const order = new CosignedV2DutchOrder(getFullOrderInfo({
-                cosignerData: {
-                    exclusiveFiller: exclusiveFiller,
-                    exclusivityOverrideBps: BigNumber.from(0),
-                    decayStartTime: Math.floor(new Date().getTime() / 1000),
-                    decayEndTime: Math.floor(new Date().getTime() / 1000) + 1000,
-                    inputOverride: RAW_AMOUNT,
-                    outputOverrides: [RAW_AMOUNT.mul(102).div(100)],
-                },
-            }), 1);
-            const resolved = order.resolve({
-                timestamp: order.info.cosignerData.decayStartTime - 1,
-                filler: exclusiveFiller,
-            });
-            expect(resolved.input.token).toEqual(order.info.input.token);
-            expect(resolved.input.amount).toEqual(order.info.cosignerData.inputOverride);
-            expect(resolved.outputs.length).toEqual(1);
-            expect(resolved.outputs[0].token).toEqual(order.info.outputs[0].token);
-            expect(resolved.outputs[0].amount).toEqual(order.info.cosignerData.outputOverrides[0]);
-        });
-        it("resolves when filler doesnt have exclusivity", () => {
-            const nonExclusiveFiller = ethers.constants.AddressZero;
-            const exclusiveFiller = "0x0000000000000000000000000000000000000001";
-            const order = new CosignedV2DutchOrder(getFullOrderInfo({
-                cosignerData: {
-                    exclusiveFiller,
-                    exclusivityOverrideBps: BigNumber.from(0),
-                    decayStartTime: Math.floor(new Date().getTime() / 1000),
-                    decayEndTime: Math.floor(new Date().getTime() / 1000) + 1000,
-                    inputOverride: RAW_AMOUNT,
-                    outputOverrides: [RAW_AMOUNT.mul(102).div(100)],
-                },
-            }), 1);
-            const resolved = order.resolve({
-                timestamp: order.info.cosignerData.decayStartTime - 1,
-                filler: nonExclusiveFiller,
-            });
-            expect(resolved.input.token).toEqual(order.info.input.token);
-            expect(resolved.input.amount).toEqual(order.info.cosignerData.inputOverride);
-            expect(resolved.outputs.length).toEqual(1);
-            expect(resolved.outputs[0].token).toEqual(order.info.outputs[0].token);
-            expect(resolved.outputs[0].amount).toEqual(order.info.cosignerData.outputOverrides[0]);
-        });
-        it("resolves when filler doesnt have exclusivity but decayStartTime is past", () => {
-            const nonExclusiveFiller = ethers.constants.AddressZero;
-            const exclusiveFiller = "0x0000000000000000000000000000000000000001";
-            const order = new CosignedV2DutchOrder(getFullOrderInfo({
-                cosignerData: {
-                    exclusiveFiller,
-                    exclusivityOverrideBps: BigNumber.from(0),
-                    decayStartTime: Math.floor(new Date().getTime() / 1000),
-                    decayEndTime: Math.floor(new Date().getTime() / 1000) + 1000,
-                    inputOverride: RAW_AMOUNT,
-                    outputOverrides: [RAW_AMOUNT.mul(102).div(100)],
-                },
-            }), 1);
-            const resolved = order.resolve({
-                timestamp: order.info.cosignerData.decayEndTime,
-                filler: nonExclusiveFiller,
-            });
-            expect(resolved.input.token).toEqual(order.info.input.token);
-            expect(resolved.input.amount).toEqual(order.info.cosignerData.inputOverride);
-            expect(resolved.outputs.length).toEqual(1);
-            expect(resolved.outputs[0].token).toEqual(order.info.outputs[0].token);
-            expect(resolved.outputs[0].amount).toEqual(order.info.outputs[0].endAmount);
-        });
-        it("resolves when filler is not set but there is exclusivity", () => {
-            const exclusiveFiller = "0x0000000000000000000000000000000000000001";
-            const order = new CosignedV2DutchOrder(getFullOrderInfo({
-                cosignerData: {
-                    exclusiveFiller,
-                    exclusivityOverrideBps: BigNumber.from(0),
-                    decayStartTime: Math.floor(new Date().getTime() / 1000),
-                    decayEndTime: Math.floor(new Date().getTime() / 1000) + 1000,
-                    inputOverride: RAW_AMOUNT,
-                    outputOverrides: [RAW_AMOUNT.mul(102).div(100)],
-                },
-            }), 1);
-            const resolved = order.resolve({
-                timestamp: order.info.cosignerData.decayStartTime - 1,
-            });
-            expect(resolved.input.token).toEqual(order.info.input.token);
-            expect(resolved.input.amount).toEqual(order.info.cosignerData.inputOverride);
-            expect(resolved.outputs.length).toEqual(1);
-            expect(resolved.outputs[0].token).toEqual(order.info.outputs[0].token);
-            expect(resolved.outputs[0].amount).toEqual(order.info.cosignerData.outputOverrides[0]);
-        });
-    });
-});
-//# sourceMappingURL=V2DutchOrder.test.js.map