From 72b4850a6d0a72805b63b246947c24a898168287 Mon Sep 17 00:00:00 2001 From: Josh Stevens Date: Tue, 27 Jul 2021 10:28:54 +0100 Subject: [PATCH] support csj and esm --- package-lock.json | 8 +- package.json | 13 +++- src/ABI/types/erc20-contract.ts | 8 +- src/ABI/types/uniswap-factory-v2.ts | 8 +- src/ABI/types/uniswap-factory-v3.ts | 8 +- src/ABI/types/uniswap-pair-v2.ts | 8 +- src/ABI/types/uniswap-quoter-v3.ts | 7 +- src/ABI/types/uniswap-router-v2.ts | 7 +- src/ABI/types/uniswap-router-v3.ts | 7 +- src/__TEST-SCRIPT__/playground.ts | 2 +- src/factories/pair/uniswap-pair.factory.ts | 4 +- tsconfig.json | 85 +++++----------------- 12 files changed, 49 insertions(+), 116 deletions(-) diff --git a/package-lock.json b/package-lock.json index 521b1623..b34e673b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "simple-uniswap-sdk", - "version": "3.2.0", + "version": "3.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2468,9 +2468,9 @@ } }, "ethereum-multicall": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/ethereum-multicall/-/ethereum-multicall-2.4.0.tgz", - "integrity": "sha512-BJb4u7Dian7DLSSN63vvJC9UXxm+0WGwxGqABkviM0dhyxJONjSoRld9kiF2OcpBFzLzfk2e2dImiZzpUv4+vA==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/ethereum-multicall/-/ethereum-multicall-2.7.0.tgz", + "integrity": "sha512-fnbyk0naGwupnnirI7KIzSlx2P6ZV1piS2dJ4W7dJbBgAfr1OKcbcqeNq+ADi/cIzSV6shcjynLYQQs5UOPqUw==", "requires": { "@ethersproject/providers": "^5.0.10", "ethers": "^5.0.15" diff --git a/package.json b/package.json index 035a3cb5..39699b72 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,14 @@ { "name": "simple-uniswap-sdk", - "version": "3.2.0", + "version": "3.3.0", "description": "Simple easy to understand SDK for uniswap which looks over best v2 and v3 to find you the best swap quote", - "main": "dist/index.js", + "main": "dist/cjs/index.js", + "module": "./dist/esm/index.js", + "types": "./dist/esm/index.d.ts", "scripts": { + "build": "npm run build:esm && npm run build:cjs", + "build:esm": "tsc", + "build:cjs": "tsc --module commonjs --outDir dist/cjs", "test": "jest", "gen-erc20-abi": "abi-types-generator ./src/ABI/erc-20-abi.json --output=./src/ABI/types --name=erc20-contract --provider=ethers_v5", "gen-uniswap-router-v2-abi": "abi-types-generator ./src/ABI/uniswap-router-v2.json --output=./src/ABI/types --name=uniswap-router-v2 --provider=ethers_v5", @@ -13,7 +18,7 @@ "gen-uniswap-pair-v2-abi": "abi-types-generator ./src/ABI/uniswap-pair-v2.json --output=./src/ABI/types --name=uniswap-pair-v2 --provider=ethers_v5", "gen-uniswap-quoter-v3-abi": "abi-types-generator ./src/ABI/uniswap-quoter-v3.json --output=./src/ABI/types --name=uniswap-quoter-v3 --provider=ethers_v5", "gen-all-contract-types": "npm run gen-erc20-abi && npm run gen-uniswap-router-v2-abi && npm run gen-uniswap-factory-v2-abi && npm run gen-uniswap-pair-v2-abi && npm run gen-uniswap-factory-v3-abi && npm run gen-uniswap-router-v3-abi && npm run gen-uniswap-quoter-v3-abi", - "prepublishOnly": "tsc" + "prepublishOnly": "npm run build" }, "repository": { "type": "git", @@ -33,7 +38,7 @@ "dependencies": { "bignumber.js": "^9.0.1", "ethereum-abi-types-generator": "^1.1.6", - "ethereum-multicall": "^2.4.0", + "ethereum-multicall": "^2.7.0", "ethers": "^5.0.26", "rxjs": "^6.6.3" }, diff --git a/src/ABI/types/erc20-contract.ts b/src/ABI/types/erc20-contract.ts index dddc816e..0b868fa7 100644 --- a/src/ABI/types/erc20-contract.ts +++ b/src/ABI/types/erc20-contract.ts @@ -1,11 +1,5 @@ -import { - ContractTransaction, - ContractInterface, - BytesLike as Arrayish, - BigNumber, - BigNumberish, -} from 'ethers'; import { EthersContractContextV5 } from 'ethereum-abi-types-generator'; +import { BigNumber, BigNumberish, ContractTransaction } from 'ethers'; export type ContractContext = EthersContractContextV5< Erc20Contract, diff --git a/src/ABI/types/uniswap-factory-v2.ts b/src/ABI/types/uniswap-factory-v2.ts index 012bd97a..03f7395b 100644 --- a/src/ABI/types/uniswap-factory-v2.ts +++ b/src/ABI/types/uniswap-factory-v2.ts @@ -1,11 +1,5 @@ -import { - ContractTransaction, - ContractInterface, - BytesLike as Arrayish, - BigNumber, - BigNumberish, -} from 'ethers'; import { EthersContractContextV5 } from 'ethereum-abi-types-generator'; +import { BigNumber, BigNumberish, ContractTransaction } from 'ethers'; export type ContractContext = EthersContractContextV5< UniswapFactoryV2, diff --git a/src/ABI/types/uniswap-factory-v3.ts b/src/ABI/types/uniswap-factory-v3.ts index 45d966db..ba4a58c3 100644 --- a/src/ABI/types/uniswap-factory-v3.ts +++ b/src/ABI/types/uniswap-factory-v3.ts @@ -1,11 +1,5 @@ -import { - ContractTransaction, - ContractInterface, - BytesLike as Arrayish, - BigNumber, - BigNumberish, -} from 'ethers'; import { EthersContractContextV5 } from 'ethereum-abi-types-generator'; +import { BigNumber, BigNumberish, ContractTransaction } from 'ethers'; export type ContractContext = EthersContractContextV5< UniswapFactoryV3, diff --git a/src/ABI/types/uniswap-pair-v2.ts b/src/ABI/types/uniswap-pair-v2.ts index d8311e6c..5d0cf827 100644 --- a/src/ABI/types/uniswap-pair-v2.ts +++ b/src/ABI/types/uniswap-pair-v2.ts @@ -1,11 +1,5 @@ -import { - ContractTransaction, - ContractInterface, - BytesLike as Arrayish, - BigNumber, - BigNumberish, -} from 'ethers'; import { EthersContractContextV5 } from 'ethereum-abi-types-generator'; +import { BigNumber, BigNumberish, ContractTransaction } from 'ethers'; export type ContractContext = EthersContractContextV5< UniswapPairV2, diff --git a/src/ABI/types/uniswap-quoter-v3.ts b/src/ABI/types/uniswap-quoter-v3.ts index 4633f554..3ebf9c54 100644 --- a/src/ABI/types/uniswap-quoter-v3.ts +++ b/src/ABI/types/uniswap-quoter-v3.ts @@ -1,11 +1,10 @@ +import { EthersContractContextV5 } from 'ethereum-abi-types-generator'; import { - ContractTransaction, - ContractInterface, - BytesLike as Arrayish, BigNumber, BigNumberish, + BytesLike as Arrayish, + ContractTransaction, } from 'ethers'; -import { EthersContractContextV5 } from 'ethereum-abi-types-generator'; export type ContractContext = EthersContractContextV5< UniswapQuoterV3, diff --git a/src/ABI/types/uniswap-router-v2.ts b/src/ABI/types/uniswap-router-v2.ts index 1c3be684..6eae2cfc 100644 --- a/src/ABI/types/uniswap-router-v2.ts +++ b/src/ABI/types/uniswap-router-v2.ts @@ -1,11 +1,10 @@ +import { EthersContractContextV5 } from 'ethereum-abi-types-generator'; import { - ContractTransaction, - ContractInterface, - BytesLike as Arrayish, BigNumber, BigNumberish, + BytesLike as Arrayish, + ContractTransaction, } from 'ethers'; -import { EthersContractContextV5 } from 'ethereum-abi-types-generator'; export type ContractContext = EthersContractContextV5< UniswapRouterV2, diff --git a/src/ABI/types/uniswap-router-v3.ts b/src/ABI/types/uniswap-router-v3.ts index c0051532..9c434a6f 100644 --- a/src/ABI/types/uniswap-router-v3.ts +++ b/src/ABI/types/uniswap-router-v3.ts @@ -1,11 +1,10 @@ +import { EthersContractContextV5 } from 'ethereum-abi-types-generator'; import { - ContractTransaction, - ContractInterface, - BytesLike as Arrayish, BigNumber, BigNumberish, + BytesLike as Arrayish, + ContractTransaction, } from 'ethers'; -import { EthersContractContextV5 } from 'ethereum-abi-types-generator'; export type ContractContext = EthersContractContextV5< UniswapRouterV3, diff --git a/src/__TEST-SCRIPT__/playground.ts b/src/__TEST-SCRIPT__/playground.ts index 4fd4c0bb..6645d87f 100644 --- a/src/__TEST-SCRIPT__/playground.ts +++ b/src/__TEST-SCRIPT__/playground.ts @@ -1,8 +1,8 @@ -import { ETH, EthersProvider, TradeDirection } from '..'; import { ChainId } from '../enums/chain-id'; import { UniswapVersion } from '../enums/uniswap-version'; import { UniswapPairSettings } from '../factories/pair/models/uniswap-pair-settings'; import { UniswapPair } from '../factories/pair/uniswap-pair'; +import { ETH, EthersProvider, TradeDirection } from '../index'; // WBTC - 0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599 // FUN - 0x419D0d8BdD9aF5e606Ae2232ed285Aff190E711b diff --git a/src/factories/pair/uniswap-pair.factory.ts b/src/factories/pair/uniswap-pair.factory.ts index 8729fb0c..cd602f50 100644 --- a/src/factories/pair/uniswap-pair.factory.ts +++ b/src/factories/pair/uniswap-pair.factory.ts @@ -1185,7 +1185,7 @@ export class UniswapPairFactory { 'block', async (block: number) => { console.log('block', block); - await this.handleNewBlock(block); + await this.handleNewBlock(); } ); this._watchingBlocks = true; @@ -1205,7 +1205,7 @@ export class UniswapPairFactory { /** * Handle new block for the trade price moving automatically emitting the stream if it changes */ - private async handleNewBlock(block: number): Promise { + private async handleNewBlock(): Promise { if (this._quoteChanged$.observers.length > 0 && this._currentTradeContext) { const trade = await this.executeTradePath( new BigNumber(this._currentTradeContext.baseConvertRequest), diff --git a/tsconfig.json b/tsconfig.json index 142eef96..cbdf1f1d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,71 +1,26 @@ { "compilerOptions": { - /* Visit https://aka.ms/tsconfig.json to read more about this file */ - - /* Basic Options */ - // "incremental": true, /* Enable incremental compilation */ - "target": "es2015" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */, - "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */, - // "lib": [], /* Specify library files to be included in the compilation. */ - // "allowJs": true, /* Allow javascript files to be compiled. */ - // "checkJs": true, /* Report errors in .js files. */ - // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ - "declaration": true /* Generates corresponding '.d.ts' file. */, - // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ - // "sourceMap": true, /* Generates corresponding '.map' file. */ - // "outFile": "./", /* Concatenate and emit output to single file. */ - "outDir": "./dist" /* Redirect output structure to the directory. */, - "rootDir": "./src" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */, - // "composite": true, /* Enable project compilation */ - // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ - // "removeComments": true, /* Do not emit comments to output. */ - // "noEmit": true, /* Do not emit outputs. */ - // "importHelpers": true, /* Import emit helpers from 'tslib'. */ - // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ - // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ - - /* Strict Type-Checking Options */ - "strict": true /* Enable all strict type-checking options. */, - // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* Enable strict null checks. */ - // "strictFunctionTypes": true, /* Enable strict checking of function types. */ - // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ - // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ - // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ - // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ - - /* Additional Checks */ - // "noUnusedLocals": true, /* Report errors on unused locals. */ - // "noUnusedParameters": true, /* Report errors on unused parameters. */ - // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ - // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ - // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ - - /* Module Resolution Options */ - // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ - // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ - // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ - // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ - // "typeRoots": [], /* List of folders to include type definitions from. */ - // "types": [], /* Type declaration files to be included in compilation. */ - // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ - "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */, - // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - - /* Source Map Options */ - // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ - // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ - - /* Experimental Options */ - // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ - // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ - + "target": "es5", + "lib": ["es6", "dom", "es2016", "es2017"], + "module": "esnext", + "declaration": true, + "outDir": "./dist/esm", + "rootDir": "./src", + "strict": true, + "moduleResolution": "node", + "noUnusedLocals": true, + "noUnusedParameters": true, + "esModuleInterop": true, + "noImplicitReturns": true, + "noImplicitThis": true, + "noImplicitAny": true, + "strictNullChecks": true, + "suppressImplicitAnyIndexErrors": true, + "allowSyntheticDefaultImports": true, + "sourceMap": false, /* Advanced Options */ - "skipLibCheck": true /* Skip type checking of declaration files. */, - "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true, "resolveJsonModule": true }, "include": ["src/ABI/**/*.json", "src/**/*"],