Consolidate Protocols; Update TS (#1232)

* Bump axios from 0.21.4 to 1.6.0 (#1230)

Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v0.21.4...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update protocols; update tsconfig

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

source/balances/package.json

@@ -29,7 +29,7 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.1.3",
+    "@airswap/constants": "^4.1.4",
     "@airswap/utils": "^4.1.6",
     "prompt-confirm": "^2.0.4"
   },

source/pool/package.json

@@ -31,7 +31,7 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.1.3",
+    "@airswap/constants": "^4.1.4",
     "@airswap/metadata": "^4.1.8",
     "@airswap/types": "^4.1.1",
     "@airswap/utils": "^4.1.6",

source/registry/package.json

@@ -32,7 +32,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.1.3",
+    "@airswap/constants": "^4.1.4",
     "@airswap/utils": "^4.1.6",
     "prompt-confirm": "^2.0.4"
   }

source/swap-erc20/package.json

@@ -29,7 +29,7 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.1.3",
+    "@airswap/constants": "^4.1.4",
     "@airswap/staking": "4.0.4",
     "@airswap/types": "^4.1.1",
     "@airswap/utils": "^4.1.6",

source/swap/package.json

@@ -32,7 +32,7 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.1.3",
+    "@airswap/constants": "^4.1.4",
     "@airswap/types": "^4.1.1",
     "@airswap/utils": "^4.1.6",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.7"

source/wrapper/package.json

@@ -32,7 +32,7 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.1.3",
+    "@airswap/constants": "^4.1.4",
     "@airswap/utils": "^4.1.6",
     "@airswap/types": "^4.1.1",
     "@uniswap/v2-periphery": "^1.1.0-beta.0",

tools/constants/index.ts

@@ -204,8 +204,7 @@ export const protocolFeeReceiverAddresses: Record<number, string> = {
 export enum Protocols {
   Discovery = '0xf3713ede',
   RequestForQuoteERC20 = '0x02ad05d3',
-  PricingERC20 = '0x8beb22c2',
-  LastLookERC20 = '0xb2b78b33',
+  LastLookERC20 = '0x395ca9f1',
   StorageERC20 = '0xfdd616a7',
   Storage = '0xd8b0f31f',
 }
@@ -223,14 +222,12 @@ export const protocolInterfaces: Record<string, string[]> = {
     'function getPricingERC20(array((string baseToken,string quoteToken)),string minExpiry)',
     'function getAllPricingERC20(string minExpiry)',
   ],
-  [Protocols.PricingERC20]: [
+  [Protocols.LastLookERC20]: [
     'function subscribePricingERC20(array((string baseToken,string quoteToken)))',
     'function subscribeAllPricingERC20()',
     'function unsubscribePricingERC20(array((string baseToken,string quoteToken)))',
     'function unsubscribeAllPricingERC20()',
     'function setPricingERC20(array(string baseToken,string quoteToken,string minimum,array(array((string level,string price))),array(array((string level,string price)))))',
-  ],
-  [Protocols.LastLookERC20]: [
     'function considerOrderERC20(string chainId,string swapContractAddress,string nonce,string expiry,string signerWallet,string signerToken,string signerAmount,string senderToken,string senderAmount,string v,string r,string s)',
   ],
   [Protocols.StorageERC20]: [
@@ -246,7 +243,6 @@ export const protocolInterfaces: Record<string, string[]> = {
 export const protocolNames: Record<string, string> = {
   [Protocols.Discovery]: 'Discovery',
   [Protocols.RequestForQuoteERC20]: 'Request for Quote (ERC20)',
-  [Protocols.PricingERC20]: 'Pricing (ERC20)',
   [Protocols.LastLookERC20]: 'Last Look (ERC20)',
   [Protocols.StorageERC20]: 'Storage (ERC20)',
   [Protocols.Storage]: 'Storage',

tools/constants/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airswap/constants",
-  "version": "4.1.3",
+  "version": "4.1.4",
   "description": "AirSwap: Constants for Developers",
   "repository": {
     "type": "git",

tools/libraries/package.json

@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@airswap/balances": "4.0.2",
-    "@airswap/constants": "^4.1.3",
+    "@airswap/constants": "^4.1.4",
     "@airswap/jsonrpc-client-websocket": "0.0.1",
     "@airswap/registry": "4.1.2",
     "@airswap/pool": "4.1.3",

tools/metadata/package.json

@@ -20,12 +20,12 @@
     "test": "TS_NODE_COMPILER_OPTIONS='{\"strict\":false}' yarn mocha -r ts-node/esm test/*.ts"
   },
   "dependencies": {
-    "@airswap/constants": "^4.1.3",
+    "@airswap/constants": "^4.1.4",
     "@airswap/types": "^4.1.1",
     "@airswap/wrapper": "4.1.4",
     "@openzeppelin/contracts": "^4.8.3",
     "@uniswap/token-lists": "^1.0.0-beta.24",
-    "axios": "^0.21.4",
+    "axios": "^1.6.0",
     "ethers": "^5.6.9",
     "valid-url": "^1.0.9"
   },

tools/utils/package.json

@@ -21,7 +21,7 @@
     "test:ci": "yarn test"
   },
   "dependencies": {
-    "@airswap/constants": "^4.1.3",
+    "@airswap/constants": "^4.1.4",
     "@airswap/types": "^4.1.1",
     "@metamask/eth-sig-util": "^5.0.2",
     "bignumber.js": "^9.0.1",

tsconfig.json

@@ -1,12 +1,9 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "ESNext",
     "module": "commonjs",
-    "moduleResolution": "node",
-    "lib": ["es2021"],
+    "moduleResolution": "nodenext",
     "esModuleInterop": true,
-    "skipLibCheck": false,
-    "strict": true,
     "resolveJsonModule": true,
     "sourceMap": true,
     "declaration": true,

yarn.lock

@@ -2762,17 +2762,10 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3"
   integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
 
-axios@^0.21.4:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
-  dependencies:
-    follow-redirects "^1.14.0"
-
-axios@^1.0.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.5.tgz#e07209b39a0d11848e3e341fa087acd71dadc542"
-  integrity sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw==
+axios@^1.0.0, axios@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
+  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
   dependencies:
     follow-redirects "^1.15.0"
     form-data "^4.0.0"
@@ -4833,7 +4826,7 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
-follow-redirects@^1.12.1, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
+follow-redirects@^1.12.1, follow-redirects@^1.15.0:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==