Additional swap-erc20 deploys; remove solidity deps from NPM packages (…

…#1300) * deploys and blocks for base and arbitrum * move solidity deps to devdeps * merge deploys
airswap · Mar 13, 2024 · 38fb92d · 38fb92d
1 parent 1c0b8a1
commit 38fb92d
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 45 deletions.
diff --git a/source/batch-call/package.json b/source/batch-call/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/batch-call",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "description": "Batch balance, allowance, order validity checks",
   "license": "MIT",
   "repository": {
@@ -25,13 +25,11 @@
     "verify": "hardhat run ./scripts/verify.js",
     "owners": "hardhat run ./scripts/owner.js"
   },
-  "dependencies": {
-    "@openzeppelin/contracts": "^4.8.3",
-    "@airswap/swap": "4.2.1",
-    "@airswap/swap-erc20": "4.3.0"
-  },
   "devDependencies": {
     "@airswap/utils": "4.3.0",
+    "@airswap/swap": "4.2.2",
+    "@airswap/swap-erc20": "4.3.1",
+    "@openzeppelin/contracts": "^4.8.3",
     "prompt-confirm": "^2.0.4"
   },
   "publishConfig": {

diff --git a/source/pool/package.json b/source/pool/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/pool",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "AirSwap: Withdrawable Token Pool",
   "license": "MIT",
   "repository": {
@@ -27,12 +27,10 @@
     "migrate": "hardhat run ./scripts/migrate.js",
     "balances": "hardhat run ./scripts/balances.js"
   },
-  "dependencies": {
-    "@openzeppelin/contracts": "^4.8.3"
-  },
   "devDependencies": {
     "@airswap/utils": "4.3.0",
     "@airswap/merkle": "0.0.2",
+    "@openzeppelin/contracts": "^4.8.3",
     "prompt-confirm": "^2.0.4"
   },
   "publishConfig": {

diff --git a/source/registry/package.json b/source/registry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/registry",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "AirSwap: Server Registry",
   "license": "MIT",
   "repository": {
@@ -25,14 +25,12 @@
     "verify": "hardhat run ./scripts/verify.js",
     "owners": "hardhat run ./scripts/owner.js"
   },
-  "dependencies": {
-    "@openzeppelin/contracts": "^4.8.3"
-  },
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
     "@airswap/utils": "4.3.0",
+    "@openzeppelin/contracts": "^4.8.3",
     "prompt-confirm": "^2.0.4"
   }
 }
diff --git a/source/staking/package.json b/source/staking/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/staking",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "AirSwap: Stake Tokens",
   "license": "MIT",
   "repository": {
@@ -25,14 +25,12 @@
     "verify": "hardhat run ./scripts/verify.js",
     "owners": "hardhat run ./scripts/owner.js"
   },
-  "dependencies": {
-    "@openzeppelin/contracts": "^4.8.3"
-  },
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
     "@airswap/utils": "4.3.0",
+    "@openzeppelin/contracts": "^4.8.3",
     "prompt-confirm": "^2.0.4"
   }
 }
diff --git a/source/swap-erc20/deploys-blocks.js b/source/swap-erc20/deploys-blocks.js
@@ -1,8 +1,17 @@
 module.exports = {
   1: 19341464,
   56: 36593146,
+  97: 38543402,
   137: 54144778,
+  8453: 11289587,
+  42161: 186290627,
+  17000: 1132433,
+  43113: 30844328,
   43114: 42345669,
+  59140: 4286115,
   59144: 2613444,
+  80001: 47001356,
+  84532: 7287254,
+  421614: 22800328,
   11155111: 5395281,
 }
diff --git a/source/swap-erc20/deploys.js b/source/swap-erc20/deploys.js
@@ -1,8 +1,17 @@
 module.exports = {
   1: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
   56: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
+  97: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
   137: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
+  8453: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
+  42161: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
+  17000: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
+  43113: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
   43114: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
+  59140: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
   59144: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
+  80001: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
+  84532: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
+  421614: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
   11155111: '0xD82E10B9A4107939e55fCCa9B53A9ede6CF2fC46',
 }
diff --git a/source/swap-erc20/package.json b/source/swap-erc20/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/swap-erc20",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "description": "AirSwap: Atomic ERC20 Token Swap",
   "license": "MIT",
   "repository": {
@@ -25,13 +25,11 @@
     "verify": "hardhat run ./scripts/verify.js",
     "owners": "hardhat run ./scripts/owner.js"
   },
-  "dependencies": {
-    "solady": "0.0.173"
-  },
   "devDependencies": {
-    "@airswap/staking": "4.2.1",
+    "@airswap/staking": "4.2.2",
     "@airswap/utils": "4.3.0",
-    "prompt-confirm": "^2.0.4"
+    "prompt-confirm": "^2.0.4",
+    "solady": "0.0.173"
   },
   "publishConfig": {
     "access": "public"

diff --git a/source/swap-erc20/scripts/deploy.js b/source/swap-erc20/scripts/deploy.js
@@ -8,7 +8,6 @@ const {
   ChainIds,
   chainLabels,
   protocolFeeReceiverAddresses,
-  ADDRESS_ZERO,
 } = require('@airswap/utils')
 const { getReceiptUrl } = require('@airswap/utils')
 const swapERC20Deploys = require('../deploys.js')
@@ -27,7 +26,7 @@ async function main() {
   }
   await displayDeployerInfo(deployer)
 
-  let protocolFeeReceiver = poolDeploys[chainId] || ADDRESS_ZERO
+  let protocolFeeReceiver = poolDeploys[chainId]
   if (protocolFeeReceiverAddresses[chainId]) {
     protocolFeeReceiver = protocolFeeReceiverAddresses[chainId]
   }

diff --git a/source/swap/package.json b/source/swap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/swap",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "AirSwap: Atomic Token Swap",
   "license": "MIT",
   "repository": {
@@ -28,12 +28,10 @@
     "verify-adapters": "hardhat run ./scripts/verify-adapters.js",
     "owners": "hardhat run ./scripts/owner.js"
   },
-  "dependencies": {
-    "@openzeppelin/contracts": "^4.8.3"
-  },
   "devDependencies": {
     "@airswap/utils": "4.3.0",
-    "@nomicfoundation/hardhat-network-helpers": "^1.0.7"
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.7",
+    "@openzeppelin/contracts": "^4.8.3"
   },
   "publishConfig": {
     "access": "public"

diff --git a/source/wrapper/package.json b/source/wrapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/wrapper",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "description": "AirSwap: Wrap and Unwrap Native Tokens",
   "license": "MIT",
   "repository": {
@@ -27,12 +27,10 @@
     "verify": "hardhat run ./scripts/verify.js",
     "owners": "hardhat run ./scripts/owner.js"
   },
-  "dependencies": {
-    "@airswap/swap-erc20": "4.3.0",
-    "@openzeppelin/contracts": "^4.8.3"
-  },
   "devDependencies": {
     "@airswap/utils": "4.3.0",
+    "@airswap/swap-erc20": "4.3.1",
+    "@openzeppelin/contracts": "^4.8.3",
     "@uniswap/v2-periphery": "^1.1.0-beta.0",
     "prompt-confirm": "^2.0.4"
   },

diff --git a/tools/libraries/package.json b/tools/libraries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/libraries",
-  "version": "4.3.1",
+  "version": "4.3.2",
   "description": "AirSwap: Libraries for Developers",
   "repository": {
     "type": "git",
@@ -22,15 +22,15 @@
     "test:ci": "yarn test"
   },
   "dependencies": {
-    "@airswap/batch-call": "4.2.2",
+    "@airswap/batch-call": "4.2.3",
     "@airswap/jsonrpc-client-websocket": "0.0.1",
-    "@airswap/registry": "4.2.1",
-    "@airswap/pool": "4.2.1",
-    "@airswap/staking": "4.2.1",
-    "@airswap/swap": "4.2.1",
-    "@airswap/swap-erc20": "4.3.0",
+    "@airswap/registry": "4.2.2",
+    "@airswap/pool": "4.2.2",
+    "@airswap/staking": "4.2.2",
+    "@airswap/swap": "4.2.2",
+    "@airswap/swap-erc20": "4.3.1",
     "@airswap/utils": "4.3.0",
-    "@airswap/wrapper": "4.2.2",
+    "@airswap/wrapper": "4.2.3",
     "browser-or-node": "^2.1.1",
     "ethers": "^5.7.2",
     "jayson": "^4.0.0",

diff --git a/tools/utils/src/constants.ts b/tools/utils/src/constants.ts
@@ -162,7 +162,7 @@ export const apiUrls: Record<number, string> = {
   [ChainIds.AVALANCHE]: 'https://api.avax.network/ext/bc/C/rpc',
   [ChainIds.LINEAGOERLI]: 'https://rpc.goerli.linea.build',
   [ChainIds.LINEA]: 'https://rpc.linea.build',
-  [ChainIds.MUMBAI]: 'https://rpc-mumbai.maticvigil.com',
+  [ChainIds.MUMBAI]: 'https://gateway.tenderly.co/public/polygon-mumbai',
   [ChainIds.BASESEPOLIA]: 'https://sepolia.base.org',
   [ChainIds.ARBITRUMSEPOLIA]: 'https://sepolia-rollup.arbitrum.io/rpc',
   [ChainIds.SEPOLIA]: 'https://ethereum-sepolia.publicnode.com',