From 6f09ac86b1d7bba79d08810464249bceac1da570 Mon Sep 17 00:00:00 2001 From: Theo Date: Wed, 13 Sep 2023 22:56:32 -0700 Subject: [PATCH] Use self-hosted dependecies & set package in Tornado scope --- .npmrc | 1 + index.d.ts | 2 +- package.json | 9 +++------ src/TxManager.js | 2 +- test/TxManager.test.js | 14 -------------- yarn.lock | 29 +++++++++++++++++++++-------- 6 files changed, 27 insertions(+), 30 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..05ba80e --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +@tornado:registry=https://git.tornado.ws/api/packages/tornado-packages/npm/ \ No newline at end of file diff --git a/index.d.ts b/index.d.ts index e603ac6..60e4466 100644 --- a/index.d.ts +++ b/index.d.ts @@ -2,7 +2,7 @@ import { BigNumberish, providers, Wallet } from 'ethers' import { EventEmitter } from 'eventemitter3' import { TransactionReceipt } from '@ethersproject/abstract-provider' import PromiEvent from 'web3-core-promievent' -import { GasOracleOptions, GasPriceOracle } from 'gas-price-oracle' +import { GasOracleOptions, GasPriceOracle } from '@tornado/gas-price-oracle' import { Mutex } from 'async-mutex' import { Provider } from '@ethersproject/providers' diff --git a/package.json b/package.json index 4eed9d1..a569a00 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "tx-manager", + "name": "@tornado/tx-manager", "version": "0.4.9", "description": "", "main": "index.js", @@ -17,18 +17,15 @@ "keywords": [], "author": "Roman Semenov ", "license": "ISC", - "repository": { - "type": "git", - "url": "git://github.com/tornadocash/tx-manager.git" - }, + "repository": "https://git.tornado.ws/tornado-packages/tx-manager.git", "files": [ "src/*", "index.d.ts" ], "dependencies": { + "@tornado/gas-price-oracle": "^0.5.3", "async-mutex": "^0.2.4", "ethers": "^5.4.6", - "gas-price-oracle": "^0.5.0", "web3-core-promievent": "^1.3.0" }, "devDependencies": { diff --git a/src/TxManager.js b/src/TxManager.js index bb796dd..9948bc4 100644 --- a/src/TxManager.js +++ b/src/TxManager.js @@ -1,6 +1,6 @@ const ethers = require('ethers') const { Mutex } = require('async-mutex') -const { GasPriceOracle } = require('gas-price-oracle') +const { GasPriceOracle } = require('@tornado/gas-price-oracle') const Transaction = require('./Transaction') const defaultConfig = { diff --git a/test/TxManager.test.js b/test/TxManager.test.js index 9003537..a70df69 100644 --- a/test/TxManager.test.js +++ b/test/TxManager.test.js @@ -161,20 +161,6 @@ describe('TxManager.EtherscanProvider', () => { describe('#transaction', transactionTests) }) -describe('TxManager.AlchemyProvider', () => { - before(async () => { - const { - network: { name, chainId }, - options, - } = await getOptions() - options.chainId = chainId - options.provider = new providers.AlchemyProvider(chainId, process.env.ALCHEMY_API_KEY) - console.log('AlchemyProvider\n\n', 'network', { name, chainId }, '\n\n') - this.manager = new TxManager(options) - }) - describe('#transaction', transactionTests) -}) - describe('TxManager.InfuraProvider', () => { before(async () => { const { diff --git a/yarn.lock b/yarn.lock index 4912ef7..1b29a2d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -408,6 +408,15 @@ dependencies: defer-to-connect "^1.0.1" +"@tornado/gas-price-oracle@^0.5.3": + version "0.5.3" + resolved "https://git.tornado.ws/api/packages/tornado-packages/npm/%40tornado%2Fgas-price-oracle/-/0.5.3/gas-price-oracle-0.5.3.tgz#fb5423dddee2f52edbc16174c5ddce90bea5413d" + integrity sha512-LpVfPiPIz3FOmJdiqJf/yoeO5n9/Pd5jgtdY+6hB9lNW0AiWhylhpScojICViS+3OL9QC8CoTlgr+kbfGeO9pQ== + dependencies: + axios "^0.21.2" + bignumber.js "^9.0.0" + node-cache "^5.1.2" + "@types/bn.js@^5.1.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.0.tgz#32c5d271503a12653c62cf4d2b45e6eab8cebc68" @@ -960,6 +969,11 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +clone@2.x: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -1912,14 +1926,6 @@ functions-have-names@^1.2.2: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -gas-price-oracle@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/gas-price-oracle/-/gas-price-oracle-0.5.0.tgz#b29f83c97bb4b091a08da7c10e2d1e5888bbade4" - integrity sha512-um0cmd9qxGkDHirV1HcrjQ4vedVxK7u+uMeJIjo2yUMYe6T46ihbMnRncF5tfP9deU5hPHJ8FvVRZY1Y/CKkLQ== - dependencies: - axios "^0.21.2" - bignumber.js "^9.0.0" - get-caller-file@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -2871,6 +2877,13 @@ node-addon-api@^2.0.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32" integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA== +node-cache@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-5.1.2.tgz#f264dc2ccad0a780e76253a694e9fd0ed19c398d" + integrity sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg== + dependencies: + clone "2.x" + node-gyp-build@^4.2.0, node-gyp-build@^4.3.0: version "4.4.0" resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.4.0.tgz#42e99687ce87ddeaf3a10b99dc06abc11021f3f4"