Improve error handling, added new token to config, published new packages

packages/addresses/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oasisdex/addresses",
-  "version": "0.1.72",
+  "version": "0.1.74",
   "typings": "lib/index.d.ts",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",

packages/deploy-configurations/configs/mainnet.conf.ts

@@ -693,6 +693,10 @@ export const config: SystemConfig = {
       name: 'MATIC',
       address: '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0',
     },
+    MKR: {
+      name: 'MKR',
+      address: '0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2',
+    },
     MORPHO: {
       name: 'MORPHO',
       address: '0x9994e35db50125e0df82e4c2dde62496ce330999',

packages/deploy-configurations/configs/shared/common-defaults.ts

@@ -12,11 +12,10 @@ export const commonDefaults = {
     name: 'CRV',
     address: ADDRESS_ZERO,
   },
-  // For MKR use McdGov instead
-  // MKR: {
-  //   name: 'MKR',
-  //   address: ADDRESS_ZERO,
-  // },
+  MKR: {
+    name: 'MKR',
+    address: ADDRESS_ZERO,
+  },
   OP: {
     name: 'OP',
     address: ADDRESS_ZERO,

packages/deploy-configurations/types/deployment-config/tokens.ts

@@ -31,6 +31,7 @@ export type Tokens =
   | 'LUSD'
   | 'MANA'
   | 'MATIC'
+  | 'MKR'
   | 'MORPHO'
   | 'MEVETH'
   | 'MPETH'

packages/dma-library/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oasisdex/dma-library",
-  "version": "0.6.58",
+  "version": "0.6.59",
   "typings": "lib/index.d.ts",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
@@ -13,7 +13,8 @@
     "lib/*"
   ],
   "scripts": {
-    "build": "npx parcel build ./src/index.ts --dist-dir ./lib",
+    "build": "npx parcel build ./src/index.ts --dist-dir ./lib --no-optimize",
+    "build:dev": "npx parcel build ./src/index.ts --dist-dir ./lib --no-optimize --no-content-hash",
     "clean": "rm -rf lib && rm -f tsconfig.lint.tsbuildinfo",
     "lint": "yarn eslint . --ext .ts --max-warnings=0 && yarn tsc --build ./tsconfig.lint.json",
     "lint:fix": "yarn eslint . --fix --ext .ts",

packages/dma-library/src/strategies/aave/common/get-aave-token-addresses.ts

@@ -14,7 +14,7 @@ export const getAaveTokenAddress = (
   }
 
   if (!tokenAddress || tokenAddress === EMPTY_ADDRESS)
-    throw new Error('Token not recognised or address missing in dependencies')
+    throw new Error('Token not recognised or address missing in dependencies: ' + token.symbol)
 
   return tokenAddress
 }

packages/dma-library/src/strategies/morphoblue/multiply/open.ts

@@ -489,15 +489,17 @@ export async function getTokenSymbol(
     return await erc20.symbol()
   } catch (e) {
     // It's required because for example MKR token symbol() returns bytes32 instead of string
-    console.warn('Issue with getting token symbol as string, trying to fetch as bytes32...')
+    console.warn(
+      `Issue with getting a symbol for ${token} token as string type, trying to fetch as bytes32...`,
+    )
 
     try {
       const erc20 = new ethers.Contract(token, getTokenSymbolAbi('bytes32'), provider)
       const symbol = await erc20.symbol()
 
       return ethers.utils.parseBytes32String(symbol)
     } catch (e) {
-      console.error('Failed to get token symbol')
+      console.error(`Failed to get token symbol for: ${token} token`)
       return 'UNKNOWN_SYMBOL'
     }
   }