@uniswap/universal-router-sdk 3.0.3 → 3.0.4

package/package.json

@@ -19,22 +19,24 @@
     "build": "tsdx build",
     "docs": "typedoc",
     "forge:fix": "forge fmt",
-    "install:ur": "cd node_modules/@uniswap/universal-router && forge install",
     "lint": "yarn prettier",
     "lint:fix": "yarn prettier:fix && yarn forge:fix",
     "prettier": "prettier --check '**/*.ts' && prettier --check '**/*.json'",
     "prettier:fix": "prettier --write '**/*.ts' && prettier --write '**/*.json'",
     "release": "semantic-release",
     "test": "yarn test:hardhat && yarn test:forge",
-    "test:forge": "yarn install:ur && forge test",
+    "test:forge": "forge test",
     "test:hardhat": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' hardhat test"
   },
   "dependencies": {
+    "@openzeppelin/contracts": "4.7.0",
     "@uniswap/permit2-sdk": "^1.3.0",
-    "@uniswap/router-sdk": "^1.10.0",
+    "@uniswap/router-sdk": "^1.11.0",
     "@uniswap/sdk-core": "^5.3.1",
-    "@uniswap/universal-router": "1.6.0",
+    "@uniswap/universal-router": "2.0.0-beta.1",
+    "@uniswap/v2-core": "^1.0.1",
     "@uniswap/v2-sdk": "^4.4.1",
+    "@uniswap/v3-core": "1.0.0",
     "@uniswap/v3-sdk": "^3.13.1",
     "@uniswap/v4-sdk": "^1.0.0",
     "bignumber.js": "^9.0.2",
@@ -98,5 +100,5 @@
   "installConfig": {
     "hoistingLimits": "workspaces"
   },
-  "version": "3.0.3"
+  "version": "3.0.4"
 }

package/dist/entities/NFTTrade.d.ts

@@ -1,44 +0,0 @@
-import { BigNumber, BigNumberish } from 'ethers';
-import { SeaportData } from './protocols/seaport';
-import { FoundationData } from './protocols/foundation';
-import { NFTXData } from './protocols/nftx';
-import { NFT20Data } from './protocols/nft20';
-import { RoutePlanner } from '../utils/routerCommands';
-import { Command, RouterTradeType, TradeConfig } from './Command';
-import { SudoswapData } from './protocols/sudoswap';
-import { CryptopunkData } from './protocols/cryptopunk';
-import { X2Y2Data } from './protocols/x2y2';
-import { ElementData } from './protocols/element-market';
-import { LooksRareV2Data } from './protocols/looksRareV2';
-export declare type SupportedProtocolsData = SeaportData | FoundationData | NFTXData | LooksRareV2Data | X2Y2Data | CryptopunkData | NFT20Data | SudoswapData | ElementData;
-export declare abstract class NFTTrade<T> implements Command {
-    readonly tradeType: RouterTradeType;
-    readonly orders: T[];
-    readonly market: Market;
-    constructor(market: Market, orders: T[]);
-    abstract encode(planner: RoutePlanner, config: TradeConfig): void;
-    abstract getBuyItems(): BuyItem[];
-    abstract getTotalPrice(token?: string): BigNumber;
-}
-export declare type BuyItem = {
-    tokenAddress: string;
-    tokenId: BigNumberish;
-    tokenType: TokenType;
-    amount?: BigNumberish;
-};
-export declare enum Market {
-    Foundation = "foundation",
-    LooksRareV2 = "looksrareV2",
-    NFT20 = "nft20",
-    NFTX = "nftx",
-    Seaport = "seaport",
-    Sudoswap = "Sudoswap",
-    Cryptopunks = "cryptopunks",
-    X2Y2 = "x2y2",
-    Element = "element"
-}
-export declare enum TokenType {
-    ERC721 = "ERC721",
-    ERC1155 = "ERC1155",
-    Cryptopunk = "Cryptopunk"
-}

package/dist/entities/protocols/cryptopunk.d.ts

@@ -1,16 +0,0 @@
-import { TradeConfig } from '../Command';
-import { NFTTrade, BuyItem } from '../NFTTrade';
-import { RoutePlanner } from '../../utils/routerCommands';
-import { BigNumber, BigNumberish } from 'ethers';
-export declare type CryptopunkData = {
-    tokenId: BigNumberish;
-    recipient: string;
-    value: BigNumberish;
-};
-export declare class CryptopunkTrade extends NFTTrade<CryptopunkData> {
-    static CRYPTOPUNK_ADDRESS: string;
-    constructor(orders: CryptopunkData[]);
-    encode(planner: RoutePlanner, config: TradeConfig): void;
-    getBuyItems(): BuyItem[];
-    getTotalPrice(): BigNumber;
-}

package/dist/entities/protocols/element-market.d.ts

@@ -1,44 +0,0 @@
-import { Interface } from '@ethersproject/abi';
-import { BuyItem, NFTTrade } from '../NFTTrade';
-import { TradeConfig } from '../Command';
-import { RoutePlanner } from '../../utils/routerCommands';
-import { BigNumber } from 'ethers';
-export interface Fee {
-    recipient: string;
-    amount: string;
-    feeData: string;
-}
-declare type ElementPartialData = {
-    maker: string;
-    taker: string;
-    expiry: string;
-    nonce: string;
-    erc20Token: string;
-    erc20TokenAmount: string;
-    fees: Fee[];
-};
-export declare type ERC721SellOrder = ElementPartialData & {
-    nft: string;
-    nftId: string;
-};
-export declare type OrderSignature = {
-    signatureType: number;
-    v: number;
-    r: string;
-    s: string;
-};
-export declare type ElementData = {
-    order: ERC721SellOrder;
-    signature: OrderSignature;
-    recipient: string;
-};
-export declare class ElementTrade extends NFTTrade<ElementData> {
-    private static ETH_ADDRESS;
-    static INTERFACE: Interface;
-    constructor(orders: ElementData[]);
-    encode(planner: RoutePlanner, config: TradeConfig): void;
-    getBuyItems(): BuyItem[];
-    getTotalPrice(): BigNumber;
-    getOrderPriceIncludingFees(order: ERC721SellOrder): BigNumber;
-}
-export {};

package/dist/entities/protocols/foundation.d.ts

@@ -1,19 +0,0 @@
-import { Interface } from '@ethersproject/abi';
-import { BuyItem, NFTTrade } from '../NFTTrade';
-import { TradeConfig } from '../Command';
-import { RoutePlanner } from '../../utils/routerCommands';
-import { BigNumber, BigNumberish } from 'ethers';
-export declare type FoundationData = {
-    recipient: string;
-    tokenAddress: string;
-    tokenId: BigNumberish;
-    price: BigNumberish;
-    referrer: string;
-};
-export declare class FoundationTrade extends NFTTrade<FoundationData> {
-    static INTERFACE: Interface;
-    constructor(orders: FoundationData[]);
-    encode(planner: RoutePlanner, config: TradeConfig): void;
-    getBuyItems(): BuyItem[];
-    getTotalPrice(): BigNumber;
-}

package/dist/entities/protocols/index.d.ts

@@ -1,10 +0,0 @@
-export * from './cryptopunk';
-export * from './foundation';
-export * from './looksRareV2';
-export * from './nft20';
-export * from './nftx';
-export * from './seaport';
-export * from './uniswap';
-export * from './sudoswap';
-export * from './x2y2';
-export * from './unwrapWETH';

package/dist/entities/protocols/looksRareV2.d.ts

@@ -1,56 +0,0 @@
-import { Interface } from '@ethersproject/abi';
-import { BuyItem, NFTTrade } from '../NFTTrade';
-import { TradeConfig } from '../Command';
-import { RoutePlanner } from '../../utils/routerCommands';
-import { BigNumber } from 'ethers';
-export declare type MakerOrder = {
-    quoteType: number;
-    globalNonce: string;
-    subsetNonce: string;
-    orderNonce: string;
-    strategyId: number;
-    collectionType: number;
-    collection: string;
-    currency: string;
-    signer: string;
-    startTime: number;
-    endTime: number;
-    price: string;
-    itemIds: string[];
-    amounts: string[];
-    additionalParameters: string;
-};
-export declare type TakerOrder = {
-    recipient: string;
-    additionalParameters: string;
-};
-export declare type MerkleProof = {
-    value: string;
-    position: number;
-};
-export declare type MerkleTree = {
-    root: string;
-    proof: MerkleProof[];
-};
-export declare type LRV2APIOrder = MakerOrder & {
-    id: string;
-    hash: string;
-    signature: string;
-    createdAt: string;
-    merkleRoot?: string;
-    merkleProof?: MerkleProof[];
-    status: string;
-};
-export declare type LooksRareV2Data = {
-    apiOrder: LRV2APIOrder;
-    taker: string;
-};
-export declare class LooksRareV2Trade extends NFTTrade<LooksRareV2Data> {
-    static INTERFACE: Interface;
-    private static ERC721_ORDER;
-    constructor(orders: LooksRareV2Data[]);
-    encode(planner: RoutePlanner, config: TradeConfig): void;
-    getBuyItems(): BuyItem[];
-    getTotalPrice(): BigNumber;
-    private refactorAPIData;
-}

package/dist/entities/protocols/nft20.d.ts

@@ -1,21 +0,0 @@
-import { Interface } from '@ethersproject/abi';
-import { TradeConfig } from '../Command';
-import { NFTTrade, BuyItem } from '../NFTTrade';
-import { RoutePlanner } from '../../utils/routerCommands';
-import { BigNumber, BigNumberish } from 'ethers';
-export declare type NFT20Data = {
-    tokenAddress: string;
-    tokenIds: BigNumberish[];
-    tokenAmounts: BigNumberish[];
-    recipient: string;
-    fee: BigNumberish;
-    isV3: boolean;
-    value: BigNumberish;
-};
-export declare class NFT20Trade extends NFTTrade<NFT20Data> {
-    static INTERFACE: Interface;
-    constructor(orders: NFT20Data[]);
-    encode(planner: RoutePlanner, config: TradeConfig): void;
-    getBuyItems(): BuyItem[];
-    getTotalPrice(): BigNumber;
-}

package/dist/entities/protocols/nftx.d.ts

@@ -1,20 +0,0 @@
-import { Interface } from '@ethersproject/abi';
-import { BuyItem, NFTTrade } from '../NFTTrade';
-import { TradeConfig } from '../Command';
-import { RoutePlanner } from '../../utils/routerCommands';
-import { BigNumber, BigNumberish } from 'ethers';
-export declare type NFTXData = {
-    recipient: string;
-    vaultId: BigNumberish;
-    tokenAddress: string;
-    tokenIds: BigNumberish[];
-    value: BigNumber;
-    swapCalldata: string;
-};
-export declare class NFTXTrade extends NFTTrade<NFTXData> {
-    static INTERFACE: Interface;
-    constructor(orders: NFTXData[]);
-    encode(planner: RoutePlanner, config: TradeConfig): void;
-    getBuyItems(): BuyItem[];
-    getTotalPrice(): BigNumber;
-}

package/dist/entities/protocols/seaport.d.ts

@@ -1,69 +0,0 @@
-import { BigNumber, BigNumberish } from 'ethers';
-import { Interface } from '@ethersproject/abi';
-import { BuyItem, NFTTrade } from '../NFTTrade';
-import { TradeConfig } from '../Command';
-import { RoutePlanner } from '../../utils/routerCommands';
-import { Permit2Permit } from '../../utils/inputTokens';
-export declare type SeaportData = {
-    items: Order[];
-    recipient: string;
-    protocolAddress: string;
-    inputTokenProcessing?: InputTokenProcessing[];
-};
-export declare type InputTokenProcessing = {
-    token: string;
-    permit2Permit?: Permit2Permit;
-    protocolApproval: boolean;
-    permit2TransferFrom: boolean;
-};
-export declare type FulfillmentComponent = {
-    orderIndex: BigNumberish;
-    itemIndex: BigNumberish;
-};
-export declare type OfferItem = {
-    itemType: BigNumberish;
-    token: string;
-    identifierOrCriteria: BigNumberish;
-    startAmount: BigNumberish;
-    endAmount: BigNumberish;
-};
-export declare type ConsiderationItem = OfferItem & {
-    recipient: string;
-};
-export declare type Order = {
-    parameters: OrderParameters;
-    signature: string;
-};
-declare type OrderParameters = {
-    offerer: string;
-    offer: OfferItem[];
-    consideration: ConsiderationItem[];
-    orderType: BigNumberish;
-    startTime: BigNumberish;
-    endTime: BigNumberish;
-    zoneHash: string;
-    zone: string;
-    salt: BigNumberish;
-    conduitKey: string;
-    totalOriginalConsiderationItems: BigNumberish;
-};
-export declare type AdvancedOrder = Order & {
-    numerator: BigNumber;
-    denominator: BigNumber;
-    extraData: string;
-};
-export declare class SeaportTrade extends NFTTrade<SeaportData> {
-    static INTERFACE: Interface;
-    static OPENSEA_CONDUIT_KEY: string;
-    constructor(orders: SeaportData[]);
-    encode(planner: RoutePlanner, config: TradeConfig): void;
-    getBuyItems(): BuyItem[];
-    getInputTokens(): Set<string>;
-    getTotalOrderPrice(order: SeaportData, token?: string): BigNumber;
-    getTotalPrice(token?: string): BigNumber;
-    private commandMap;
-    private getConsiderationFulfillments;
-    private getAdvancedOrderParams;
-    private calculateValue;
-}
-export {};

package/dist/entities/protocols/sudoswap.d.ts

@@ -1,27 +0,0 @@
-import { Interface } from '@ethersproject/abi';
-import { BuyItem, NFTTrade } from '../NFTTrade';
-import { TradeConfig } from '../Command';
-import { RoutePlanner } from '../../utils/routerCommands';
-import { BigNumber, BigNumberish } from 'ethers';
-declare type PairSwap = {
-    swapInfo: {
-        pair: string;
-        nftIds: BigNumberish[];
-    };
-    tokenAddress: string;
-    maxCost: BigNumberish;
-};
-export declare type SudoswapData = {
-    swaps: PairSwap[];
-    nftRecipient: string;
-    ethRecipient: string;
-    deadline: BigNumberish;
-};
-export declare class SudoswapTrade extends NFTTrade<SudoswapData> {
-    static INTERFACE: Interface;
-    constructor(orders: SudoswapData[]);
-    encode(planner: RoutePlanner, config: TradeConfig): void;
-    getBuyItems(): BuyItem[];
-    getTotalPrice(): BigNumber;
-}
-export {};

package/dist/entities/protocols/x2y2.d.ts

@@ -1,28 +0,0 @@
-import { Interface } from '@ethersproject/abi';
-import { BuyItem, NFTTrade, TokenType } from '../NFTTrade';
-import { TradeConfig } from '../Command';
-import { RoutePlanner } from '../../utils/routerCommands';
-import { BigNumber, BigNumberish } from 'ethers';
-declare type X2Y2PartialData = {
-    signedInput: string;
-    recipient: string;
-    tokenAddress: string;
-    tokenId: BigNumberish;
-    price: BigNumberish;
-};
-export declare type X2Y2_721_Data = X2Y2PartialData & {
-    tokenType: TokenType.ERC721;
-};
-export declare type X2Y2_1155_Data = X2Y2PartialData & {
-    tokenType: TokenType.ERC1155;
-    tokenAmount: BigNumberish;
-};
-export declare type X2Y2Data = X2Y2_721_Data | X2Y2_1155_Data;
-export declare class X2Y2Trade extends NFTTrade<X2Y2Data> {
-    static INTERFACE: Interface;
-    constructor(orders: X2Y2Data[]);
-    encode(planner: RoutePlanner, config: TradeConfig): void;
-    getBuyItems(): BuyItem[];
-    getTotalPrice(): BigNumber;
-}
-export {};

package/dist/test/orders/element.d.ts

@@ -1,7 +0,0 @@
-import { ElementData, OrderSignature, ERC721SellOrder } from '../../src/entities/protocols/element-market';
-export declare const elementOrderETH: ERC721SellOrder;
-export declare const elementSignatureETH: OrderSignature;
-export declare const elementOrderETH_WithFees: ERC721SellOrder;
-export declare const elementOrderETH_WithFees_Signature: OrderSignature;
-export declare const elementDataETH: ElementData;
-export declare const elementDataETH_WithFees: ElementData;

package/dist/test/orders/looksRareV2.d.ts

@@ -1,2 +0,0 @@
-import { LRV2APIOrder } from '../../src/entities/protocols/looksRareV2';
-export declare const looksRareV2Orders: LRV2APIOrder[];

package/dist/test/orders/seaportV1_4.d.ts

@@ -1,4 +0,0 @@
-import { SeaportData } from '../../src/entities/protocols/seaport';
-export declare const seaportV1_4DataETH: SeaportData;
-export declare const seaportV1_4DataETHRecent: SeaportData;
-export declare const seaportV1_4DataERC20: SeaportData;

package/dist/test/orders/seaportV1_5.d.ts

@@ -1,4 +0,0 @@
-import { ConsiderationItem, SeaportData } from '../../src/entities/protocols/seaport';
-import { BigNumber } from 'ethers';
-export declare const seaportV1_5DataETH: SeaportData;
-export declare function calculateSeaportValue(considerations: ConsiderationItem[], token: string): BigNumber;

package/dist/test/orders/x2y2.d.ts

@@ -1,6 +0,0 @@
-export declare const x2y2Orders: {
-    input: string;
-    order_id: number;
-    token_id: string;
-    price: string;
-}[];

package/dist/utils/getNativeCurrencyValue.d.ts

@@ -1,2 +0,0 @@
-import { Currency, CurrencyAmount } from '@uniswap/sdk-core';
-export declare function getNativeCurrencyValue(currencyValues: CurrencyAmount<Currency>[]): CurrencyAmount<Currency>;