From 76d5c8efb997afd15bb6d777ad76a9b35009bd8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draic=20=C3=93=20Mh=C3=BAiris?=
 <patrick.morris.310@gmail.com>
Date: Mon, 27 Jul 2020 15:56:35 +0100
Subject: [PATCH] Collateral: Mana (#244)

---
 packages/dai-plugin-mcd/contracts/abiMap.js              | 3 ++-
 packages/dai-plugin-mcd/contracts/addresses/kovan.json   | 7 ++++++-
 packages/dai-plugin-mcd/contracts/addresses/mainnet.json | 8 +++++++-
 packages/dai-plugin-mcd/contracts/addresses/testnet.json | 7 ++++++-
 packages/dai-plugin-mcd/package.json                     | 2 +-
 packages/dai-plugin-mcd/src/index.js                     | 4 +++-
 yarn.lock                                                | 2 +-
 7 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/packages/dai-plugin-mcd/contracts/abiMap.js b/packages/dai-plugin-mcd/contracts/abiMap.js
index 11e8f7d28..07fc5a2cf 100644
--- a/packages/dai-plugin-mcd/contracts/abiMap.js
+++ b/packages/dai-plugin-mcd/contracts/abiMap.js
@@ -42,5 +42,6 @@ module.exports = {
   MIGRATION_PROXY_ACTIONS: require('./abis/MigrationProxyActions.json'),
   USDC: require('./abis/USDC.json'),
   WBTC: require('./abis/WBTC.json'),
-  TUSD: require('./abis/DSToken.json')
+  TUSD: require('./abis/DSToken.json'),
+  MANA: require('./abis/DSToken.json')
 };
diff --git a/packages/dai-plugin-mcd/contracts/addresses/kovan.json b/packages/dai-plugin-mcd/contracts/addresses/kovan.json
index eae2d11b8..5c7d51403 100644
--- a/packages/dai-plugin-mcd/contracts/addresses/kovan.json
+++ b/packages/dai-plugin-mcd/contracts/addresses/kovan.json
@@ -66,5 +66,10 @@
   "KNC": "0x9800a0a3c7e9682e1AEb7CAA3200854eFD4E9327",
   "PIP_KNC": "0x10799280EF9d7e2d037614F5165eFF2cB8522651",
   "MCD_JOIN_KNC_A": "0xE42427325A0e4c8e194692FfbcACD92C2C381598",
-  "MCD_FLIP_KNC_A": "0xf14Ec3538C86A31bBf576979783a8F6dbF16d571"
+  "MCD_FLIP_KNC_A": "0xf14Ec3538C86A31bBf576979783a8F6dbF16d571",
+
+  "MANA": "0x221F4D62636b7B51b99e36444ea47Dc7831c2B2f",
+  "PIP_MANA": "0xE97D2b077Fe19c80929718d377981d9F754BF36e",
+  "MCD_JOIN_MANA_A": "0xdC9Fe394B27525e0D9C827EE356303b49F607aaF",
+  "MCD_FLIP_MANA_A": "0x5CB9D33A9fE5244019e6F5f45e68F18600805264"
 }
diff --git a/packages/dai-plugin-mcd/contracts/addresses/mainnet.json b/packages/dai-plugin-mcd/contracts/addresses/mainnet.json
index e8e95049a..de0a155cb 100644
--- a/packages/dai-plugin-mcd/contracts/addresses/mainnet.json
+++ b/packages/dai-plugin-mcd/contracts/addresses/mainnet.json
@@ -70,5 +70,11 @@
   "MCD_FLIP_KNC_A": "0xAbBCB9Ae89cDD3C27E02D279480C7fF33083249b",
   "MCD_FLIP_ZRX_A": "0x08c89251FC058cC97d5bA5F06F95026C0A5CF9B0",
   "MCD_JOIN_KNC_A": "0x475F1a89C1ED844A08E8f6C50A00228b5E59E4A9",
-  "MCD_JOIN_ZRX_A": "0xc7e8Cd72BDEe38865b4F5615956eF47ce1a7e5D0"
+  "MCD_JOIN_ZRX_A": "0xc7e8Cd72BDEe38865b4F5615956eF47ce1a7e5D0",
+
+  "MANA": "0x0F5D2fB29fb7d3CFeE444a200298f468908cC942",
+  "PIP_MANA": "0x8067259EA630601f319FccE477977E55C6078C13",
+  "MCD_FLIP_MANA_A": "0x4bf9D2EBC4c57B9B783C12D30076507660B58b3a",
+  "MCD_JOIN_MANA_A": "0xA6EA3b9C04b8a38Ff5e224E7c3D6937ca44C0ef9"
+
 }
diff --git a/packages/dai-plugin-mcd/contracts/addresses/testnet.json b/packages/dai-plugin-mcd/contracts/addresses/testnet.json
index 9697682c0..0c9dfa05d 100644
--- a/packages/dai-plugin-mcd/contracts/addresses/testnet.json
+++ b/packages/dai-plugin-mcd/contracts/addresses/testnet.json
@@ -96,5 +96,10 @@
   "WBTC": "0x689E9DC3214aC88F312FdD148684BF199cCF596c",
   "ZRX": "0x6C0604d4b3EBB76DBA48cC0B5a54Bd0f260d962c",
   "MIGRATION": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2",
-  "MCD_JOIN_SAI": "0x565e5E6d6C43Aff09A5b3C2b33d710d9c2c63e06"
+  "MCD_JOIN_SAI": "0x565e5E6d6C43Aff09A5b3C2b33d710d9c2c63e06",
+
+  "MANA": "0x6C0604d4b3EBB76DBA48cC0B5a54Bd0f260d962c",
+  "PIP_MANA": "0x298E3eb3C76938DA922EF01b99c87dF156985701",
+  "MCD_JOIN_MANA_A": "0x0E69131732c7700d5d598350504ba885D677CCA8",
+  "MCD_FLIP_MANA_A": "0xf8944De297f1De398E66E8f6493eB88a366A4FaC"
 }
diff --git a/packages/dai-plugin-mcd/package.json b/packages/dai-plugin-mcd/package.json
index 299d657a6..d7000873b 100644
--- a/packages/dai-plugin-mcd/package.json
+++ b/packages/dai-plugin-mcd/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@makerdao/dai-plugin-mcd",
   "description": "Plugin to add Multi-Collateral Dai support to dai.js",
-  "version": "1.5.13",
+  "version": "1.5.14-rc.1",
   "license": "MIT",
   "main": "dist/index.js",
   "unpkg": "umd/index.js",
diff --git a/packages/dai-plugin-mcd/src/index.js b/packages/dai-plugin-mcd/src/index.js
index ee2be9896..d9de641fa 100644
--- a/packages/dai-plugin-mcd/src/index.js
+++ b/packages/dai-plugin-mcd/src/index.js
@@ -71,6 +71,7 @@ export const GNT = createCurrency('GNT');
 export const USDC = createCurrency('USDC');
 export const WBTC = createCurrency('WBTC');
 export const TUSD = createCurrency('TUSD');
+export const MANA = createCurrency('MANA');
 
 export const defaultCdpTypes = [
   { currency: ETH, ilk: 'ETH-A' },
@@ -80,7 +81,8 @@ export const defaultCdpTypes = [
   { currency: USDC, ilk: 'USDC-B', decimals: 6 },
   { currency: TUSD, ilk: 'TUSD-A', decimals: 18 },
   { currency: KNC, ilk: 'KNC-A', decimals: 18 },
-  { currency: ZRX, ilk: 'ZRX-A', decimals: 18 }
+  { currency: ZRX, ilk: 'ZRX-A', decimals: 18 },
+  { currency: MANA, ilk: 'MANA-A', decimals: 18 }
 ];
 
 export const SAI = createCurrency('SAI');
diff --git a/yarn.lock b/yarn.lock
index 59151e153..eec9bae1d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6229,7 +6229,7 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-"ganache-cli@github:makerdao/ganache-cli#fix/gas-est-crash":
+ganache-cli@makerdao/ganache-cli#fix/gas-est-crash:
   version "6.4.3-beta.0"
   resolved "https://codeload.github.com/makerdao/ganache-cli/tar.gz/3e512b61da2479042627e6155231dcb038110650"
   dependencies: