@juiceswapxyz/uniswapx-sdk 3.0.0 → 3.0.1

package/dist/cjs/src/order/RelayOrder.d.ts

@@ -0,0 +1,75 @@
+import { SignatureLike } from "@ethersproject/bytes";
+import { PermitBatchTransferFromData } from "@uniswap/permit2-sdk";
+import { BigNumber } from "ethers";
+import { ResolvedRelayOrder } from "../utils/OrderQuoter";
+import { BlockOverrides, OffChainOrder, OrderInfo, OrderResolutionOptions } from "./types";
+export type RelayInput = {
+    readonly token: string;
+    readonly amount: BigNumber;
+    readonly recipient: string;
+};
+export type RelayFee = {
+    readonly token: string;
+    readonly startAmount: BigNumber;
+    readonly endAmount: BigNumber;
+    readonly startTime: number;
+    readonly endTime: number;
+};
+export type RelayInputJSON = Omit<RelayInput, "amount"> & {
+    amount: string;
+};
+export type RelayFeeJSON = Omit<RelayFee, "startAmount" | "endAmount"> & {
+    startAmount: string;
+    endAmount: string;
+};
+type RelayOrderNestedOrderInfo = Omit<OrderInfo, "additionalValidationContract" | "additionalValidationData">;
+export type RelayOrderInfo = RelayOrderNestedOrderInfo & {
+    input: RelayInput;
+    fee: RelayFee;
+    universalRouterCalldata: string;
+};
+export type RelayOrderInfoJSON = Omit<RelayOrderInfo, "nonce" | "input" | "fee"> & {
+    nonce: string;
+    input: RelayInputJSON;
+    fee: RelayFeeJSON;
+    universalRouterCalldata: string;
+};
+export declare class RelayOrder implements OffChainOrder {
+    readonly info: RelayOrderInfo;
+    readonly chainId: number;
+    readonly _permit2Address?: string | undefined;
+    permit2Address: string;
+    constructor(info: RelayOrderInfo, chainId: number, _permit2Address?: string | undefined);
+    static fromJSON(json: RelayOrderInfoJSON, chainId: number, _permit2Address?: string): RelayOrder;
+    static parse(encoded: string, chainId: number, permit2?: string): RelayOrder;
+    toJSON(): RelayOrderInfoJSON & {
+        permit2Address: string;
+        chainId: number;
+    };
+    /**
+     * @inheritdoc order
+     */
+    get blockOverrides(): BlockOverrides;
+    serialize(): string;
+    /**
+     * @inheritdoc Order
+     */
+    getSigner(signature: SignatureLike): string;
+    /**
+     * @inheritdoc OrderInterface
+     */
+    permitData(): PermitBatchTransferFromData;
+    /**
+     * @inheritdoc OrderInterface
+     */
+    hash(): string;
+    /**
+     * Returns the resolved order with the given options
+     * @return The resolved order
+     */
+    resolve(options: OrderResolutionOptions): ResolvedRelayOrder;
+    private toPermit;
+    private witnessInfo;
+    private witness;
+}
+export {};

package/dist/cjs/src/order/RelayOrder.js

@@ -0,0 +1,228 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RelayOrder = void 0;
+const permit2_sdk_1 = require("@uniswap/permit2-sdk");
+const ethers_1 = require("ethers");
+const constants_1 = require("../constants");
+const errors_1 = require("../errors");
+const dutchDecay_1 = require("../utils/dutchDecay");
+const RELAY_WITNESS_TYPES = {
+    RelayOrder: [
+        { name: "info", type: "RelayOrderInfo" },
+        { name: "input", type: "Input" },
+        { name: "fee", type: "FeeEscalator" },
+        { name: "universalRouterCalldata", type: "bytes" },
+    ],
+    RelayOrderInfo: [
+        { name: "reactor", type: "address" },
+        { name: "swapper", type: "address" },
+        { name: "nonce", type: "uint256" },
+        { name: "deadline", type: "uint256" },
+    ],
+    Input: [
+        { name: "token", type: "address" },
+        { name: "amount", type: "uint256" },
+        { name: "recipient", type: "address" },
+    ],
+    FeeEscalator: [
+        { name: "token", type: "address" },
+        { name: "startAmount", type: "uint256" },
+        { name: "endAmount", type: "uint256" },
+        { name: "startTime", type: "uint256" },
+        { name: "endTime", type: "uint256" },
+    ],
+};
+const RELAY_ORDER_ABI = [
+    "tuple(" +
+        [
+            "tuple(address,address,uint256,uint256)",
+            "tuple(address,uint256,address)",
+            "tuple(address,uint256,uint256,uint256,uint256)",
+            "bytes",
+        ].join(",") +
+        ")",
+];
+class RelayOrder {
+    constructor(info, chainId, _permit2Address) {
+        this.info = info;
+        this.chainId = chainId;
+        this._permit2Address = _permit2Address;
+        if (_permit2Address) {
+            this.permit2Address = _permit2Address;
+        }
+        else if (constants_1.PERMIT2_MAPPING[chainId]) {
+            this.permit2Address = constants_1.PERMIT2_MAPPING[chainId];
+        }
+        else {
+            throw new errors_1.MissingConfiguration("permit2", chainId.toString());
+        }
+    }
+    static fromJSON(json, chainId, _permit2Address) {
+        return new RelayOrder(Object.assign(Object.assign({}, json), { nonce: ethers_1.BigNumber.from(json.nonce), input: {
+                token: json.input.token,
+                amount: ethers_1.BigNumber.from(json.input.amount),
+                recipient: json.input.recipient,
+            }, fee: {
+                token: json.fee.token,
+                startAmount: ethers_1.BigNumber.from(json.fee.startAmount),
+                endAmount: ethers_1.BigNumber.from(json.fee.endAmount),
+                startTime: json.fee.startTime,
+                endTime: json.fee.endTime,
+            } }), chainId, _permit2Address);
+    }
+    static parse(encoded, chainId, permit2) {
+        const abiCoder = new ethers_1.ethers.utils.AbiCoder();
+        const decoded = abiCoder.decode(RELAY_ORDER_ABI, encoded);
+        const [[[reactor, swapper, nonce, deadline], [inputToken, inputAmount, inputRecipient], [feeToken, feeStartAmount, feeEndAmount, feeStartTime, feeEndTime], universalRouterCalldata,],] = decoded;
+        return new RelayOrder({
+            reactor,
+            swapper,
+            nonce,
+            deadline: deadline.toNumber(),
+            input: {
+                token: inputToken,
+                amount: inputAmount,
+                recipient: inputRecipient,
+            },
+            fee: {
+                token: feeToken,
+                startAmount: feeStartAmount,
+                endAmount: feeEndAmount,
+                startTime: feeStartTime.toNumber(),
+                endTime: feeEndTime.toNumber(),
+            },
+            universalRouterCalldata: universalRouterCalldata,
+        }, chainId, permit2);
+    }
+    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,
+            universalRouterCalldata: this.info.universalRouterCalldata,
+            input: {
+                token: this.info.input.token,
+                amount: this.info.input.amount.toString(),
+                recipient: this.info.input.recipient,
+            },
+            fee: {
+                token: this.info.fee.token,
+                startAmount: this.info.fee.startAmount.toString(),
+                endAmount: this.info.fee.endAmount.toString(),
+                startTime: this.info.fee.startTime,
+                endTime: this.info.fee.endTime,
+            },
+        };
+    }
+    /**
+     * @inheritdoc order
+     */
+    get blockOverrides() {
+        return undefined;
+    }
+    serialize() {
+        const abiCoder = new ethers_1.ethers.utils.AbiCoder();
+        return abiCoder.encode(RELAY_ORDER_ABI, [
+            [
+                [
+                    this.info.reactor,
+                    this.info.swapper,
+                    this.info.nonce,
+                    this.info.deadline,
+                ],
+                [
+                    this.info.input.token,
+                    this.info.input.amount,
+                    this.info.input.recipient,
+                ],
+                [
+                    this.info.fee.token,
+                    this.info.fee.startAmount,
+                    this.info.fee.endAmount,
+                    this.info.fee.startTime,
+                    this.info.fee.endTime,
+                ],
+                this.info.universalRouterCalldata,
+            ],
+        ]);
+    }
+    /**
+     * @inheritdoc Order
+     */
+    getSigner(signature) {
+        return ethers_1.ethers.utils.computeAddress(ethers_1.ethers.utils.recoverPublicKey(permit2_sdk_1.SignatureTransfer.hash(this.toPermit(), this.permit2Address, this.chainId, this.witness()), signature));
+    }
+    /**
+     * @inheritdoc OrderInterface
+     */
+    permitData() {
+        return permit2_sdk_1.SignatureTransfer.getPermitData(this.toPermit(), this.permit2Address, this.chainId, this.witness());
+    }
+    /**
+     * @inheritdoc OrderInterface
+     */
+    hash() {
+        return ethers_1.ethers.utils._TypedDataEncoder
+            .from(RELAY_WITNESS_TYPES)
+            .hash(this.witnessInfo());
+    }
+    /**
+     * Returns the resolved order with the given options
+     * @return The resolved order
+     */
+    resolve(options) {
+        return {
+            fee: {
+                token: this.info.fee.token,
+                amount: (0, dutchDecay_1.getDecayedAmount)({
+                    decayStartTime: this.info.fee.startTime,
+                    decayEndTime: this.info.fee.endTime,
+                    startAmount: this.info.fee.startAmount,
+                    endAmount: this.info.fee.endAmount,
+                }, options.timestamp),
+            },
+        };
+    }
+    toPermit() {
+        return {
+            permitted: [
+                {
+                    token: this.info.input.token,
+                    amount: this.info.input.amount,
+                },
+                {
+                    token: this.info.fee.token,
+                    amount: this.info.fee.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,
+            },
+            input: this.info.input,
+            fee: this.info.fee,
+            universalRouterCalldata: this.info.universalRouterCalldata,
+        };
+    }
+    witness() {
+        return {
+            witness: this.witnessInfo(),
+            witnessTypeName: "RelayOrder",
+            witnessType: RELAY_WITNESS_TYPES,
+        };
+    }
+}
+exports.RelayOrder = RelayOrder;
+//# sourceMappingURL=RelayOrder.js.map

package/dist/cjs/src/order/RelayOrder.js.map

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

package/dist/cjs/src/order/RelayOrder.test.d.ts

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

package/dist/cjs/src/order/RelayOrder.test.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const ethers_1 = require("ethers");
+const RelayOrder_1 = require("./RelayOrder");
+describe("RelayOrder", () => {
+    const getOrderInfo = (data) => {
+        const feeStartTime = Math.floor(new Date().getTime() / 1000);
+        const feeEndTime = Math.floor(new Date().getTime() / 1000) + 1000;
+        return Object.assign({
+            deadline: feeEndTime,
+            reactor: "0x0000000000000000000000000000000000000000",
+            swapper: "0x0000000000000000000000000000000000000000",
+            nonce: ethers_1.BigNumber.from(10),
+            universalRouterCalldata: "0x",
+            input: {
+                token: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+                amount: ethers_1.BigNumber.from("1000000"),
+                recipient: "0x0000000000000000000000000000000000000000",
+            },
+            fee: {
+                token: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+                startAmount: ethers_1.BigNumber.from("1000000"),
+                endAmount: ethers_1.BigNumber.from("1000000"),
+                startTime: feeStartTime,
+                endTime: feeEndTime,
+            },
+        }, data);
+    };
+    it("parses a serialized order", () => {
+        const orderInfo = getOrderInfo({});
+        const order = new RelayOrder_1.RelayOrder(orderInfo, 1);
+        const serialized = order.serialize();
+        const parsed = RelayOrder_1.RelayOrder.parse(serialized, 1);
+        expect(parsed.info).toEqual(orderInfo);
+    });
+    it("valid signature over info", () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        const order = new RelayOrder_1.RelayOrder(getOrderInfo({}), 1);
+        const wallet = ethers_1.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());
+    }));
+    describe("resolve", () => {
+        it("resolves before decayStartTime", () => {
+            const order = new RelayOrder_1.RelayOrder(getOrderInfo({}), 1);
+            const resolved = order.resolve({
+                timestamp: order.info.fee.startTime - 100,
+            });
+            expect(resolved.fee.amount).toEqual(order.info.fee.startAmount);
+        });
+        it("resolves at decayStartTime", () => {
+            const order = new RelayOrder_1.RelayOrder(getOrderInfo({}), 1);
+            const resolved = order.resolve({ timestamp: order.info.fee.startTime });
+            expect(resolved.fee.amount).toEqual(order.info.fee.startAmount);
+        });
+        it("resolves at decayEndTime", () => {
+            const order = new RelayOrder_1.RelayOrder(getOrderInfo({}), 1);
+            const resolved = order.resolve({
+                timestamp: order.info.fee.endTime,
+            });
+            expect(resolved.fee.amount).toEqual(order.info.fee.endAmount);
+        });
+        it("resolves after decayEndTime", () => {
+            const order = new RelayOrder_1.RelayOrder(getOrderInfo({}), 1);
+            const resolved = order.resolve({
+                timestamp: order.info.fee.endTime + 100,
+            });
+            expect(resolved.fee.amount).toEqual(order.info.fee.endAmount);
+        });
+    });
+});
+//# sourceMappingURL=RelayOrder.test.js.map

package/dist/cjs/src/order/RelayOrder.test.js.map

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

package/dist/cjs/src/order/V2DutchOrder.d.ts

@@ -0,0 +1,103 @@
+import { SignatureLike } from "@ethersproject/bytes";
+import { PermitTransferFromData } from "@uniswap/permit2-sdk";
+import { ResolvedUniswapXOrder } from "../utils/OrderQuoter";
+import { BlockOverrides, CosignerData, CosignerDataJSON, DutchInput, DutchInputJSON, DutchOutput, DutchOutputJSON, OffChainOrder, OrderInfo, OrderResolutionOptions } from "./types";
+import { CustomOrderValidation } from "./validation";
+export type UnsignedV2DutchOrderInfo = OrderInfo & {
+    cosigner: string;
+    input: DutchInput;
+    outputs: DutchOutput[];
+};
+export type CosignedV2DutchOrderInfo = UnsignedV2DutchOrderInfo & {
+    cosignerData: CosignerData;
+    cosignature: string;
+};
+export type UnsignedV2DutchOrderInfoJSON = Omit<UnsignedV2DutchOrderInfo, "nonce" | "input" | "outputs" | "cosignerData"> & {
+    nonce: string;
+    input: DutchInputJSON;
+    outputs: DutchOutputJSON[];
+};
+export type CosignedV2DutchOrderInfoJSON = UnsignedV2DutchOrderInfoJSON & {
+    cosignerData: CosignerDataJSON;
+    cosignature: string;
+};
+export declare class UnsignedV2DutchOrder implements OffChainOrder {
+    readonly info: UnsignedV2DutchOrderInfo;
+    readonly chainId: number;
+    permit2Address: string;
+    constructor(info: UnsignedV2DutchOrderInfo, chainId: number, _permit2Address?: string);
+    static fromJSON(json: UnsignedV2DutchOrderInfoJSON, chainId: number, _permit2Address?: string): UnsignedV2DutchOrder;
+    static parse(encoded: string, chainId: number, permit2?: string): UnsignedV2DutchOrder;
+    /**
+     * @inheritdoc order
+     */
+    toJSON(): UnsignedV2DutchOrderInfoJSON & {
+        permit2Address: string;
+        chainId: number;
+    };
+    /**
+     * @inheritdoc order
+     */
+    get blockOverrides(): BlockOverrides;
+    /**
+     * @inheritdoc order
+     */
+    serialize(): string;
+    /**
+     * @inheritdoc Order
+     */
+    getSigner(signature: SignatureLike): string;
+    /**
+     * @inheritdoc Order
+     */
+    permitData(): PermitTransferFromData;
+    /**
+     * @inheritdoc Order
+     */
+    hash(): string;
+    /**
+     * Returns the resolved order with the given options
+     * @return The resolved order
+     */
+    resolve(_options: OrderResolutionOptions): ResolvedUniswapXOrder;
+    /**
+     * Returns the parsed validation
+     * @return The parsed validation data for the order
+     */
+    get validation(): CustomOrderValidation;
+    private toPermit;
+    private witnessInfo;
+    private witness;
+    /**
+     * Full order hash that should be signed over by the cosigner
+     */
+    cosignatureHash(cosignerData: CosignerData): string;
+}
+export declare class CosignedV2DutchOrder extends UnsignedV2DutchOrder {
+    readonly info: CosignedV2DutchOrderInfo;
+    readonly chainId: number;
+    static fromUnsignedOrder(order: UnsignedV2DutchOrder, cosignerData: CosignerData, cosignature: string): CosignedV2DutchOrder;
+    static fromJSON(json: CosignedV2DutchOrderInfoJSON, chainId: number, _permit2Address?: string): CosignedV2DutchOrder;
+    static parse(encoded: string, chainId: number, permit2?: string): CosignedV2DutchOrder;
+    constructor(info: CosignedV2DutchOrderInfo, chainId: number, _permit2Address?: string);
+    /**
+     * @inheritdoc order
+     */
+    toJSON(): CosignedV2DutchOrderInfoJSON & {
+        permit2Address: string;
+        chainId: number;
+    };
+    /**
+     * @inheritdoc Order
+     */
+    resolve(options: OrderResolutionOptions): ResolvedUniswapXOrder;
+    /**
+     * @inheritdoc order
+     */
+    serialize(): string;
+    /**
+     *  recovers co-signer address from cosignature and full order hash
+     *  @returns The address which co-signed the order
+     */
+    recoverCosigner(): string;
+}