From 4171aa8396bacd38440424bea561b68857e9a1eb Mon Sep 17 00:00:00 2001 From: Ethan Bennett Date: Tue, 28 Jul 2020 19:10:52 -0400 Subject: [PATCH] Fix outdated references to chief and iou --- packages/dai-plugin-governance/contracts/addresses/kovan.json | 4 ++-- .../dai-plugin-governance/contracts/addresses/mainnet.json | 4 ++-- .../dai-plugin-governance/contracts/addresses/testnet.json | 2 -- packages/dai-plugin-governance/src/index.js | 4 ++-- packages/dai-plugin-governance/umd/index.js | 2 +- packages/dai-plugin-governance/umd/index.js.map | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/dai-plugin-governance/contracts/addresses/kovan.json b/packages/dai-plugin-governance/contracts/addresses/kovan.json index 14899dc59..248756ca7 100644 --- a/packages/dai-plugin-governance/contracts/addresses/kovan.json +++ b/packages/dai-plugin-governance/contracts/addresses/kovan.json @@ -1,11 +1,11 @@ { - "CHIEF": "0xbbffc76e94b34f72d96d054b31f6424249c1337d", + "MCD_ADM": "0xbbffc76e94b34f72d96d054b31f6424249c1337d", "VOTE_PROXY_FACTORY": "0x3e08741a68c2d964d172793cd0ad14292f658cd8", "POLLING": "0x518a0702701BF98b5242E73b2368ae07562BEEA3", "BATCH_POLLING": "0xD931E7c869618dB6FD30cfE4e89248CAA091Ea5f", "MCD_ESM": "0x0c376764f585828ffb52471c1c35f855e312a06c", "MCD_END": "0x24728acf2e2c403f5d2db4df6834b8998e56aa5f", "GOV": "0xaaf64bfcc32d0f15873a02163e7e500671a4ffcd", - "IOU": "0x4D5d2F7E1284bc5c871ce3e1A997Bd8646c75ba5", + "MCD_IOU": "0x4D5d2F7E1284bc5c871ce3e1A997Bd8646c75ba5", "PAUSE": "0x8754e6ecb4fe68daa5132c2886ab39297a5c7189" } diff --git a/packages/dai-plugin-governance/contracts/addresses/mainnet.json b/packages/dai-plugin-governance/contracts/addresses/mainnet.json index 597727656..3beb33417 100644 --- a/packages/dai-plugin-governance/contracts/addresses/mainnet.json +++ b/packages/dai-plugin-governance/contracts/addresses/mainnet.json @@ -1,8 +1,8 @@ { - "CHIEF": "0x9eF05f7F6deB616fd37aC3c959a2dDD25A54E4F5", + "MCD_ADM": "0x9eF05f7F6deB616fd37aC3c959a2dDD25A54E4F5", "VOTE_PROXY_FACTORY": "0x868ba9aeacA5B73c7C27F3B01588bf4F1339F2bC", "GOV": "0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2", - "IOU": "0x496C67A4CEd9C453A60F3166AB4B329870c8E355", + "MCD_IOU": "0x496C67A4CEd9C453A60F3166AB4B329870c8E355", "POLLING": "0xF9be8F0945acDdeeDaA64DFCA5Fe9629D0CF8E5D", "BATCH_POLLING": "0xD3A9FE267852281a1e6307a1C37CDfD76d39b133", "MCD_ESM": "0x0581a0abe32aae9b5f0f68defab77c6759100085", diff --git a/packages/dai-plugin-governance/contracts/addresses/testnet.json b/packages/dai-plugin-governance/contracts/addresses/testnet.json index 80ef7c44c..1fc64bbe2 100644 --- a/packages/dai-plugin-governance/contracts/addresses/testnet.json +++ b/packages/dai-plugin-governance/contracts/addresses/testnet.json @@ -1,6 +1,4 @@ { - "IOU": "0x14f7e74A26a0e6791523451d85129babf01cFd44", - "CHIEF": "0x863d1CdF27146631585A274916C23A627Bd960C1", "POLLING": "0x9A2810a12197CB844af4BA74a4b81bC1CA727130", "BATCH_POLLING": "0xa9D33Ce18803b0742460ffb1b33B6c40f95178BC", "VOTE_PROXY_FACTORY": "0x059B38F71E37F6f66572946e9cc7C8052A3f6626", diff --git a/packages/dai-plugin-governance/src/index.js b/packages/dai-plugin-governance/src/index.js index 9c5aac37c..e5023783e 100644 --- a/packages/dai-plugin-governance/src/index.js +++ b/packages/dai-plugin-governance/src/index.js @@ -47,7 +47,7 @@ export default { const addContracts = { [CHIEF]: { - address: map(prop('CHIEF'), contractAddresses), + address: map(prop('MCD_ADM'), contractAddresses), // TODO check for MCD-specific version of DSChief abi: require('../contracts/abis/DSChief.json') }, @@ -99,7 +99,7 @@ export default { { currency: IOU, symbol: IOU.symbol, - address: contractAddresses[addressKey].IOU + address: contractAddresses[addressKey].MCD_IOU } ] } diff --git a/packages/dai-plugin-governance/umd/index.js b/packages/dai-plugin-governance/umd/index.js index 1c099806f..1cbec9b5e 100644 --- a/packages/dai-plugin-governance/umd/index.js +++ b/packages/dai-plugin-governance/umd/index.js @@ -1,3 +1,3 @@ /*! For license information please see index.js.LICENSE.txt */ -!function webpackUniversalModuleDefinition(t,r){"object"==typeof exports&&"object"==typeof module?module.exports=r():"function"==typeof define&&define.amd?define([],r):"object"==typeof exports?exports["@makerdao/dai-plugin-governance"]=r():t["@makerdao/dai-plugin-governance"]=r()}(window,(function(){return function(t){var r={};function __webpack_require__(i){if(r[i])return r[i].exports;var a=r[i]={i:i,l:!1,exports:{}};return t[i].call(a.exports,a,a.exports,__webpack_require__),a.l=!0,a.exports}return __webpack_require__.m=t,__webpack_require__.c=r,__webpack_require__.d=function(t,r,i){__webpack_require__.o(t,r)||Object.defineProperty(t,r,{enumerable:!0,get:i})},__webpack_require__.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},__webpack_require__.t=function(t,r){if(1&r&&(t=__webpack_require__(t)),8&r)return t;if(4&r&&"object"==typeof t&&t&&t.__esModule)return t;var i=Object.create(null);if(__webpack_require__.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:t}),2&r&&"string"!=typeof t)for(var a in t)__webpack_require__.d(i,a,function(r){return t[r]}.bind(null,a));return i},__webpack_require__.n=function(t){var r=t&&t.__esModule?function getDefault(){return t.default}:function getModuleExports(){return t};return __webpack_require__.d(r,"a",r),r},__webpack_require__.o=function(t,r){return Object.prototype.hasOwnProperty.call(t,r)},__webpack_require__.p="",__webpack_require__(__webpack_require__.s=109)}([function(t,r){t.exports=function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}},function(t,r){t.exports=function _classCallCheck(t,r){if(!(t instanceof r))throw new TypeError("Cannot call a class as a function")}},function(t,r){function _defineProperties(t,r){for(var i=0;i0})).forEach((function(t,r){for(var i=0;i2&&void 0!==arguments[2]?arguments[2]:[];if((0,u.default)(this,ServiceBase),r||(r=this.constructor.role),this.constructor.dependencies&&(i=this.constructor.dependencies),void 0===p.default[t])throw new Error("Invalid ServiceType: "+t);_defineLifeCycleMethods.call(this,t),this._serviceManager=_buildServiceManager.call(this,t,r,i),_installLifeCycleHooks.call(this,this._serviceManager),_guardLifeCycleMethods.call(this)}return(0,c.default)(ServiceBase,[{key:"manager",value:function manager(){return this._serviceManager}},{key:"get",value:function get(t){return this._serviceManager.dependency(t)}}]),ServiceBase}();r.default=y},function(t,r,i){var a=i(60)(Object,"create");t.exports=a},function(t,r,i){var a=i(61),u=i(186),c=i(187),l=a?a.toStringTag:void 0;t.exports=function baseGetTag(t){return null==t?void 0===t?"[object Undefined]":"[object Null]":l&&l in Object(t)?u(t):c(t)}},function(t,r,i){var a=i(199);t.exports=function assocIndexOf(t,r){for(var i=t.length;i--;)if(a(t[i][0],r))return i;return-1}},function(t,r,i){var a=i(205);t.exports=function getMapData(t,r){var i=t.__data__;return a(r)?i["string"==typeof r?"string":"hash"]:i.map}},function(t,r){t.exports=function isObjectLike(t){return null!=t&&"object"==typeof t}},function(t,r,i){var a=i(113);t.exports=function(t,r,i){if(a(t),void 0===r)return t;switch(i){case 1:return function(i){return t.call(r,i)};case 2:return function(i,a){return t.call(r,i,a)};case 3:return function(i,a,u){return t.call(r,i,a,u)}}return function(){return t.apply(r,arguments)}}},function(t,r,i){var a=i(20);t.exports=function(t,r){if(!a(t))return t;var i,u;if(r&&"function"==typeof(i=t.toString)&&!a(u=i.call(t)))return u;if("function"==typeof(i=t.valueOf)&&!a(u=i.call(t)))return u;if(!r&&"function"==typeof(i=t.toString)&&!a(u=i.call(t)))return u;throw TypeError("Can't convert object to primitive value")}},function(t,r){var i={}.toString;t.exports=function(t){return i.call(t).slice(8,-1)}},function(t,r){t.exports=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t}},function(t,r){var i=Math.ceil,a=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?a:i)(t)}},function(t,r,i){var a=i(47)("keys"),u=i(33);t.exports=function(t){return a[t]||(a[t]=u(t))}},function(t,r,i){var a=i(4),u=i(12),c=u["__core-js_shared__"]||(u["__core-js_shared__"]={});(t.exports=function(t,r){return c[t]||(c[t]=void 0!==r?r:{})})("versions",[]).push({version:a.version,mode:i(32)?"pure":"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})},function(t,r){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(t,r){r.f=Object.getOwnPropertySymbols},function(t,r,i){var a=i(122)(!0);i(78)(String,"String",(function(t){this._t=String(t),this._i=0}),(function(){var t,r=this._t,i=this._i;return i>=r.length?{value:void 0,done:!0}:(t=a(r,i),this._i+=t.length,{value:t,done:!1})}))},function(t,r,i){var a=i(16),u=i(124),c=i(48),l=i(46)("IE_PROTO"),Empty=function(){},createDict=function(){var t,r=i(69)("iframe"),a=c.length;for(r.style.display="none",i(125).appendChild(r),r.src="javascript:",(t=r.contentWindow.document).open(),t.write("