diff --git a/package.json b/package.json index b2acdbe9c..48a12558b 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@babel/plugin-proposal-throw-expressions": "^7.2.0", "@babel/plugin-transform-runtime": "^7.3.4", "@babel/preset-env": "^7.4.5", - "@makerdao/testchain": "^1.1.5", + "@makerdao/testchain": "^1.1.8", "babel-eslint": "^10.0.3", "babel-jest": "^24.8.0", "babel-loader": "^8.0.5", diff --git a/packages/dai-plugin-governance/contracts/addresses/testnet.json b/packages/dai-plugin-governance/contracts/addresses/testnet.json index 005d78623..32c1860a4 100644 --- a/packages/dai-plugin-governance/contracts/addresses/testnet.json +++ b/packages/dai-plugin-governance/contracts/addresses/testnet.json @@ -1,10 +1,10 @@ { "GOV": "0x1c3ac7216250edc5b9daa5598da0579688b9dbd5", - "IOU": "0xe46C4EB99d5EB00DBeFE6Eb0c2BD34F3EB2899CF", - "CHIEF": "0x00ED8CcEF5351aF14aa6214e6153c39a5e1d1528", + "IOU": "0x04De75eD338D41D2E901bf703179D1049883aF5b", + "CHIEF": "0xd97fd1B5867cC71AfA32A0c36d38102241856Cde", "POLLING": "0x9A2810a12197CB844af4BA74a4b81bC1CA727130", - "VOTE_PROXY_FACTORY": "0x9d0C1845c18bD93FB3514705715AAc54FB2135dd", - "MCD_ESM": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43", - "MCD_END": "0xb002A319887185e56d787A5c90900e13834a85E3", + "VOTE_PROXY_FACTORY": "0x17c7D82597A3a07AEd1FDF1db560B7502AeB3ADf", + "MCD_ESM": "0x32fE44E2061A19419C0F112596B6f6ea77EC6511", + "MCD_END": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43", "PAUSE": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43" } diff --git a/packages/dai-plugin-governance/scripts/install-testchain-outputs.sh b/packages/dai-plugin-governance/scripts/install-testchain-outputs.sh index 1eca45520..38a825300 100755 --- a/packages/dai-plugin-governance/scripts/install-testchain-outputs.sh +++ b/packages/dai-plugin-governance/scripts/install-testchain-outputs.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash set -e -CWD=`dirname $0` -CONTRACTS=$CWD/../contracts -SOURCE=${1:-$CWD/../../../node_modules/@makerdao/testchain} +CONTRACTS=$GOVERNANCE/contracts CHIEF=`jq ".MCD_ADM" "$SOURCE/out/addresses-mcd.json"` jq ".CHIEF=$CHIEF" $CONTRACTS/addresses/testnet.json > testnet.tmp && mv testnet.tmp $CONTRACTS/addresses/testnet.json @@ -16,7 +14,7 @@ POLLING=`jq ".POLLING" "$SOURCE/out/addresses.json"` jq ".POLLING=$POLLING" $CONTRACTS/addresses/testnet.json > testnet.tmp && mv testnet.tmp $CONTRACTS/addresses/testnet.json cp $SOURCE/out/PollingEmitter.abi $CONTRACTS/abis/Polling.json -GOV=`jq ".GOV" "$SOURCE/out/addresses.json"` +GOV=`jq ".SAI_GOV" "$SOURCE/out/addresses.json"` jq ".GOV=$GOV" $CONTRACTS/addresses/testnet.json > testnet.tmp && mv testnet.tmp $CONTRACTS/addresses/testnet.json for CONTRACT in "VOTE_PROXY_FACTORY","VoteProxyFactory" "MCD_ESM","ESM" "MCD_END","End" diff --git a/packages/dai-plugin-governance/umd/index.js b/packages/dai-plugin-governance/umd/index.js index 042be30a7..4a7efd428 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 u=r[i]={i:i,l:!1,exports:{}};return t[i].call(u.exports,u,u.exports,__webpack_require__),u.l=!0,u.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 u in t)__webpack_require__.d(i,u,function(r){return t[r]}.bind(null,u));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,a.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 u=i(60)(Object,"create");t.exports=u},function(t,r,i){var u=i(61),a=i(186),c=i(187),l=u?u.toStringTag:void 0;t.exports=function baseGetTag(t){return null==t?void 0===t?"[object Undefined]":"[object Null]":l&&l in Object(t)?a(t):c(t)}},function(t,r,i){var u=i(199);t.exports=function assocIndexOf(t,r){for(var i=t.length;i--;)if(u(t[i][0],r))return i;return-1}},function(t,r,i){var u=i(205);t.exports=function getMapData(t,r){var i=t.__data__;return u(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 u=i(113);t.exports=function(t,r,i){if(u(t),void 0===r)return t;switch(i){case 1:return function(i){return t.call(r,i)};case 2:return function(i,u){return t.call(r,i,u)};case 3:return function(i,u,a){return t.call(r,i,u,a)}}return function(){return t.apply(r,arguments)}}},function(t,r,i){var u=i(20);t.exports=function(t,r){if(!u(t))return t;var i,a;if(r&&"function"==typeof(i=t.toString)&&!u(a=i.call(t)))return a;if("function"==typeof(i=t.valueOf)&&!u(a=i.call(t)))return a;if(!r&&"function"==typeof(i=t.toString)&&!u(a=i.call(t)))return a;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,u=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?u:i)(t)}},function(t,r,i){var u=i(47)("keys"),a=i(33);t.exports=function(t){return u[t]||(u[t]=a(t))}},function(t,r,i){var u=i(4),a=i(12),c=a["__core-js_shared__"]||(a["__core-js_shared__"]={});(t.exports=function(t,r){return c[t]||(c[t]=void 0!==r?r:{})})("versions",[]).push({version:u.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 u=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=u(r,i),this._i+=t.length,{value:t,done:!1})}))},function(t,r,i){var u=i(16),a=i(124),c=i(48),l=i(46)("IE_PROTO"),Empty=function(){},createDict=function(){var t,r=i(69)("iframe"),u=c.length;for(r.style.display="none",i(125).appendChild(r),r.src="javascript:",(t=r.contentWindow.document).open(),t.write("