Merge branch 'dev' of https://github.com/makerdao/dai.js into dev

makerdao · Jun 4, 2020 · 011be51 · 011be51
2 parents 1f557ec + 1f8abef
commit 011be51
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/packages/dai-plugin-governance/umd/index.js b/packages/dai-plugin-governance/umd/index.js
diff --git a/packages/dai-plugin-governance/umd/index.js.LICENSE.txt b/packages/dai-plugin-governance/umd/index.js.LICENSE.txt
@@ -10,3 +10,10 @@ object-assign
  * @author   Feross Aboukhadijeh <[email protected]> <http://feross.org>
  * @license  MIT
  */
+
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <http://feross.org>
+ * @license  MIT
+ */
diff --git a/packages/dai-plugin-governance/umd/index.js.map b/packages/dai-plugin-governance/umd/index.js.map
diff --git a/packages/dai-plugin-mcd/contracts/addresses/mainnet.json b/packages/dai-plugin-mcd/contracts/addresses/mainnet.json
@@ -56,7 +56,7 @@
   "MCD_JOIN_WBTC_A": "0xBF72Da2Bd84c5170618Fbe5914B0ECA9638d5eb5",
   "MCD_FLIP_WBTC_A": "0x3E115d85D4d7253b05fEc9C0bB5b08383C2b0603",
 
-  "TUSD":"0xCB9a11afDC6bDb92E4A6235959455F28758b34bA",
+  "TUSD":"0x0000000000085d4780B73119b644AE5ecd22b376",
   "MCD_JOIN_USDC_B":"0x2600004fd1585f7270756DDc88aD9cfA10dD0428",
   "MCD_FLIP_USDC_B": "0xec25Ca3fFa512afbb1784E17f1D414E16D01794F",
   "MCD_JOIN_TUSD_A": "0x4454aF7C8bb9463203b66C816220D41ED7837f44",

diff --git 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.5",
+  "version": "1.5.6",
   "license": "MIT",
   "main": "dist/index.js",
   "unpkg": "umd/index.js",

diff --git a/packages/dai-plugin-migrations/contracts/addresses/kovan.json b/packages/dai-plugin-migrations/contracts/addresses/kovan.json
@@ -1,17 +1,17 @@
 {
   "TUB": "0xa71937147b55Deb8a530C7229C442Fd3F31b7db2",
-  "GET_CDPS_1": "0x592301a23d37c591c5856f28726af820af8e7014",
-  "CDP_MANAGER_1": "0x1476483dd8c35f25e568113c5f70249d3976ba21",
-  "MCD_END_1": "0x24728acf2e2c403f5d2db4df6834b8998e56aa5f",
-  "MCD_VAT_1": "0xba987bdb501d131f766fee8180da5d81b34b69d9",
-  "MCD_DAI_1": "0x4f96fe3b7a6cf9725f59d353f723c1bdb64ca6aa",
-  "MCD_POT_1": "0xea190dbdc7adf265260ec4da6e9675fd4f5a78bb",
+  "GET_CDPS_1": "0x592301a23d37c591C5856f28726AF820AF8e7014",
+  "CDP_MANAGER_1": "0x1476483dD8C35F25e568113C5f70249D3976ba21",
+  "MCD_END_1": "0x24728AcF2E2C403F5d2db4Df6834B8998e56aA5F",
+  "MCD_VAT_1": "0xbA987bDB501d131f766fEe8180Da5d81b34b69d9",
+  "MCD_DAI_1": "0x4F96Fe3b7A6Cf9725f59d353F723c1bDb64CA6Aa",
+  "MCD_POT_1": "0xEA190DBDC7adF265260ec4dA6e9675Fd4f5A78bb",
   "REDEEMER": "0x2c0f31271673cc29927be725104642aad65a253e",
   "OLD_MKR": "0x4bb514a7f83fbb13c2b41448208e89fabbcfe2fb",
-  "MIGRATION": "0x411b2faa662c8e3e5cf8f01dfdae0aee482ca7b0",
-  "MIGRATION_PROXY_ACTIONS": "0xf56765d255463139d3aff1613705a5520764ab93",
+  "MIGRATION": "0x411B2Faa662C8e3E5cF8f01dFdae0aeE482ca7b0",
+  "MIGRATION_PROXY_ACTIONS": "0xF56765d255463139d3aff1613705a5520764Ab93",
   "OLD_CHIEF": "0xbbffc76e94b34f72d96d054b31f6424249c1337d",
-  "OLD_VOTE_PROXY_FACTORY": "0x3E08741A68c2d964d172793cD0Ad14292F658cd8",
+  "OLD_VOTE_PROXY_FACTORY": null,
   "PROXY_ACTIONS_END": "0x7c3f28f174F2b0539C202a5307Ff48efa61De982",
   "MCD_JOIN_ETH_A": "0x775787933e92b709f2a3c70aa87999696e74a9f8",
   "MCD_JOIN_DAI": "0x5aa71a3ae1c0bd6ac27a1f28e1415fffb6f15b8c",