diff --git a/package.json b/package.json index 3c02a4a24..237bea508 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "test": "lerna run test", "test:ci": "lerna run test:ci", "drain": "node ./scripts/drain-deployer.js", + "migrate-pool": "node ./scripts/migrate-pool.js", "prepare": "husky install", "prettier": "prettier --write \"./**/*.sol\" \"./**/*.ts\" \"./**/*.js\" \"./**/*.json\"" }, @@ -53,6 +54,7 @@ "nx": "^16.5.5", "prettier": "^2.8.4", "prettier-plugin-solidity": "^1.1.2", + "prompt-confirm": "^2.0.4", "solidity-coverage": "^0.8.5", "ts-node": "^10.9.1", "typechain": "^8.1.1", diff --git a/source/pool/scripts/migrate.js b/scripts/migrate-pool.js similarity index 69% rename from source/pool/scripts/migrate.js rename to scripts/migrate-pool.js index 2df9753fd..16b06ebf3 100644 --- a/source/pool/scripts/migrate.js +++ b/scripts/migrate-pool.js @@ -1,30 +1,48 @@ +require('dotenv').config({ path: './.env' }) const Confirm = require('prompt-confirm') const { ethers } = require('hardhat') -const { chainNames, ChainIds } = require('@airswap/utils') -const { getReceiptUrl } = require('@airswap/utils') +const { + ChainIds, + chainNames, + apiUrls, + getReceiptUrl, +} = require('@airswap/utils') -const { Pool__factory } = require('../typechain/factories/contracts') -const { abi } = require('./migrate-abis/4-1-1.js') -const deploys = require('../deploys.js') +const { Pool__factory } = require('@airswap/pool/typechain/factories/contracts') +const { abi } = require('@airswap/pool/legacy-abis/4-1-1.js') +const deploys = require('@airswap/pool/deploys.js') const CONFIRMATIONS = 2 const PREVIOUS_POOL = '0xEEcD248D977Fd4D392915b4AdeF8154BA3aE9c02' const NEW_POOL = '0xbbcec987E4C189FCbAB0a2534c77b3ba89229F11' async function main() { - const [account] = await ethers.getSigners() - const chainId = await account.getChainId() - if (chainId === ChainIds.HARDHAT) { + let chainId + if (process.argv[2] === '--network') { + chainId = ChainIds[process.argv[3].toUpperCase()] + } + + if (!chainId) { console.log('Value for --network flag is required') return } + + const provider = new ethers.providers.JsonRpcProvider(apiUrls[chainId]) + const account = new ethers.Wallet(process.env.PRIVATE_KEY, provider) + console.log(`Account: ${account.address}`) console.log(`Network: ${chainNames[chainId].toUpperCase()}\n`) console.log(`From-pool: ${PREVIOUS_POOL}`) console.log(`To-pool: ${NEW_POOL}`) const previousPool = new ethers.Contract(PREVIOUS_POOL, abi, account.provider) - const logs = await previousPool.queryFilter(previousPool.filters.UseClaim()) + let logs + try { + logs = await previousPool.queryFilter(previousPool.filters.UseClaim()) + } catch (error) { + console.log('\n✘ Error querying claim events on from-pool.\n\n', error.body) + return + } if (!logs.length) { console.log('\n✘ No claim events found on from-pool.\n') diff --git a/scripts/owners-update.js b/scripts/owners-update.js index ab422829d..968bf2569 100644 --- a/scripts/owners-update.js +++ b/scripts/owners-update.js @@ -1,7 +1,11 @@ const Confirm = require('prompt-confirm') const { ethers } = require('hardhat') -const { chainNames, ChainIds, ownerAddresses } = require('@airswap/utils') -const { getReceiptUrl } = require('@airswap/utils') +const { + chainNames, + ChainIds, + ownerAddresses, + getReceiptUrl, +} = require('@airswap/utils') const CONFIRMATIONS = 2 const TRANSFER_STARTED = diff --git a/scripts/receivers-report.js b/scripts/receivers-report.js index 095e2e125..f010620e1 100644 --- a/scripts/receivers-report.js +++ b/scripts/receivers-report.js @@ -5,9 +5,9 @@ const { chainNames, apiUrls, protocolFeeReceiverAddresses, + ADDRESS_ZERO, } = require('@airswap/utils') const poolDeploys = require('@airswap/pool/deploys.js') -const { ADDRESS_ZERO } = require('@airswap/utils') const contracts = [ ['swap', 'Swap'], diff --git a/source/batch-call/package.json b/source/batch-call/package.json index a11cdec73..fab0337e8 100644 --- a/source/batch-call/package.json +++ b/source/batch-call/package.json @@ -1,7 +1,7 @@ { "name": "@airswap/batch-call", "version": "5.0.0", - "description": "Batch balance, allowance, order validity checks", + "description": "AirSwap: Balance, Allowance, Validity Checks", "license": "MIT", "repository": { "type": "git", @@ -10,9 +10,7 @@ "files": [ "./build", "./typechain", - "./deploys.js", - "./deploys-blocks.js", - "./deploys.js.d.ts" + "./deploys*" ], "scripts": { "clean": "rm -rf ./cache && rm -rf ./build && rm -rf ./typechain", @@ -29,8 +27,7 @@ "@airswap/utils": "5.0.0", "@airswap/swap": "5.0.0", "@airswap/swap-erc20": "5.0.0", - "@openzeppelin/contracts": "^4.8.3", - "prompt-confirm": "^2.0.4" + "@openzeppelin/contracts": "^4.8.3" }, "publishConfig": { "access": "public" diff --git a/source/batch-call/scripts/deploy.js b/source/batch-call/scripts/deploy.js index 3f50cdc1d..562d86de6 100644 --- a/source/batch-call/scripts/deploy.js +++ b/source/batch-call/scripts/deploy.js @@ -2,8 +2,7 @@ const fs = require('fs') const prettier = require('prettier') const { ethers, run } = require('hardhat') -const { ChainIds, chainLabels } = require('@airswap/utils') -const { getReceiptUrl } = require('@airswap/utils') +const { ChainIds, chainLabels, getReceiptUrl } = require('@airswap/utils') const batchCallDeploys = require('../deploys.js') const batchCallBlocks = require('../deploys-blocks.js') const batchCallCommits = require('../deploys-commits.js') diff --git a/source/batch-call/test/BatchCall.js b/source/batch-call/test/BatchCall.js index 7fe37bab7..d70316ed9 100644 --- a/source/batch-call/test/BatchCall.js +++ b/source/batch-call/test/BatchCall.js @@ -13,8 +13,8 @@ const { createOrderSignature, createOrderERC20, createOrderERC20Signature, + TokenKinds, } = require('@airswap/utils') -const { TokenKinds } = require('@airswap/utils') const CHAIN_ID = 31337 const PROTOCOL_FEE = '30' diff --git a/source/delegate/package.json b/source/delegate/package.json index 16b4de86f..58591e0e1 100644 --- a/source/delegate/package.json +++ b/source/delegate/package.json @@ -10,9 +10,7 @@ "files": [ "./build", "./typechain", - "./deploys.js", - "./deploys-blocks.js", - "./deploys.js.d.ts" + "./deploys*" ], "scripts": { "clean": "rm -rf ./cache && rm -rf ./build && rm -rf ./typechain", @@ -22,13 +20,12 @@ "test": "hardhat test", "test:ci": "hardhat test", "deploy": "hardhat run ./scripts/deploy.js", - "owners": "hardhat run ./scripts/owner.js", - "verify": "hardhat run ./scripts/verify.js" + "verify": "hardhat run ./scripts/verify.js", + "owners": "hardhat run ./scripts/owner.js" }, "devDependencies": { "@airswap/utils": "5.0.0", - "@airswap/swap-erc20": "5.0.0", - "prompt-confirm": "^2.0.4" + "@airswap/swap-erc20": "5.0.0" }, "publishConfig": { "access": "public" diff --git a/source/delegate/scripts/deploy.js b/source/delegate/scripts/deploy.js index 08538fa9e..85bab522a 100644 --- a/source/delegate/scripts/deploy.js +++ b/source/delegate/scripts/deploy.js @@ -4,8 +4,7 @@ const prettier = require('prettier') const { ethers, run } = require('hardhat') const swapERC20Deploys = require('@airswap/swap-erc20/deploys.js') -const { ChainIds, chainLabels } = require('@airswap/utils') -const { getReceiptUrl } = require('@airswap/utils') +const { ChainIds, chainLabels, getReceiptUrl } = require('@airswap/utils') const delegateDeploys = require('../deploys.js') const delegateBlocks = require('../deploys-blocks.js') const delegateCommits = require('../deploys-commits.js') diff --git a/source/pool/scripts/migrate-abis/4-1-1.js b/source/pool/legacy-abis/4-1-1.js similarity index 100% rename from source/pool/scripts/migrate-abis/4-1-1.js rename to source/pool/legacy-abis/4-1-1.js diff --git a/source/pool/package.json b/source/pool/package.json index daa7907b2..7917886b6 100644 --- a/source/pool/package.json +++ b/source/pool/package.json @@ -10,9 +10,7 @@ "files": [ "./build", "./typechain", - "./deploys.js", - "./deploys-blocks.js", - "./deploys.js.d.ts" + "./deploys*" ], "scripts": { "clean": "rm -rf ./cache && rm -rf ./build && rm -rf ./typechain", @@ -24,14 +22,12 @@ "deploy": "hardhat run ./scripts/deploy.js", "verify": "hardhat run ./scripts/verify.js", "owners": "hardhat run ./scripts/owner.js", - "migrate": "hardhat run ./scripts/migrate.js", "balances": "hardhat run ./scripts/balances.js" }, "devDependencies": { "@airswap/utils": "5.0.0", "@airswap/merkle": "0.0.2", - "@openzeppelin/contracts": "^4.8.3", - "prompt-confirm": "^2.0.4" + "@openzeppelin/contracts": "^4.8.3" }, "publishConfig": { "access": "public" diff --git a/source/pool/scripts/deploy.js b/source/pool/scripts/deploy.js index 7ae0266c0..9dbf15240 100644 --- a/source/pool/scripts/deploy.js +++ b/source/pool/scripts/deploy.js @@ -2,8 +2,7 @@ const fs = require('fs') const prettier = require('prettier') const { ethers, run } = require('hardhat') -const { chainLabels, ChainIds } = require('@airswap/utils') -const { getReceiptUrl } = require('@airswap/utils') +const { chainLabels, ChainIds, getReceiptUrl } = require('@airswap/utils') const poolDeploys = require('../deploys.js') const poolBlocks = require('../deploys-blocks.js') const poolCommits = require('../deploys-commits.js') diff --git a/source/pool/test/Pool.js b/source/pool/test/Pool.js index 551180487..15c893b1e 100644 --- a/source/pool/test/Pool.js +++ b/source/pool/test/Pool.js @@ -1,5 +1,5 @@ const { expect } = require('chai') -const { toAtomicString } = require('@airswap/utils') +const { toAtomicString, ADDRESS_ZERO } = require('@airswap/utils') const { generateTreeFromData, getRoot, getProof } = require('@airswap/merkle') const { soliditySha3 } = require('web3-utils') @@ -7,7 +7,6 @@ const { ethers, waffle } = require('hardhat') const { deployMockContract } = waffle const IERC20 = require('@openzeppelin/contracts/build/contracts/IERC20.json') const STAKING = require('@airswap/staking/build/contracts/Staking.sol/Staking.json') -const { ADDRESS_ZERO } = require('@airswap/utils') function toWei(value, places) { return toAtomicString(value, places || 18) diff --git a/source/registry/package.json b/source/registry/package.json index ebded43d2..fa86a7429 100644 --- a/source/registry/package.json +++ b/source/registry/package.json @@ -10,9 +10,7 @@ "files": [ "./build", "./typechain", - "./deploys.js", - "./deploys-blocks.js", - "./deploys.js.d.ts" + "./deploys*" ], "scripts": { "clean": "rm -rf ./cache && rm -rf ./build && rm -rf ./typechain", @@ -25,12 +23,11 @@ "verify": "hardhat run ./scripts/verify.js", "owners": "hardhat run ./scripts/owner.js" }, - "publishConfig": { - "access": "public" - }, "devDependencies": { "@airswap/utils": "5.0.0", - "@openzeppelin/contracts": "^4.8.3", - "prompt-confirm": "^2.0.4" + "@openzeppelin/contracts": "^4.8.3" + }, + "publishConfig": { + "access": "public" } } diff --git a/source/registry/scripts/deploy.js b/source/registry/scripts/deploy.js index 6bffeb0e6..45275d550 100644 --- a/source/registry/scripts/deploy.js +++ b/source/registry/scripts/deploy.js @@ -2,8 +2,7 @@ const fs = require('fs') const prettier = require('prettier') const { ethers, run } = require('hardhat') -const { ChainIds, chainLabels } = require('@airswap/utils') -const { getReceiptUrl } = require('@airswap/utils') +const { ChainIds, chainLabels, getReceiptUrl } = require('@airswap/utils') const registryDeploys = require('../deploys.js') const registryBlocks = require('../deploys-blocks.js') const registryCommits = require('../deploys-commits.js') diff --git a/source/staking/package.json b/source/staking/package.json index e7dd366cf..04564049f 100644 --- a/source/staking/package.json +++ b/source/staking/package.json @@ -10,12 +10,10 @@ "files": [ "./build", "./typechain", - "./deploys.js", - "./deploys-blocks.js", - "./deploys.js.d.ts" + "./deploys*" ], "scripts": { - "clean": "rm -rf cache && rm -rf ./build && rm -rf ./typechain", + "clean": "rm -rf ./cache && rm -rf ./build && rm -rf ./typechain", "compile": "hardhat compile; yarn typechain", "typechain": "tsc -b", "coverage": "hardhat coverage", @@ -25,12 +23,11 @@ "verify": "hardhat run ./scripts/verify.js", "owners": "hardhat run ./scripts/owner.js" }, - "publishConfig": { - "access": "public" - }, "devDependencies": { "@airswap/utils": "5.0.0", - "@openzeppelin/contracts": "^4.8.3", - "prompt-confirm": "^2.0.4" + "@openzeppelin/contracts": "^4.8.3" + }, + "publishConfig": { + "access": "public" } } diff --git a/source/staking/scripts/deploy.js b/source/staking/scripts/deploy.js index 0f2ecc775..3fda5b639 100644 --- a/source/staking/scripts/deploy.js +++ b/source/staking/scripts/deploy.js @@ -2,8 +2,7 @@ const fs = require('fs') const prettier = require('prettier') const { ethers, run } = require('hardhat') -const { chainLabels, ChainIds } = require('@airswap/utils') -const { getReceiptUrl } = require('@airswap/utils') +const { chainLabels, ChainIds, getReceiptUrl } = require('@airswap/utils') const stakingDeploys = require('../deploys.js') const stakingBlocks = require('../deploys-blocks.js') const stakingCommits = require('../deploys-commits.js') diff --git a/source/swap-erc20/package.json b/source/swap-erc20/package.json index 96a004c45..5b1375967 100644 --- a/source/swap-erc20/package.json +++ b/source/swap-erc20/package.json @@ -10,9 +10,7 @@ "files": [ "./build", "./typechain", - "./deploys.js", - "./deploys-blocks.js", - "./deploys.js.d.ts" + "./deploys*" ], "scripts": { "clean": "rm -rf ./cache && rm -rf ./build && rm -rf ./typechain", @@ -28,7 +26,6 @@ "devDependencies": { "@airswap/staking": "5.0.0", "@airswap/utils": "5.0.0", - "prompt-confirm": "^2.0.4", "solady": "0.0.173" }, "publishConfig": { diff --git a/source/swap-erc20/scripts/deploy.js b/source/swap-erc20/scripts/deploy.js index f73045240..f7dc20094 100644 --- a/source/swap-erc20/scripts/deploy.js +++ b/source/swap-erc20/scripts/deploy.js @@ -7,8 +7,8 @@ const { ChainIds, chainLabels, protocolFeeReceiverAddresses, + getReceiptUrl, } = require('@airswap/utils') -const { getReceiptUrl } = require('@airswap/utils') const swapERC20Deploys = require('../deploys.js') const swapERC20Blocks = require('../deploys-blocks.js') const swapERC20Commits = require('../deploys-commits.js') diff --git a/source/swap-erc20/test/SwapERC20.js b/source/swap-erc20/test/SwapERC20.js index d92f60e70..2440ab275 100644 --- a/source/swap-erc20/test/SwapERC20.js +++ b/source/swap-erc20/test/SwapERC20.js @@ -1,9 +1,10 @@ const { expect } = require('chai') -const { ADDRESS_ZERO, SECONDS_IN_DAY } = require('@airswap/utils') const { createOrderERC20, orderERC20ToParams, createOrderERC20Signature, + ADDRESS_ZERO, + SECONDS_IN_DAY, } = require('@airswap/utils') const { ethers, waffle } = require('hardhat') const { deployMockContract } = waffle diff --git a/source/swap/package.json b/source/swap/package.json index e0d6a8f80..c328403a1 100644 --- a/source/swap/package.json +++ b/source/swap/package.json @@ -10,10 +10,7 @@ "files": [ "./build", "./typechain", - "./deploys.js", - "./deploys-blocks.js", - "./deploys.js.d.ts", - "./deploys-adapters.js" + "./deploys*" ], "scripts": { "clean": "rm -rf ./cache && rm -rf ./build && rm -rf ./typechain", diff --git a/source/swap/scripts/deploy-adapters.js b/source/swap/scripts/deploy-adapters.js index 85b3c0cb7..d8e71439c 100644 --- a/source/swap/scripts/deploy-adapters.js +++ b/source/swap/scripts/deploy-adapters.js @@ -2,8 +2,7 @@ const fs = require('fs') const prettier = require('prettier') const { ethers, run } = require('hardhat') -const { chainLabels, ChainIds } = require('@airswap/utils') -const { getReceiptUrl } = require('@airswap/utils') +const { chainLabels, ChainIds, getReceiptUrl } = require('@airswap/utils') const adapterDeploys = require('../deploys-adapters.js') const adapterBlocks = require('../deploys-adapters-blocks.js') const adapterCommits = require('../deploys-adapters-commits.js') diff --git a/source/swap/scripts/deploy.js b/source/swap/scripts/deploy.js index 30dc2df80..ad1134f7a 100644 --- a/source/swap/scripts/deploy.js +++ b/source/swap/scripts/deploy.js @@ -7,8 +7,8 @@ const { ChainIds, protocolFeeReceiverAddresses, ADDRESS_ZERO, + getReceiptUrl, } = require('@airswap/utils') -const { getReceiptUrl } = require('@airswap/utils') const poolDeploys = require('@airswap/pool/deploys.js') const swapDeploys = require('../deploys.js') const swapBlocks = require('../deploys-blocks.js') diff --git a/source/swap/test/Swap.js b/source/swap/test/Swap.js index 14c108e4e..21a7eb6f6 100644 --- a/source/swap/test/Swap.js +++ b/source/swap/test/Swap.js @@ -5,8 +5,12 @@ const { deployMockContract } = waffle const IERC20 = require('@openzeppelin/contracts/build/contracts/IERC20.json') const IERC721 = require('@openzeppelin/contracts/build/contracts/ERC721Royalty.json') const IERC1155 = require('@openzeppelin/contracts/build/contracts/IERC1155.json') -const { createOrder, createOrderSignature } = require('@airswap/utils') -const { TokenKinds, ADDRESS_ZERO } = require('@airswap/utils') +const { + createOrder, + createOrderSignature, + TokenKinds, + ADDRESS_ZERO, +} = require('@airswap/utils') const CHAIN_ID = 31337 const PROTOCOL_FEE = '30' diff --git a/source/swap/test/SwapIntegration.js b/source/swap/test/SwapIntegration.js index a40d22cff..cdc2636ef 100644 --- a/source/swap/test/SwapIntegration.js +++ b/source/swap/test/SwapIntegration.js @@ -1,7 +1,11 @@ const { expect } = require('chai') const { ethers } = require('hardhat') -const { createOrder, createOrderSignature } = require('@airswap/utils') -const { TokenKinds, ADDRESS_ZERO } = require('@airswap/utils') +const { + createOrder, + createOrderSignature, + TokenKinds, + ADDRESS_ZERO, +} = require('@airswap/utils') const ERC20PresetMinterPauser = require('@openzeppelin/contracts/build/contracts/ERC20PresetMinterPauser.json') const ERC1155PresetMinterPauser = require('@openzeppelin/contracts/build/contracts/ERC1155PresetMinterPauser.json') diff --git a/source/wrapper/package.json b/source/wrapper/package.json index 487165592..6a38cf7b3 100644 --- a/source/wrapper/package.json +++ b/source/wrapper/package.json @@ -10,11 +10,7 @@ "files": [ "./build", "./typechain", - "./deploys.js", - "./deploys-blocks.js", - "./deploys-weth.js", - "./deploys-blocks-weth.js", - "./deploys.js.d.ts" + "./deploys*" ], "scripts": { "clean": "rm -rf ./cache && rm -rf ./build && rm -rf ./typechain", @@ -22,7 +18,7 @@ "typechain": "tsc -b", "coverage": "hardhat coverage", "test": "hardhat test", - "test:ci": "hardhat", + "test:ci": "hardhat test", "deploy": "hardhat run ./scripts/deploy.js", "verify": "hardhat run ./scripts/verify.js", "owners": "hardhat run ./scripts/owner.js" @@ -31,8 +27,7 @@ "@airswap/utils": "5.0.0", "@airswap/swap-erc20": "5.0.0", "@openzeppelin/contracts": "^4.8.3", - "@uniswap/v2-periphery": "^1.1.0-beta.0", - "prompt-confirm": "^2.0.4" + "@uniswap/v2-periphery": "^1.1.0-beta.0" }, "publishConfig": { "access": "public" diff --git a/source/wrapper/scripts/deploy.js b/source/wrapper/scripts/deploy.js index a48261233..15d6940d8 100644 --- a/source/wrapper/scripts/deploy.js +++ b/source/wrapper/scripts/deploy.js @@ -2,13 +2,12 @@ const fs = require('fs') const prettier = require('prettier') const { ethers, run } = require('hardhat') -const { chainLabels, ChainIds } = require('@airswap/utils') +const { chainLabels, ChainIds, getReceiptUrl } = require('@airswap/utils') const swapDeploys = require('@airswap/swap-erc20/deploys.js') const wrapperDeploys = require('../deploys.js') const wrapperBlocks = require('../deploys-blocks.js') const wrapperCommits = require('../deploys-commits.js') const wethDeploys = require('../deploys-weth.js') -const { getReceiptUrl } = require('@airswap/utils') const { confirmDeployment } = require('../../../scripts/deployer-info') async function main() { diff --git a/source/wrapper/test/Wrapper.js b/source/wrapper/test/Wrapper.js index be3c910df..2caad88d2 100644 --- a/source/wrapper/test/Wrapper.js +++ b/source/wrapper/test/Wrapper.js @@ -3,10 +3,10 @@ const { createOrderERC20, orderERC20ToParams, createOrderERC20Signature, + ADDRESS_ZERO, } = require('@airswap/utils') const { ethers, waffle } = require('hardhat') const { deployMockContract } = waffle -const { ADDRESS_ZERO } = require('@airswap/utils') const IERC20 = require('@openzeppelin/contracts/build/contracts/IERC20.json') const IWETH = require('../build/contracts/interfaces/IWETH.sol/IWETH.json')