From 5840fc59f7db7f2f8859ef520e378dd4bb632725 Mon Sep 17 00:00:00 2001 From: John Grant Date: Fri, 28 Jul 2023 09:44:54 +0100 Subject: [PATCH] Revert "Bump path-parse from 1.0.6 to 1.0.7" --- .github/workflows/checks.yaml | 9 ++--- README.md | 41 +-------------------- package.json | 4 +- src/index.ts | 9 ----- test/ComposableStable.integration.spec.ts | 2 +- test/MetaStable.integration.spec.ts | 2 +- test/PhantomStable.integration.spec.ts | 2 +- test/boostedPaths.spec.ts | 4 +- test/elementPools.spec.ts | 4 +- test/elementTrades.spec.ts | 4 +- test/fullSwaps.spec.ts | 4 +- test/gyro2Pool.spec.ts | 4 +- test/gyroEV2.integration.spec.ts | 2 +- test/helpers.spec.ts | 4 +- test/lbp.spec.ts | 4 +- test/lido.spec.ts | 4 +- test/linear.spec.ts | 4 +- test/metaStablePools.spec.ts | 4 +- test/phantomStablePools.spec.ts | 4 +- test/stable.integration.spec.ts | 2 +- test/stablePools.spec.ts | 4 +- test/testScripts/constants.ts | 12 +++--- test/testScripts/swapExample.ts | 2 +- test/v1-v2-compare-testPools.spec.ts | 4 +- test/weighted.integration.spec.ts | 2 +- test/weightedPools.spec.ts | 4 +- test/wrapper.spec.ts | 4 +- test/xaveFxPool.integration.spec.ts | 2 +- test/xaveFxPool.polygon.integration.spec.ts | 2 +- test/xaveFxPool.wStable.integration.spec.ts | 2 +- yarn.lock | 36 +++++++++--------- 31 files changed, 85 insertions(+), 106 deletions(-) diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 4d19651c..f293852d 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -63,13 +63,10 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' - name: Compile run: yarn build - - name: Run mainnet node in background for integration tests - run: npx hardhat --tsconfig tsconfig.testing.json node --hostname 127.0.0.1 --fork ${{ secrets.RPC_URL_MAINNET }} & - - name: Run Polygon node in background for integration tests - run: npx hardhat --tsconfig tsconfig.testing.json --config hardhat.config.polygon.ts node --hostname 127.0.0.1 --fork ${{ secrets.RPC_URL_POLYGON }} --port 8137 & + - name: Run node in background for integration tests + run: npx hardhat --tsconfig tsconfig.testing.json node --hostname 127.0.0.1 --fork https://mainnet.infura.io/v3/${{ secrets.INFURA }} & - name: Test run: yarn test env: CI: true - RPC_URL_MAINNET: ${{ secrets.RPC_URL_MAINNET }} - RPC_URL_POLYGON: ${{ secrets.RPC_URL_POLYGON }} + INFURA: ${{ secrets.INFURA }} diff --git a/README.md b/README.md index 2766c945..05e63a83 100644 --- a/README.md +++ b/README.md @@ -31,51 +31,12 @@ The example file `swapExample.ts` in: [./testScripts](test/testScripts/), demons To Run: -Create a .env file in root dir. Depending on network being used add an RPC URL (e.g. Alchemy, Infura), e.g.: `RPC_URL_MAINNET=alchemy/infura` - -Supported networks out of box for example are: - -``` -RPC_URL_MAINNET -RPC_URL_POLYGON -RPC_URL_ARBITRUM -RPC_URL_GNOSIS -RPC_URL_ZKEVM -RPC_URL_GOERLI -``` +Create a .env file in root dir with your infura provider key: `INFURA=your_key` Install dependencies: `$ yarn install` Run example: `$ ts-node ./test/testScripts/swapExample.ts` -## Contributing/Adding New Pools - -Running tests locally: - -1. Add .env and add following RPC URLs (e.g. Alchemy, Infura) - -``` -RPC_URL_MAINNET= -RPC_URL_POLYGON= -``` - -2. Start local forked nodes to test against: - -`$ yarn run node` - -`$ yarn run node:polygon` - -3. Run tests: - `$ yarn test` - -To run a single test file use `test:only`, e.g.: - -`$ yarn test:only test/composableStable.integration.spec.ts` - -Adding New Pools: - -See info [here](https://www.notion.so/SOR-Adding-New-Pools-fa073ec6fecb4c22b1ba13504b04f5bf?pvs=4) - ## Environment Variables Optional config values can be set in the .env file: diff --git a/package.json b/package.json index 2bbb1337..02a159cc 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "example": "TS_NODE_PROJECT='tsconfig.testing.json' ts-node", "coverage": "nyc report --reporter=text-lcov | coveralls", "lint": "eslint ./src ./test --ext .ts --max-warnings 0", - "node": "npx hardhat node --tsconfig tsconfig.testing.json --fork $(. ./.env && echo $RPC_URL_MAINNET)", - "node:polygon": "npx hardhat --tsconfig tsconfig.testing.json --config hardhat.config.polygon.ts node --fork $(. ./.env && echo $RPC_URL_POLYGON) --port 8137" + "node": "npx hardhat node --tsconfig tsconfig.testing.json --fork $(. ./.env && echo $ALCHEMY_URL)", + "node:polygon": "npx hardhat --tsconfig tsconfig.testing.json --config hardhat.config.polygon.ts node --fork $(. ./.env && echo $ALCHEMY_URL_POLYGON) --port 8137" }, "husky": { "hooks": { diff --git a/src/index.ts b/src/index.ts index c6e50400..e00a4246 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,6 @@ export { SOR } from './wrapper'; export { BPTForTokensZeroPriceImpact as weightedBPTForTokensZeroPriceImpact } from './frontendHelpers/weightedHelpers'; export { BPTForTokensZeroPriceImpact as stableBPTForTokensZeroPriceImpact } from './frontendHelpers/stableHelpers'; export * from './types'; -export { safeParseFixed } from './utils'; export { formatSequence, getTokenAddressesForSwap } from './formatSwaps'; export { RouteProposer } from './routeProposal'; export { parseToPoolsDict } from './routeProposal/filtering'; @@ -13,10 +12,6 @@ export { MetaStablePool } from './pools/metaStablePool/metaStablePool'; export { PhantomStablePool } from './pools/phantomStablePool/phantomStablePool'; export { ComposableStablePool } from './pools/composableStable/composableStablePool'; export { LinearPool } from './pools/linearPool/linearPool'; -export { Gyro2Pool } from './pools/gyro2Pool/gyro2Pool'; -export { Gyro3Pool } from './pools/gyro3Pool/gyro3Pool'; -export { GyroEV2Pool } from './pools/gyroEV2Pool/gyroEV2Pool'; -export { FxPool } from './pools/xaveFxPool/fxPool'; export { getSpotPriceAfterSwapForPath } from './router/helpersClass'; export * as WeightedMaths from './pools/weightedPool/weightedMath'; export * as StableMaths from './pools/stablePool/stableMath'; @@ -24,14 +19,10 @@ export * as StableMathBigInt from './pools/stablePool/stableMathBigInt'; export * as Gyro2Maths from './pools/gyro2Pool/gyro2Math'; export * as Gyro3Maths from './pools/gyro3Pool/gyro3Math'; export * as GyroEMaths from './pools/gyroEPool/gyroEMath/gyroEMath'; -export * as FxMaths from './pools/xaveFxPool/fxPoolMath'; export { balancesFromTokenInOut, GyroEParams, DerivedGyroEParams, Vector2, } from './pools/gyroEPool/gyroEMath/gyroEMathHelpers'; -export * as GyroEMathFunctions from './pools/gyroEPool/gyroEMath/gyroEMathFunctions'; -export * as GyroHelpersSignedFixedPoint from './pools/gyroHelpers/gyroSignedFixedPoint'; -export * as GyroHelpers from './pools/gyroHelpers/helpers'; export * as LinearMaths from './pools/linearPool/linearMath'; diff --git a/test/ComposableStable.integration.spec.ts b/test/ComposableStable.integration.spec.ts index ec4ad5e4..bc265939 100644 --- a/test/ComposableStable.integration.spec.ts +++ b/test/ComposableStable.integration.spec.ts @@ -17,7 +17,7 @@ dotenv.config(); let sor: SOR; const networkId = Network.MAINNET; -const jsonRpcUrl = process.env.RPC_URL_MAINNET; +const jsonRpcUrl = 'https://mainnet.infura.io/v3/' + process.env.INFURA; const rpcUrl = 'http://127.0.0.1:8545'; const blockNumber = 16990000; const provider = new JsonRpcProvider(rpcUrl, networkId); diff --git a/test/MetaStable.integration.spec.ts b/test/MetaStable.integration.spec.ts index 008b741f..1b7b5c48 100644 --- a/test/MetaStable.integration.spec.ts +++ b/test/MetaStable.integration.spec.ts @@ -42,7 +42,7 @@ const testPool: SubgraphPoolBase = { }; const networkId = Network.MAINNET; -const jsonRpcUrl = process.env.RPC_URL_MAINNET; +const jsonRpcUrl = 'https://mainnet.infura.io/v3/' + process.env.INFURA; const rpcUrl = 'http://127.0.0.1:8545'; const blockNumber = 16447247; const provider = new JsonRpcProvider(rpcUrl, networkId); diff --git a/test/PhantomStable.integration.spec.ts b/test/PhantomStable.integration.spec.ts index cf5bdb2d..8aef9d5c 100644 --- a/test/PhantomStable.integration.spec.ts +++ b/test/PhantomStable.integration.spec.ts @@ -15,7 +15,7 @@ dotenv.config(); let sor: SOR; const networkId = Network.MAINNET; -const jsonRpcUrl = process.env.RPC_URL_MAINNET; +const jsonRpcUrl = 'https://mainnet.infura.io/v3/' + process.env.INFURA; const rpcUrl = 'http://127.0.0.1:8545'; const blockNumber = 16447247; const provider = new JsonRpcProvider(rpcUrl, networkId); diff --git a/test/boostedPaths.spec.ts b/test/boostedPaths.spec.ts index 6e253dfd..7eeab324 100644 --- a/test/boostedPaths.spec.ts +++ b/test/boostedPaths.spec.ts @@ -606,7 +606,9 @@ export async function checkBestPath( const swapAmount = parseFixed(amount.toString(), tokenIn.decimals); const costOutputToken = BigNumber.from('0'); const gasPrice = BigNumber.from(`10000000000`); - const provider = new JsonRpcProvider(``); + const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` + ); const swapGas = BigNumber.from(`32500`); const swapInfo = await getFullSwap( cloneDeep(pools), diff --git a/test/elementPools.spec.ts b/test/elementPools.spec.ts index c735bae2..dcdfa7c1 100644 --- a/test/elementPools.spec.ts +++ b/test/elementPools.spec.ts @@ -23,7 +23,9 @@ import { MockPoolDataService } from './lib/mockPoolDataService'; const gasPrice = parseFixed('30', 9); const maxPools = 4; -const provider = new JsonRpcProvider(``); +const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` +); // npx mocha -r ts-node/register test/elementPools.spec.ts describe(`Tests for Element Pools.`, () => { diff --git a/test/elementTrades.spec.ts b/test/elementTrades.spec.ts index 08ef39cd..0ed993c5 100644 --- a/test/elementTrades.spec.ts +++ b/test/elementTrades.spec.ts @@ -23,7 +23,9 @@ import { parseFixed } from '@ethersproject/bignumber'; const gasPrice = parseFixed('30', 9); const maxPools = 4; -const provider = new JsonRpcProvider(``); +const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` +); interface TradeData { input: { diff --git a/test/fullSwaps.spec.ts b/test/fullSwaps.spec.ts index 38a2f787..d478dca9 100644 --- a/test/fullSwaps.spec.ts +++ b/test/fullSwaps.spec.ts @@ -19,7 +19,9 @@ const ANT = '0x960b236a07cf122663c4303350609a66a7b288c0'; // ANT lower case const MKR2 = '0xef13C0c8abcaf5767160018d268f9697aE4f5375'.toLowerCase(); const yUSD = '0xb2fdd60ad80ca7ba89b9bab3b5336c2601c020b4'; -const provider = new JsonRpcProvider(``); +const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` +); describe('Tests full swaps against known values', () => { const gasPrice = parseFixed('30', 9); diff --git a/test/gyro2Pool.spec.ts b/test/gyro2Pool.spec.ts index bbc8c216..1e91a31f 100644 --- a/test/gyro2Pool.spec.ts +++ b/test/gyro2Pool.spec.ts @@ -159,7 +159,9 @@ describe('Gyro2Pool tests USDC > DAI', () => { const gasPrice = parseFixed('30', 9); const maxPools = 4; - const provider = new JsonRpcProvider(``); + const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` + ); const sor = new SOR( provider, diff --git a/test/gyroEV2.integration.spec.ts b/test/gyroEV2.integration.spec.ts index 07191125..4626539d 100644 --- a/test/gyroEV2.integration.spec.ts +++ b/test/gyroEV2.integration.spec.ts @@ -12,7 +12,7 @@ import { setUp } from './testScripts/utils'; dotenv.config(); const networkId = Network.POLYGON; -const jsonRpcUrl = ''; +const jsonRpcUrl = 'https://polygon-mainnet.infura.io/v3/' + process.env.INFURA; const rpcUrl = 'http://127.0.0.1:8137'; const provider = new JsonRpcProvider(rpcUrl, networkId); const blocknumber = 42173266; diff --git a/test/helpers.spec.ts b/test/helpers.spec.ts index 32149f43..561a0210 100644 --- a/test/helpers.spec.ts +++ b/test/helpers.spec.ts @@ -14,7 +14,9 @@ import { BAL, DAI, GUSD, sorConfigEth, USDC, WETH } from './lib/constants'; const marketSp = '7'; -const provider = new JsonRpcProvider(process.env.RPC_URL_MAINNET); +const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` +); // TS_NODE_PROJECT='tsconfig.testing.json' npx mocha -r ts-node/register test/helpers.spec.ts describe(`Tests for Helpers.`, () => { diff --git a/test/lbp.spec.ts b/test/lbp.spec.ts index 4870fb5c..0f11365b 100644 --- a/test/lbp.spec.ts +++ b/test/lbp.spec.ts @@ -13,7 +13,9 @@ import { MockPoolDataService } from './lib/mockPoolDataService'; const gasPrice = parseFixed('30', 9); const maxPools = 4; -const provider = new JsonRpcProvider(``); +const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` +); // npx mocha -r ts-node/register test/lbp.spec.ts describe(`Tests for LBP Pools.`, () => { diff --git a/test/lido.spec.ts b/test/lido.spec.ts index 02a8ae06..7eff4c27 100644 --- a/test/lido.spec.ts +++ b/test/lido.spec.ts @@ -16,7 +16,9 @@ import { parseFixed } from '@ethersproject/bignumber'; const gasPrice = parseFixed('30', 9); const maxPools = 4; const chainId = 1; -const provider = new JsonRpcProvider(process.env.RPC_URL_MAINNET); +const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` +); const USDC = Lido.USDC[chainId]; const DAI = Lido.DAI[chainId]; const USDT = Lido.USDT[chainId]; diff --git a/test/linear.spec.ts b/test/linear.spec.ts index 5e6bfc5a..04b3af1d 100644 --- a/test/linear.spec.ts +++ b/test/linear.spec.ts @@ -900,7 +900,9 @@ export async function testFullSwap( // const costOutputToken = BigNumber.from('1000000000000000000'); const costOutputToken = BigNumber.from('0'); const gasPrice = BigNumber.from(`10000000000`); - const provider = new JsonRpcProvider(``); + const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` + ); const swapGas = BigNumber.from(`32500`); const swapInfo = await getFullSwap( diff --git a/test/metaStablePools.spec.ts b/test/metaStablePools.spec.ts index 9da55908..f0c09f07 100644 --- a/test/metaStablePools.spec.ts +++ b/test/metaStablePools.spec.ts @@ -25,7 +25,9 @@ import { MockPoolDataService } from './lib/mockPoolDataService'; const gasPrice = parseFixed('30', 9); const maxPools = 4; -const provider = new JsonRpcProvider(``); +const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` +); async function getStableComparrison( stablePools: SubgraphPoolBase[], diff --git a/test/phantomStablePools.spec.ts b/test/phantomStablePools.spec.ts index c3bc276e..10452663 100644 --- a/test/phantomStablePools.spec.ts +++ b/test/phantomStablePools.spec.ts @@ -238,7 +238,9 @@ async function testFullSwap( // const costOutputToken = BigNumber.from('1000000000000000000'); const costOutputToken = BigNumber.from('0'); const gasPrice = BigNumber.from(`10000000000`); - const provider = new JsonRpcProvider(``); + const provider = new JsonRpcProvider( + `https://kovan.infura.io/v3/${process.env.INFURA}` + ); const swapGas = BigNumber.from(`32500`); const swapInfo = await getFullSwap( diff --git a/test/stable.integration.spec.ts b/test/stable.integration.spec.ts index f239f8e9..858b85c0 100644 --- a/test/stable.integration.spec.ts +++ b/test/stable.integration.spec.ts @@ -50,7 +50,7 @@ const testPool: SubgraphPoolBase = { }; const networkId = Network.MAINNET; -const jsonRpcUrl = process.env.RPC_URL_MAINNET; +const jsonRpcUrl = 'https://mainnet.infura.io/v3/' + process.env.INFURA; const rpcUrl = 'http://127.0.0.1:8545'; const blockNumber = 16447247; const provider = new JsonRpcProvider(rpcUrl, networkId); diff --git a/test/stablePools.spec.ts b/test/stablePools.spec.ts index afd4d64f..0e0e422d 100644 --- a/test/stablePools.spec.ts +++ b/test/stablePools.spec.ts @@ -32,7 +32,9 @@ const multihopPoolsFromFile: { const gasPrice = parseFixed('30', 9); const maxPools = 4; -const provider = new JsonRpcProvider(``); +const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` +); describe(`Tests for Stable Pools.`, () => { context('limit amounts', () => { diff --git a/test/testScripts/constants.ts b/test/testScripts/constants.ts index ebe97f6b..aedee95a 100644 --- a/test/testScripts/constants.ts +++ b/test/testScripts/constants.ts @@ -128,12 +128,12 @@ export const SOR_CONFIG: Record = { }; export const PROVIDER_URLS = { - [Network.MAINNET]: process.env.RPC_URL_MAINNET, - [Network.GOERLI]: process.env.RPC_URL_GOERLI, - [Network.POLYGON]: process.env.RPC_URL_POLYGON, - [Network.ARBITRUM]: process.env.RPC_URL_ARBITRUM, - [Network.GNOSIS]: process.env.RPC_URL_GNOSIS, - [Network.ZKEVM]: process.env.RPC_URL_ZKEVM, + [Network.MAINNET]: `https://mainnet.infura.io/v3/${process.env.INFURA}`, + [Network.GOERLI]: `https://goerli.infura.io/v3/${process.env.INFURA}`, + [Network.POLYGON]: `https://polygon-mainnet.infura.io/v3/${process.env.INFURA}`, + [Network.ARBITRUM]: `https://arbitrum-mainnet.infura.io/v3/${process.env.INFURA}`, + [Network.GNOSIS]: `https://poa-xdai.gateway.pokt.network/v1/lb/91bc0e12a76e7a84dd76189d`, + [Network.ZKEVM]: `${process.env.RPC_URL_ZKEVM}`, }; export const MULTIADDR: { [chainId: number]: string } = { diff --git a/test/testScripts/swapExample.ts b/test/testScripts/swapExample.ts index 58d4d8b6..01450ec5 100644 --- a/test/testScripts/swapExample.ts +++ b/test/testScripts/swapExample.ts @@ -153,5 +153,5 @@ export async function swap(): Promise { } } -// $ TS_NODE_PROJECT='tsconfig.testing.json' npx ts-node ./test/testScripts/swapExample.ts +// $ TS_NODE_PROJECT='tsconfig.testing.json' ts-node ./test/testScripts/swapExample.ts swap(); diff --git a/test/v1-v2-compare-testPools.spec.ts b/test/v1-v2-compare-testPools.spec.ts index 3e4da3dc..6485d81b 100644 --- a/test/v1-v2-compare-testPools.spec.ts +++ b/test/v1-v2-compare-testPools.spec.ts @@ -2,7 +2,9 @@ import { JsonRpcProvider } from '@ethersproject/providers'; import { loadTestFile } from './lib/testHelpers'; import { compareTest } from './lib/compareHelper'; -const provider = new JsonRpcProvider(``); +const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` +); // This must be updated with pools of interest (see ./test/testData/testPools) const testFiles = [ diff --git a/test/weighted.integration.spec.ts b/test/weighted.integration.spec.ts index 2c43880c..af2cd181 100644 --- a/test/weighted.integration.spec.ts +++ b/test/weighted.integration.spec.ts @@ -51,7 +51,7 @@ const testPool: SubgraphPoolBase = { }; const networkId = Network.MAINNET; -const jsonRpcUrl = process.env.RPC_URL_MAINNET; +const jsonRpcUrl = 'https://mainnet.infura.io/v3/' + process.env.INFURA; const rpcUrl = 'http://127.0.0.1:8545'; const blockNumber = 16447247; const provider = new JsonRpcProvider(rpcUrl, networkId); diff --git a/test/weightedPools.spec.ts b/test/weightedPools.spec.ts index 1bf29cc0..a0a74245 100644 --- a/test/weightedPools.spec.ts +++ b/test/weightedPools.spec.ts @@ -218,7 +218,9 @@ async function getSwapInfo( swapAmount: BigNumber, useBpts?: boolean ) { - const provider = new JsonRpcProvider(``); + const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` + ); const maxPools = 4; const gasPrice = BigNumber.from('0'); const sor = new SOR( diff --git a/test/wrapper.spec.ts b/test/wrapper.spec.ts index 512882fb..0fc0318f 100644 --- a/test/wrapper.spec.ts +++ b/test/wrapper.spec.ts @@ -21,7 +21,9 @@ const subgraphPoolsSmallWithTrade: { // eslint-disable-next-line @typescript-eslint/no-var-requires } = require('./testData/testPools/subgraphPoolsSmallWithTrade.json'); -const provider = new JsonRpcProvider(``); +const provider = new JsonRpcProvider( + `https://mainnet.infura.io/v3/${process.env.INFURA}` +); const gasPrice = parseFixed('30', 9); const maxPools = 4; diff --git a/test/xaveFxPool.integration.spec.ts b/test/xaveFxPool.integration.spec.ts index 292ef018..0a259721 100644 --- a/test/xaveFxPool.integration.spec.ts +++ b/test/xaveFxPool.integration.spec.ts @@ -13,7 +13,7 @@ dotenv.config(); let sor: SOR; const networkId = Network.MAINNET; -const jsonRpcUrl = process.env.RPC_URL_MAINNET; +const jsonRpcUrl = 'https://mainnet.infura.io/v3/' + process.env.INFURA; const rpcUrl = 'http://127.0.0.1:8545'; const provider = new JsonRpcProvider(rpcUrl, networkId); const blocknumber = 16797531; diff --git a/test/xaveFxPool.polygon.integration.spec.ts b/test/xaveFxPool.polygon.integration.spec.ts index d247f4b8..552f222f 100644 --- a/test/xaveFxPool.polygon.integration.spec.ts +++ b/test/xaveFxPool.polygon.integration.spec.ts @@ -20,7 +20,7 @@ dotenv.config(); let sor: SOR; const networkId = Network.POLYGON; -const jsonRpcUrl = process.env.RPC_URL_POLYGON; +const jsonRpcUrl = 'https://polygon-mainnet.infura.io/v3/' + process.env.INFURA; const rpcUrl = 'http://127.0.0.1:8137'; const provider = new JsonRpcProvider(rpcUrl, networkId); const blocknumber = 43667355; diff --git a/test/xaveFxPool.wStable.integration.spec.ts b/test/xaveFxPool.wStable.integration.spec.ts index e9594488..85cd6276 100644 --- a/test/xaveFxPool.wStable.integration.spec.ts +++ b/test/xaveFxPool.wStable.integration.spec.ts @@ -15,7 +15,7 @@ dotenv.config(); let sor: SOR; const networkId = Network.MAINNET; -const jsonRpcUrl = process.env.RPC_URL_MAINNET; +const jsonRpcUrl = 'https://mainnet.infura.io/v3/' + process.env.INFURA; const rpcUrl = 'http://127.0.0.1:8545'; const provider = new JsonRpcProvider(rpcUrl, networkId); const blocknumber = 17129117; diff --git a/yarn.lock b/yarn.lock index 0538b67b..d910a209 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4156,9 +4156,9 @@ path-key@^3.0.0, path-key@^3.1.0: integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== path-type@^4.0.0: version "4.0.0" @@ -4502,19 +4502,19 @@ semver-regex@^2.0.0: integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw== semver@^5.4.1, semver@^5.5.0: - version "5.7.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" - integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== semver@^6.0.0, semver@^6.3.0: - version "6.3.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@^7.2.1, semver@^7.3.5: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" @@ -4995,9 +4995,9 @@ wide-align@1.1.3: string-width "^1.0.2 || 2" word-wrap@^1.2.3: - version "1.2.4" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f" - integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA== + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== workerpool@6.0.2: version "6.0.2" @@ -5067,9 +5067,9 @@ xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0: integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== y18n@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" - integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== + version "4.0.0" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== y18n@^5.0.5: version "5.0.8"