4.1 mainnet for pool, registry, swap-erc20, wrapper

airswap · Oct 2, 2023 · e68f668 · e68f668
1 parent 4b656e1
commit e68f668
Show file tree

Hide file tree

Showing 31 changed files with 141 additions and 67 deletions.
diff --git a/source/balances/package.json b/source/balances/package.json
@@ -28,7 +28,7 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.0.10",
+    "@airswap/constants": "^4.1.0",
     "@airswap/utils": "^4.0.8",
     "prompt-confirm": "^2.0.4"
   },

diff --git a/source/balances/scripts/deploy.js b/source/balances/scripts/deploy.js
@@ -2,7 +2,7 @@
 const fs = require('fs')
 const Confirm = require('prompt-confirm')
 const { ethers, run } = require('hardhat')
-const { ChainIds, chainNames } = require('@airswap/constants')
+const { ChainIds, chainNames, chainLabels } = require('@airswap/constants')
 const { getReceiptUrl } = require('@airswap/utils')
 const balancesDeploys = require('../deploys.js')
 
@@ -40,7 +40,7 @@ async function main() {
     console.log('Updated deploys.js')
 
     console.log(
-      `\nVerify with "yarn verify --network ${chainNames[
+      `\nVerify with "yarn verify --network ${chainLabels[
         chainId
       ].toLowerCase()}"\n`
     )

diff --git a/source/pool/deploys-blocks.js b/source/pool/deploys-blocks.js
@@ -1,3 +1,4 @@
 module.exports = {
+  1: 18262813,
   5: 9774330,
 }
diff --git a/source/pool/deploys.js b/source/pool/deploys.js
@@ -1,3 +1,4 @@
 module.exports = {
+  1: '0xEEcD248D977Fd4D392915b4AdeF8154BA3aE9c02',
   5: '0xa55CDCe4F6300D57831b2792c45E55a899D8e2a4',
 }
diff --git a/source/pool/package.json b/source/pool/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/pool",
-  "version": "4.1.0-beta.0",
+  "version": "4.1.0",
   "description": "AirSwap: Withdrawable Token Pool",
   "license": "MIT",
   "repository": {
@@ -28,8 +28,8 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.0.10",
-    "@airswap/types": "^4.0.0",
+    "@airswap/constants": "^4.1.0",
+    "@airswap/types": "^4.1.0",
     "@airswap/utils": "^4.0.8",
     "prompt-confirm": "^2.0.4"
   },

diff --git a/source/pool/scripts/deploy.js b/source/pool/scripts/deploy.js
@@ -3,7 +3,7 @@ const fs = require('fs')
 const prettier = require('prettier')
 const Confirm = require('prompt-confirm')
 const { ethers, run } = require('hardhat')
-const { chainNames, ChainIds } = require('@airswap/constants')
+const { chainLabels, chainNames, ChainIds } = require('@airswap/constants')
 const { getReceiptUrl } = require('@airswap/utils')
 const poolDeploys = require('../deploys.js')
 const poolBlocks = require('../deploys-blocks.js')
@@ -57,7 +57,7 @@ async function main() {
     console.log(`Deployed: ${poolDeploys[chainId]} @ ${poolBlocks[chainId]}`)
 
     console.log(
-      `\nVerify with "yarn verify --network ${chainNames[
+      `\nVerify with "yarn verify --network ${chainLabels[
         chainId
       ].toLowerCase()}"\n`
     )

diff --git a/source/registry/deploys-blocks.js b/source/registry/deploys-blocks.js
@@ -1,3 +1,4 @@
 module.exports = {
+  1: 18262901,
   5: 9774339,
 }
diff --git a/source/registry/deploys.js b/source/registry/deploys.js
@@ -1,3 +1,4 @@
 module.exports = {
+  1: '0x339Eb75235CBf823C6352D529A258226ecF59cfF',
   5: '0x33Cded9D1C082AA57439FB7a6784913321e17316',
 }
diff --git a/source/registry/package.json b/source/registry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/registry",
-  "version": "4.1.0-beta.0",
+  "version": "4.1.0",
   "description": "AirSwap: Server URL Registry",
   "license": "MIT",
   "repository": {
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.0.10",
+    "@airswap/constants": "^4.1.0",
     "@airswap/utils": "^4.0.8",
     "prompt-confirm": "^2.0.4"
   }

diff --git a/source/registry/scripts/deploy.js b/source/registry/scripts/deploy.js
@@ -3,7 +3,12 @@ const fs = require('fs')
 const prettier = require('prettier')
 const Confirm = require('prompt-confirm')
 const { ethers, run } = require('hardhat')
-const { ChainIds, chainNames, ADDRESS_ZERO } = require('@airswap/constants')
+const {
+  ChainIds,
+  chainLabels,
+  chainNames,
+  stakingTokenAddresses,
+} = require('@airswap/constants')
 const { getReceiptUrl } = require('@airswap/utils')
 const registryDeploys = require('../deploys.js')
 const registryBlocks = require('../deploys-blocks.js')
@@ -23,9 +28,9 @@ async function main() {
   console.log(`Network: ${chainNames[chainId].toUpperCase()}`)
   console.log(`Gas price: ${gasPrice / 10 ** 9} gwei\n`)
 
-  const stakingToken = ADDRESS_ZERO // stakingTokenAddresses[chainId]
-  const stakingCost = 0 // 1000000000
-  const supportCost = 0 // 1000000
+  const stakingToken = stakingTokenAddresses[chainId]
+  const stakingCost = 1000000000
+  const supportCost = 1000000
 
   console.log(`\nstakingToken: ${stakingToken}`)
   console.log(`stakingCost: ${stakingCost}`)
@@ -68,7 +73,7 @@ async function main() {
     )
 
     console.log(
-      `\nVerify with "yarn verify --network ${chainNames[
+      `\nVerify with "yarn verify --network ${chainLabels[
         chainId
       ].toLowerCase()}"\n`
     )

diff --git a/source/registry/scripts/verify.js b/source/registry/scripts/verify.js
@@ -1,17 +1,17 @@
 /* eslint-disable no-console */
 const { ethers, run } = require('hardhat')
 const registryDeploys = require('../deploys.js')
-const { chainNames, ADDRESS_ZERO } = require('@airswap/constants')
+const { chainNames, stakingTokenAddresses } = require('@airswap/constants')
 
 async function main() {
   await run('compile')
   const [deployer] = await ethers.getSigners()
   console.log(`Deployer: ${deployer.address}`)
 
   const chainId = await deployer.getChainId()
-  const stakingToken = ADDRESS_ZERO // stakingTokenAddresses[chainId]
-  const stakingCost = 0 // 1000000000
-  const supportCost = 0 // 1000000
+  const stakingToken = stakingTokenAddresses[chainId]
+  const stakingCost = 1000000000
+  const supportCost = 1000000
 
   console.log(`Verifying on ${chainNames[chainId].toUpperCase()}`)
   await run('verify:verify', {

diff --git a/source/staking/scripts/deploy.js b/source/staking/scripts/deploy.js
@@ -2,7 +2,11 @@
 const fs = require('fs')
 const Confirm = require('prompt-confirm')
 const { ethers, run } = require('hardhat')
-const { chainNames, stakingTokenAddresses } = require('@airswap/constants')
+const {
+  chainNames,
+  chainLabels,
+  stakingTokenAddresses,
+} = require('@airswap/constants')
 const { getReceiptUrl } = require('@airswap/utils')
 const stakingDeploys = require('../deploys.js')
 
@@ -56,7 +60,7 @@ async function main() {
     console.log('Updated deploys.js')
 
     console.log(
-      `\nVerify with "yarn verify --network ${chainNames[
+      `\nVerify with "yarn verify --network ${chainLabels[
         chainId
       ].toLowerCase()}"\n`
     )

diff --git a/source/swap-erc20/deploys-blocks.js b/source/swap-erc20/deploys-blocks.js
@@ -1,3 +1,4 @@
 module.exports = {
+  1: 18262981,
   5: 9775062,
 }
diff --git a/source/swap-erc20/deploys.js b/source/swap-erc20/deploys.js
@@ -1,3 +1,4 @@
 module.exports = {
+  1: '0x0A655E762238Fee539338F433087A3B9dAdD798b',
   5: '0x1E6EBD18B5Ee1C31DcB3fc6AD23f32a35a8FF8e4',
 }
diff --git a/source/swap-erc20/package.json b/source/swap-erc20/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/swap-erc20",
-  "version": "4.1.0-beta.1",
+  "version": "4.1.0",
   "description": "AirSwap: Atomic ERC20 Token Swap",
   "license": "MIT",
   "repository": {
@@ -28,9 +28,9 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.0.10",
+    "@airswap/constants": "^4.1.0",
     "@airswap/staking": "4.0.3",
-    "@airswap/types": "^4.0.0",
+    "@airswap/types": "^4.1.0",
     "@airswap/utils": "^4.0.8",
     "prompt-confirm": "^2.0.4"
   },

diff --git a/source/swap-erc20/scripts/deploy.js b/source/swap-erc20/scripts/deploy.js
@@ -5,13 +5,20 @@ const Confirm = require('prompt-confirm')
 const { ethers, run } = require('hardhat')
 const poolDeploys = require('@airswap/pool/deploys.js')
 const stakingDeploys = require('@airswap/staking/deploys.js')
-const { ChainIds, chainNames } = require('@airswap/constants')
+const {
+  ChainIds,
+  chainLabels,
+  chainNames,
+  protocolFeeReceiverAddresses,
+} = require('@airswap/constants')
 const { getReceiptUrl } = require('@airswap/utils')
 const swapERC20Deploys = require('../deploys.js')
 const swapERC20Blocks = require('../deploys-blocks.js')
 
 async function main() {
   await run('compile')
+  const config = await prettier.resolveConfig('../deploys.js')
+
   const [deployer] = await ethers.getSigners()
   const gasPrice = await deployer.getGasPrice()
   const chainId = await deployer.getChainId()
@@ -23,24 +30,26 @@ async function main() {
   console.log(`Network: ${chainNames[chainId].toUpperCase()}`)
   console.log(`Gas price: ${gasPrice / 10 ** 9} gwei\n`)
 
-  const protocolFeeWallet = poolDeploys[chainId]
+  let protocolFeeReceiver = poolDeploys[chainId]
+  if (protocolFeeReceiverAddresses[chainId]) {
+    protocolFeeReceiver = protocolFeeReceiverAddresses[chainId]
+  }
   const stakingContract = stakingDeploys[chainId]
   const protocolFee = 7
   const protocolFeeLight = 7
   const discountScale = 10
   const discountMax = 100
 
-  console.log(`Fee recipient: ${protocolFeeWallet}`)
+  console.log(`Fee receiver: ${protocolFeeReceiver}`)
   console.log(`Staking contract: ${stakingContract}`)
-  console.log(`Gas price: ${gasPrice / 10 ** 9} gwei`)
 
   const prompt = new Confirm('Proceed to deploy?')
   if (await prompt.run()) {
     const swapFactory = await ethers.getContractFactory('SwapERC20')
     const swapContract = await swapFactory.deploy(
       protocolFee,
       protocolFeeLight,
-      protocolFeeWallet,
+      protocolFeeReceiver,
       discountScale,
       discountMax,
       stakingContract
@@ -74,7 +83,7 @@ async function main() {
     )
 
     console.log(
-      `\nVerify with "yarn verify --network ${chainNames[
+      `\nVerify with "yarn verify --network ${chainLabels[
         chainId
       ].toLowerCase()}"\n`
     )

diff --git a/source/swap-erc20/scripts/verify.js b/source/swap-erc20/scripts/verify.js
@@ -2,7 +2,10 @@
 const { ethers, run } = require('hardhat')
 const stakingDeploys = require('@airswap/staking/deploys.js')
 const poolDeploys = require('@airswap/pool/deploys.js')
-const { chainNames } = require('@airswap/constants')
+const {
+  chainNames,
+  protocolFeeReceiverAddresses,
+} = require('@airswap/constants')
 const swapERC20Deploys = require('../deploys.js')
 
 async function main() {
@@ -11,7 +14,11 @@ async function main() {
   console.log(`Deployer: ${deployer.address}`)
 
   const chainId = await deployer.getChainId()
-  const protocolFeeWallet = poolDeploys[chainId]
+
+  let protocolFeeReceiver = poolDeploys[chainId]
+  if (protocolFeeReceiverAddresses[chainId]) {
+    protocolFeeReceiver = protocolFeeReceiverAddresses[chainId]
+  }
   const stakingContract = stakingDeploys[chainId]
   const protocolFee = 7
   const protocolFeeLight = 7
@@ -24,7 +31,7 @@ async function main() {
     constructorArguments: [
       protocolFee,
       protocolFeeLight,
-      protocolFeeWallet,
+      protocolFeeReceiver,
       discountScale,
       discountMax,
       stakingContract,

diff --git a/source/swap/package.json b/source/swap/package.json
@@ -32,8 +32,8 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.0.10",
-    "@airswap/types": "^4.0.0",
+    "@airswap/constants": "^4.1.0",
+    "@airswap/types": "^4.1.0",
     "@airswap/utils": "^4.0.8",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.7"
   },

diff --git a/source/swap/scripts/deploy-adapters.js b/source/swap/scripts/deploy-adapters.js
@@ -2,7 +2,7 @@
 const fs = require('fs')
 const Confirm = require('prompt-confirm')
 const { ethers, run } = require('hardhat')
-const { chainNames, ChainIds } = require('@airswap/constants')
+const { chainNames, chainLabels, ChainIds } = require('@airswap/constants')
 const { getReceiptUrl } = require('@airswap/utils')
 const adapterDeploys = require('../deploys-adapters.js')
 
@@ -44,7 +44,7 @@ async function main() {
     console.log('Updated deploys-adapters.js')
 
     console.log(
-      `\nVerify with "yarn verify-adapters --network ${chainNames[
+      `\nVerify with "yarn verify-adapters --network ${chainLabels[
         chainId
       ].toLowerCase()}"\n`
     )

diff --git a/source/swap/scripts/deploy.js b/source/swap/scripts/deploy.js
@@ -3,7 +3,12 @@ const fs = require('fs')
 const Confirm = require('prompt-confirm')
 const { ethers, run } = require('hardhat')
 const poolDeploys = require('@airswap/pool/deploys.js')
-const { chainNames, ChainIds, TokenKinds } = require('@airswap/constants')
+const {
+  chainNames,
+  chainLabels,
+  ChainIds,
+  TokenKinds,
+} = require('@airswap/constants')
 const { getReceiptUrl } = require('@airswap/utils')
 const swapDeploys = require('../deploys.js')
 const adapterDeploys = require('../deploys-adapters.js')
@@ -54,7 +59,7 @@ async function main() {
     console.log('Updated deploys.js')
 
     console.log(
-      `\nVerify with "yarn verify --network ${chainNames[
+      `\nVerify with "yarn verify --network ${chainLabels[
         chainId
       ].toLowerCase()}"\n`
     )

diff --git a/source/wrapper/deploys-blocks.js b/source/wrapper/deploys-blocks.js
@@ -1,5 +1,5 @@
 module.exports = {
-  1: 16776818,
+  1: 18263024,
   5: 8613803,
   30: 5113775,
   31: 3642943,

diff --git a/source/wrapper/deploys.js b/source/wrapper/deploys.js
@@ -1,5 +1,5 @@
 module.exports = {
-  1: '0x99568Ce6c9901097150403B7629CF426B859BC22',
+  1: '0x600ECFFE21cE7D047F3462c2A30E1cA3599dF1A5',
   5: '0x99568Ce6c9901097150403B7629CF426B859BC22',
   30: '0x66bb3d0909FCAEB4316D57981e7BBBB31F502858',
   31: '0x99568Ce6c9901097150403B7629CF426B859BC22',

diff --git a/source/wrapper/package.json b/source/wrapper/package.json
@@ -27,13 +27,13 @@
     "verify": "hardhat run ./scripts/verify.js"
   },
   "dependencies": {
-    "@airswap/swap-erc20": "4.1.0-beta.1",
+    "@airswap/swap-erc20": "4.1.0",
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.0.10",
+    "@airswap/constants": "^4.1.0",
     "@airswap/utils": "^4.0.8",
-    "@airswap/types": "^4.0.0",
+    "@airswap/types": "^4.1.0",
     "@uniswap/v2-periphery": "^1.1.0-beta.0",
     "prompt-confirm": "^2.0.4"
   },