From da67332e5ffb14d6e2617497c36ea6e14c1246e0 Mon Sep 17 00:00:00 2001 From: Aleksandr Kraiz Date: Sun, 29 May 2022 19:17:56 +0400 Subject: [PATCH] Bump contracts --- package-lock.json | 18 +++++++------- package.json | 7 +++--- src/BalanceGuard.ts | 2 +- src/OrionUnit/Exchange/deposit.ts | 2 +- src/OrionUnit/Exchange/swapMarket.ts | 2 +- src/OrionUnit/Exchange/withdraw.ts | 2 +- src/OrionUnit/FarmingManager/index.ts | 2 +- src/entities/Exchange.ts | 4 +-- src/utils/checkIsToken.ts | 2 +- src/utils/getBalance.ts | 3 +-- src/utils/getBalances.ts | 2 +- tsconfig.json | 2 +- webpack.config.js | 36 ++++++++++----------------- 13 files changed, 37 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfca9b2..a2be9bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,18 @@ { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.4", + "version": "0.10.4-rc.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.4", + "version": "0.10.4-rc.6", "license": "ISC", "dependencies": { "@ethersproject/abstract-signer": "^5.6.0", "@ethersproject/providers": "^5.6.2", "@lukeed/csprng": "^1.0.1", - "@orionprotocol/contracts": "0.0.7", + "@orionprotocol/contracts": "0.0.8", "bignumber.js": "^9.0.2", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", @@ -2486,9 +2486,9 @@ } }, "node_modules/@orionprotocol/contracts": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-0.0.7.tgz", - "integrity": "sha512-v8+3gff6LdqSzJTkNyw422N8memes+yrgss4Sc6KcNBPyqqjm0apiS3wpKKVpJSsZekWrVferiTPuiwLhiVo1Q==" + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-0.0.8.tgz", + "integrity": "sha512-dgfowYXTf2nu/o9wcQbnLZg+kF7mJusP62unGSxhRKjquVrF1qids+lpSyjvbA9KT/XYKbXg61tXOZ9pOdrBTw==" }, "node_modules/@sinonjs/commons": { "version": "1.8.3", @@ -12342,9 +12342,9 @@ } }, "@orionprotocol/contracts": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-0.0.7.tgz", - "integrity": "sha512-v8+3gff6LdqSzJTkNyw422N8memes+yrgss4Sc6KcNBPyqqjm0apiS3wpKKVpJSsZekWrVferiTPuiwLhiVo1Q==" + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-0.0.8.tgz", + "integrity": "sha512-dgfowYXTf2nu/o9wcQbnLZg+kF7mJusP62unGSxhRKjquVrF1qids+lpSyjvbA9KT/XYKbXg61tXOZ9pOdrBTw==" }, "@sinonjs/commons": { "version": "1.8.3", diff --git a/package.json b/package.json index a622f36..73940a6 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.6", + "version": "0.10.4-rc.7", "description": "Orion Protocol SDK", "main": "./lib/esm/index.js", "module": "./lib/esm/index.js", - "types": "./lib/esm/types.d.ts", + "types": "./lib/esm/index.d.ts", "scripts": { "start": "npm run build && node lib/esm/index.js", "develop": "concurrently -i -k -p \"[{name}]\" -n \"Node,TypeScript\" -c \"yellow.bold,cyan.bold\" \"yarn watch-js\" \"yarn watch-ts\"", @@ -12,6 +12,7 @@ "watch-ts": "tsc -w --skipLibCheck", "watch-js": "nodemon lib/esm/index.js", "prepare": "npm run build", + "prebuild": "tsc", "build": "webpack", "test": "exit 0", "coverage": "jest --coverage", @@ -59,7 +60,7 @@ "@ethersproject/abstract-signer": "^5.6.0", "@ethersproject/providers": "^5.6.2", "@lukeed/csprng": "^1.0.1", - "@orionprotocol/contracts": "0.0.7", + "@orionprotocol/contracts": "0.0.8", "bignumber.js": "^9.0.2", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", diff --git a/src/BalanceGuard.ts b/src/BalanceGuard.ts index 9bf5bac..400886c 100644 --- a/src/BalanceGuard.ts +++ b/src/BalanceGuard.ts @@ -1,7 +1,7 @@ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; import clone from 'just-clone'; -import { ERC20__factory } from '@orionprotocol/contracts/ethers'; +import { ERC20__factory } from '@orionprotocol/contracts'; import { utils } from '.'; import { APPROVE_ERC20_GAS_LIMIT, NATIVE_CURRENCY_PRECISION } from './constants'; import { diff --git a/src/OrionUnit/Exchange/deposit.ts b/src/OrionUnit/Exchange/deposit.ts index 9795c61..6381eb7 100644 --- a/src/OrionUnit/Exchange/deposit.ts +++ b/src/OrionUnit/Exchange/deposit.ts @@ -1,7 +1,7 @@ /* eslint-disable max-len */ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; -import { Exchange__factory } from '@orionprotocol/contracts/ethers'; +import { Exchange__factory } from '@orionprotocol/contracts'; import getBalances from '../../utils/getBalances'; import BalanceGuard from '../../BalanceGuard'; import OrionUnit from '..'; diff --git a/src/OrionUnit/Exchange/swapMarket.ts b/src/OrionUnit/Exchange/swapMarket.ts index a858697..26e0d0a 100644 --- a/src/OrionUnit/Exchange/swapMarket.ts +++ b/src/OrionUnit/Exchange/swapMarket.ts @@ -2,7 +2,7 @@ /* eslint-disable max-len */ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; -import { Exchange__factory } from '@orionprotocol/contracts/ethers'; +import { Exchange__factory } from '@orionprotocol/contracts'; import getBalances from '../../utils/getBalances'; import BalanceGuard from '../../BalanceGuard'; import getAvailableSources from '../../utils/getAvailableFundsSources'; diff --git a/src/OrionUnit/Exchange/withdraw.ts b/src/OrionUnit/Exchange/withdraw.ts index 1c34bc0..0edeaad 100644 --- a/src/OrionUnit/Exchange/withdraw.ts +++ b/src/OrionUnit/Exchange/withdraw.ts @@ -1,7 +1,7 @@ /* eslint-disable max-len */ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; -import { Exchange__factory } from '@orionprotocol/contracts/ethers'; +import { Exchange__factory } from '@orionprotocol/contracts'; import getBalances from '../../utils/getBalances'; import BalanceGuard from '../../BalanceGuard'; import OrionUnit from '..'; diff --git a/src/OrionUnit/FarmingManager/index.ts b/src/OrionUnit/FarmingManager/index.ts index 5c4c0d6..506c1cc 100644 --- a/src/OrionUnit/FarmingManager/index.ts +++ b/src/OrionUnit/FarmingManager/index.ts @@ -1,4 +1,4 @@ -import { Exchange__factory, IUniswapV2Pair__factory, IUniswapV2Router__factory } from '@orionprotocol/contracts/ethers'; +import { Exchange__factory, IUniswapV2Pair__factory, IUniswapV2Router__factory } from '@orionprotocol/contracts'; import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; import OrionUnit from '..'; diff --git a/src/entities/Exchange.ts b/src/entities/Exchange.ts index 8ca9e06..f7e9ddd 100644 --- a/src/entities/Exchange.ts +++ b/src/entities/Exchange.ts @@ -3,8 +3,8 @@ import { Provider } from '@ethersproject/providers'; import { Exchange as ExchangeContract, Exchange__factory as ExchangeContract__factory, -} from '@orionprotocol/contracts/ethers'; -import { LibAtomic } from '@orionprotocol/contracts/ethers/Exchange'; +} from '@orionprotocol/contracts'; +import { LibAtomic } from '@orionprotocol/contracts/lib/ethers/Exchange'; import { BytesLike, ethers, Signer } from 'ethers'; import { DEPOSIT_ERC20_GAS_LIMIT, DEPOSIT_ETH_GAS_LIMIT, LOCKATOMIC_GAS_LIMIT, diff --git a/src/utils/checkIsToken.ts b/src/utils/checkIsToken.ts index b9b4822..43aa6c3 100644 --- a/src/utils/checkIsToken.ts +++ b/src/utils/checkIsToken.ts @@ -1,5 +1,5 @@ /* eslint-disable camelcase */ -import { ERC20__factory } from '@orionprotocol/contracts/ethers'; +import { ERC20__factory } from '@orionprotocol/contracts'; import { ethers } from 'ethers'; import invariant from 'tiny-invariant'; diff --git a/src/utils/getBalance.ts b/src/utils/getBalance.ts index 033fbe6..eb8f0fd 100644 --- a/src/utils/getBalance.ts +++ b/src/utils/getBalance.ts @@ -1,5 +1,4 @@ -import { ERC20__factory } from '@orionprotocol/contracts/ethers'; -import type { Exchange } from '@orionprotocol/contracts/ethers'; +import { ERC20__factory, Exchange } from '@orionprotocol/contracts'; import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; diff --git a/src/utils/getBalances.ts b/src/utils/getBalances.ts index 1f3964f..98ddce8 100644 --- a/src/utils/getBalances.ts +++ b/src/utils/getBalances.ts @@ -1,4 +1,4 @@ -import type { Exchange } from '@orionprotocol/contracts/ethers'; +import { Exchange } from '@orionprotocol/contracts'; import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; import { OrionAggregator } from '../services/OrionAggregator'; diff --git a/tsconfig.json b/tsconfig.json index b8c1b12..6d741f5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -55,7 +55,7 @@ // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ "sourceMap": true, /* Create source map files for emitted JavaScript files. */ // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./lib", /* Specify an output folder for all emitted files. */ + "outDir": "./lib/esm", /* Specify an output folder for all emitted files. */ // "removeComments": true, /* Disable emitting comments. */ // "noEmit": true, /* Disable emitting files from a compilation. */ // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ diff --git a/webpack.config.js b/webpack.config.js index e4e2309..715cd18 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,35 +3,25 @@ const path = require("path"); module.exports = (env, argv) => { return { mode: "production", - entry: './src/index.ts', - // devtool: 'inline-source-map', - module: { - rules: [ - { - test: /\.ts$/, - use: [{ - loader: 'ts-loader', - options: { allowTsInNodeModules: true } - }] - }, - ], + entry: { + index: path.resolve(__dirname, "./lib/esm/index.js") }, output: { - path: path.resolve(__dirname, "lib"), // builds to ./lib + path: path.resolve(__dirname, "./lib/umd"), // builds to ./lib/umd/ filename: "[name].js", // index.js - library: { - name: 'orionprotocol', // aka window.myLibrary - type: 'umd', // supports commonjs, amd and web browsers - }, + library: "orionprotocol", // aka window.myLibrary + libraryTarget: "umd", // supports commonjs, amd and web browsers globalObject: "this" }, + module: { + rules: [{ test: /\.t|js$/, use: "babel-loader" }] + }, resolve: { - extensions: ['.ts', '.js'], - // fallback: { - // "crypto": require.resolve("crypto-browserify"), - // "buffer": require.resolve("buffer/"), - // "stream": require.resolve("stream-browserify"), - // } + fallback: { + "crypto": require.resolve("crypto-browserify"), + "buffer": require.resolve("buffer/"), + "stream": require.resolve("stream-browserify"), + } } }; }; \ No newline at end of file