From ad48cb01cb265c4e309c5cfeeb38edab182b6e3a Mon Sep 17 00:00:00 2001 From: Ethan Date: Sat, 6 Jun 2020 17:48:12 -0400 Subject: [PATCH 01/10] Add script to install testchain outputs across all packages --- .../scripts/install-testchain-outputs.sh | 4 ++-- .../scripts/install-testchain-outputs.sh | 4 ++-- .../scripts/install-testchain-outputs.sh | 4 ++-- .../scripts/install-testchain-outputs.sh | 4 ++-- packages/dai/scripts/install-testchain-outputs.sh | 4 ++-- scripts/install-testchain-outputs.sh | 10 ++++++++++ 6 files changed, 20 insertions(+), 10 deletions(-) create mode 100755 scripts/install-testchain-outputs.sh diff --git a/packages/dai-plugin-governance/scripts/install-testchain-outputs.sh b/packages/dai-plugin-governance/scripts/install-testchain-outputs.sh index 1eca45520..7a562c6d5 100755 --- a/packages/dai-plugin-governance/scripts/install-testchain-outputs.sh +++ b/packages/dai-plugin-governance/scripts/install-testchain-outputs.sh @@ -2,8 +2,8 @@ set -e CWD=`dirname $0` -CONTRACTS=$CWD/../contracts -SOURCE=${1:-$CWD/../../../node_modules/@makerdao/testchain} +CONTRACTS=$CWD/../packages/dai-plugin-governance/contracts +SOURCE=${1:-$CWD/../node_modules/@makerdao/testchain} 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 diff --git a/packages/dai-plugin-mcd/scripts/install-testchain-outputs.sh b/packages/dai-plugin-mcd/scripts/install-testchain-outputs.sh index 66910e9ca..080d326c1 100755 --- a/packages/dai-plugin-mcd/scripts/install-testchain-outputs.sh +++ b/packages/dai-plugin-mcd/scripts/install-testchain-outputs.sh @@ -4,8 +4,8 @@ set -e # TODO take the source directory as a parameter CWD=`dirname $0` -CONTRACTS=$CWD/../contracts -SOURCE=${1:-$CWD/../../../node_modules/@makerdao/testchain} +CONTRACTS=$CWD/../packages/dai-plugin-mcd/contracts +SOURCE=${1:-$CWD/../node_modules/@makerdao/testchain} for file in $SOURCE/out/mcd/*.abi; do cp $file $CONTRACTS/abis/$(basename $file .abi).json diff --git a/packages/dai-plugin-migrations/scripts/install-testchain-outputs.sh b/packages/dai-plugin-migrations/scripts/install-testchain-outputs.sh index 7d3e9c08f..ee65aac77 100755 --- a/packages/dai-plugin-migrations/scripts/install-testchain-outputs.sh +++ b/packages/dai-plugin-migrations/scripts/install-testchain-outputs.sh @@ -4,8 +4,8 @@ set -e # TODO take the source directory as a parameter CWD=`dirname $0` -CONTRACTS=$CWD/../contracts -SOURCE=${1:-$CWD/../../../node_modules/@makerdao/testchain} +CONTRACTS=$CWD/../packages/dai-plugin-migrations/contracts +SOURCE=${1:-$CWD/../node_modules/@makerdao/testchain} # Relevant contracts from SCD: for CONTRACT in "TUB","SaiTub" "REDEEMER","Redeemer" "OLD_MKR","DSToken" "OLD_CHIEF","DSChief" "SAI_CAGEFREE","CageFree" "OLD_VOTE_PROXY_FACTORY","VoteProxyFactory" diff --git a/packages/dai-plugin-scd/scripts/install-testchain-outputs.sh b/packages/dai-plugin-scd/scripts/install-testchain-outputs.sh index 688707b66..4acdf51fd 100755 --- a/packages/dai-plugin-scd/scripts/install-testchain-outputs.sh +++ b/packages/dai-plugin-scd/scripts/install-testchain-outputs.sh @@ -2,8 +2,8 @@ set -e CWD=`dirname $0` -CONTRACTS=$CWD/../contracts -SOURCE=${1:-$CWD/../../../node_modules/@makerdao/testchain} +CONTRACTS=$CWD/../packages/dai-plugin-scd/contracts +SOURCE=${1:-$CWD/../node_modules/@makerdao/testchain} function jq_inplace { TMP=$(mktemp) diff --git a/packages/dai/scripts/install-testchain-outputs.sh b/packages/dai/scripts/install-testchain-outputs.sh index 688707b66..eef288e00 100755 --- a/packages/dai/scripts/install-testchain-outputs.sh +++ b/packages/dai/scripts/install-testchain-outputs.sh @@ -2,8 +2,8 @@ set -e CWD=`dirname $0` -CONTRACTS=$CWD/../contracts -SOURCE=${1:-$CWD/../../../node_modules/@makerdao/testchain} +CONTRACTS=$CWD/../packages/dai/contracts +SOURCE=${1:-$CWD/../node_modules/@makerdao/testchain} function jq_inplace { TMP=$(mktemp) diff --git a/scripts/install-testchain-outputs.sh b/scripts/install-testchain-outputs.sh new file mode 100755 index 000000000..6e18dd90d --- /dev/null +++ b/scripts/install-testchain-outputs.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +set -e + +CWD=`dirname $0` + +. $CWD/../packages/dai-plugin-mcd/scripts/install-testchain-outputs.sh +. $CWD/../packages/dai-plugin-scd/scripts/install-testchain-outputs.sh +. $CWD/../packages/dai/scripts/install-testchain-outputs.sh +. $CWD/../packages/dai-plugin-migrations/scripts/install-testchain-outputs.sh +. $CWD/../packages/dai-plugin-governance/scripts/install-testchain-outputs.sh \ No newline at end of file From d16c23c9d8da724f0b5555c9faeb377c5a71e1d7 Mon Sep 17 00:00:00 2001 From: Ethan Date: Sat, 6 Jun 2020 17:50:53 -0400 Subject: [PATCH 02/10] Update testchain and install outputs --- package.json | 2 +- .../contracts/addresses/testnet.json | 10 +- .../contracts/addresses/testnet.json | 151 +++++++++--------- .../contracts/addresses/testnet.json | 28 ++-- .../contracts/addresses/testnet.json | 31 ++-- packages/dai/contracts/addresses/testnet.json | 2 +- yarn.lock | 10 +- 7 files changed, 114 insertions(+), 120 deletions(-) diff --git a/package.json b/package.json index b2acdbe9c..45e62e32d 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.6", "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-mcd/contracts/addresses/testnet.json b/packages/dai-plugin-mcd/contracts/addresses/testnet.json index 0850f9eb3..eb148446e 100644 --- a/packages/dai-plugin-mcd/contracts/addresses/testnet.json +++ b/packages/dai-plugin-mcd/contracts/addresses/testnet.json @@ -1,100 +1,93 @@ { - "BAT": "0x120A978e83BEeac3DBBB856b35941618A52986d5", - "CDP_MANAGER": "0xb3dc8De316349D8cE5168FE33C2E75c4f0cd0FFE", + "BAT": "0xEB9d9336b4A89260bC4B94ee6a34e2faF46B0CA5", + "CDP_MANAGER": "0xAE3AFb153a36d3E48D4CbC2D0A83EBF9fD2f89Ca", "DEPLOYER": "0x16Fb96a5fa0427Af0C8F7cF1eB4870231c8154B6", - "DGD": "0xfFE1912a78AA9E556cC80a4F3822551F5bB1A119", + "DGD": "0x4aF6E9FA188161FD283DC8d51619615d00ef3F01", + "DSR_MANAGER": "0x2B0B998110C0038336a8d5609c4E3A0AC35Af0f4", "ETH": "0x7ba25F791FA76C3ef40AC98ed42634a8bC24c238", - "FAUCET": "0xbD4d6688B679F27Bf6829922A4AE4E43D29153E4", - "FLIPPER_MOM": "0xd7e93C4B43A55fe3DbEBe4c89991769d01c3E76d", - "GET_CDPS": "0x883c76966eA1D1AFEC54a1c20f84A57a287BB021", - "GNT": "0x2D1E17cD66E68173d2a6DCaCcf640ce613D75983", - "MCD_ADM": "0x00ED8CcEF5351aF14aa6214e6153c39a5e1d1528", - "MCD_CAT": "0x36fdda9B5DAbdDA030598116D09f1E1c6bB1DeaB", - "MCD_DAI": "0x88015F50fb5b2bB1aBF8a9C3e1Db231E267b5C4f", - "MCD_DEPLOY": "0x3ea503Fb236e6eE3B4d48b6Bd96Ba5F7Cf68AF94", - "MCD_END": "0xb002A319887185e56d787A5c90900e13834a85E3", - "MCD_ESM": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43", - "MCD_FLAP": "0x2A92CCF051f33912115f86eA0530f4999E3AC1Ac", - "MCD_FLIP_BAT_A": "0x25ff5F18C0b2e00749bcd564B0a8519B75d46Ed8", - "MCD_FLIP_DGD_A": "0x4add0e51f43f43A1930316c036157d86c0A36B9D", - "MCD_FLIP_ETH_A": "0xBDe07Bb0c774f41a59901876454637E3FeAB8C73", - "MCD_FLIP_ETH_B": "0xC928B33616df7b603879247b8BAfbF12b5a645A7", - "MCD_FLIP_ETH_C": "0x26953EeA2F75430AD336Fa5e6385659CF085621b", - "MCD_FLIP_GNT_A": "0xbA84F99DF52445073c24F71337C2aC10d16A12Df", - "MCD_FLIP_OMG_A": "0x7E1dce941eDf0172D564e9f9da2453039A41aAa3", - "MCD_FLIP_REP_A": "0xcad20ff35c9F2803eAB7324bf41DD3931349b077", - "MCD_FLIP_SAI": "0x8Fcc971E5F73e2F8e40313C16Ad17AD10696f01C", - "MCD_FLIP_USDC_A": "0xb957a5d4113eC015AF73796099e6654d66A6115e", - "MCD_FLIP_WBTC_A": "0x65CAFd3a6eAefA22d503adb48dd2e0811e945600", - "MCD_FLIP_ZRX_A": "0x4d1B37D96ab3B54d8Ada05A17D649a8e7fA6Bf0e", - "MCD_FLOP": "0x19E602E0dC93749Ea7aFa0C88F4693d4C02102D3", + "FAUCET": "0x5e73B1F57f673EC875C1624D7C13F06Ef8259b23", + "FLIPPER_MOM": "0x061a2B2662AC2C1AAfe9b39Fc6e4c6730e01bE5E", + "GET_CDPS": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2", + "GNT": "0x49058F4F6c8C3E1b75aeD7AA45e06c439b9429f0", + "MCD_ADM": "0xd97fd1B5867cC71AfA32A0c36d38102241856Cde", + "MCD_CAT": "0x88015F50fb5b2bB1aBF8a9C3e1Db231E267b5C4f", + "MCD_DAI": "0x55320248dC50Ef6dABc88ECbc294Fd5e2e1f4eC6", + "MCD_DEPLOY": "0x72b59ACcB5a9a9e47296fbeF741bF2Bc82FFDE62", + "MCD_END": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43", + "MCD_ESM": "0x32fE44E2061A19419C0F112596B6f6ea77EC6511", + "MCD_FLAP": "0x19E602E0dC93749Ea7aFa0C88F4693d4C02102D3", + "MCD_FLIP_BAT_A": "0x8f28BB6447368AD9eBAD0Da79703Dba3c338bb10", + "MCD_FLIP_DGD_A": "0xdE5D18140244ECF90aADb6460239446fC8226D65", + "MCD_FLIP_ETH_A": "0xCe1410e4b98058fA7534FA8fcEe28E82056EB0e9", + "MCD_FLIP_ETH_B": "0x80ba561ED1D06A53A2f5c3A50dEf17Fac48f4466", + "MCD_FLIP_ETH_C": "0x2697faB781b68640B1A98A8E080EAeA639dAB7bE", + "MCD_FLIP_GNT_A": "0x3aefde6f900E8841A99844e365D95Bfd62D7C5e9", + "MCD_FLIP_OMG_A": "0xA418bBE1E7f8DFC2D78C4b7E36Cf100d53A62D23", + "MCD_FLIP_REP_A": "0x40F7ED727Cc7E76f2Ab91Ca6648e1Ea8C33608DA", + "MCD_FLIP_TUSD_A": "0xD6D91193dC275945208Dc3D79716d9C2E9c95249", + "MCD_FLIP_USDC_A": "0xBfa1975B1DBB70cf96340142d5D88686096956DC", + "MCD_FLIP_USDC_B": "0x5Ffcf6974C8C3447aDD56Bc0049CDb817bD87559", + "MCD_FLIP_WBTC_A": "0xA156b084cb4882d5F224F21E8051FFF18347dDE7", + "MCD_FLIP_ZRX_A": "0xe3a6Bdb923Eb4542C96db93307213C4e79cdF822", + "MCD_FLOP": "0xBDe07Bb0c774f41a59901876454637E3FeAB8C73", "MCD_GOV": "0x1c3ac7216250eDC5B9DaA5598DA0579688b9dbD5", - "MCD_GOV_ACTIONS": "0x5d2132779D43A0B64F1f3e824B8A3163438358e8", - "MCD_IOU": "0xe46C4EB99d5EB00DBeFE6Eb0c2BD34F3EB2899CF", - "MCD_JOIN_BAT_A": "0xEB9d9336b4A89260bC4B94ee6a34e2faF46B0CA5", - "MCD_JOIN_DAI": "0x55320248dC50Ef6dABc88ECbc294Fd5e2e1f4eC6", - "MCD_JOIN_DGD_A": "0x4aF6E9FA188161FD283DC8d51619615d00ef3F01", - "MCD_JOIN_ETH_A": "0xF7Cbc73FE7d30c68AD7b64D293D4F52F76027261", - "MCD_JOIN_ETH_B": "0x6741A0FECce6ecbf7C1f338dE624F63d970497EA", - "MCD_JOIN_ETH_C": "0xF2ea44B10D559c7bcBf156861efFd3425fb5E5Fb", - "MCD_JOIN_GNT_A": "0x49058F4F6c8C3E1b75aeD7AA45e06c439b9429f0", - "MCD_JOIN_OMG_A": "0x927F29F213c691ACe67cBC9FDb6eBBfd04D07EC4", - "MCD_JOIN_REP_A": "0xDC901A38a2Ec3283556F039b115423049517B50c", - "MCD_JOIN_SAI": "0x565e5E6d6C43Aff09A5b3C2b33d710d9c2c63e06", - "MCD_JOIN_USDC_A": "0x77d6250c22eCBA016a4F6D1a917BF5b2ED0704C5", - "MCD_JOIN_WBTC_A": "0x23c9aafE0d1968EaC6d9F1edb9FA831641783FEd", - "MCD_JOIN_ZRX_A": "0xc677d837a437c24Db14E1225416d52BcC9B86E94", - "MCD_JUG": "0x8D68d36D45A34A6Ff368069bD0baa32ad49A6092", - "MCD_PAUSE": "0x32fE44E2061A19419C0F112596B6f6ea77EC6511", - "MCD_PAUSE_PROXY": "0xB8065F28CbAf91C2674a980c17432821bC3E8F4a", - "MCD_POT": "0x7aDf0ddD0776042B87FA7F504270257c269bF61e", - "MCD_SPOT": "0xCe1410e4b98058fA7534FA8fcEe28E82056EB0e9", - "MCD_VAT": "0xF2Cba62837A52B0c1847f225438C82D050b4aC19", - "MCD_VOW": "0x8C4Be23DE45F82a4feC7a93F69929Bd2A13A4777", - "MIGRATION": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2", - "MIGRATION_PROXY_ACTIONS": "0x19BDC4b950285a608E50F3b5E7DF154FacBda861", - "MULTICALL": "0x298E3eb3C76938DA922EF01b99c87dF156985701", - "OMG": "0x64ED8f151dAc0f40f45DaccEBa2f2712641A9B50", - "OSM_MOM": "0x378100E78ccEf442F38f1FcFdc4B4352884bcb67", + "MCD_GOV_ACTIONS": "0xe46C4EB99d5EB00DBeFE6Eb0c2BD34F3EB2899CF", + "MCD_IOU": "0x04De75eD338D41D2E901bf703179D1049883aF5b", + "MCD_JOIN_BAT_A": "0x8752bdE45da8B2665CD36754A39FD5cc82F0AD05", + "MCD_JOIN_DAI": "0x2A92CCF051f33912115f86eA0530f4999E3AC1Ac", + "MCD_JOIN_DGD_A": "0xb782CEe543F1a9A0724F32731f53DcdD198C2695", + "MCD_JOIN_ETH_A": "0x71ce2f5A1ee392425B749956f9B58481A7c6b707", + "MCD_JOIN_ETH_B": "0x61aFcbadDfeEFE7155416248cB51511d73b94e42", + "MCD_JOIN_ETH_C": "0xE9658D1356890E06987C2D769B7d76cAedBcFf4b", + "MCD_JOIN_GNT_A": "0xA5DD0E5906fAc83862581C5DCA85CF926ABFa09b", + "MCD_JOIN_OMG_A": "0x666866f71a978f119acEc358543c1E72FC27637d", + "MCD_JOIN_REP_A": "0xEc93D8Ea996Da9Ffe359778F3DaE6134DF0de016", + "MCD_JOIN_TUSD_A": "0x689E9DC3214aC88F312FdD148684BF199cCF596c", + "MCD_JOIN_USDC_A": "0x8a339ADa3b96d6139BBDCe3Bd0375725Fc411133", + "MCD_JOIN_USDC_B": "0xcf4a441593Fbf1Bf56960674C5a3a18049C7bbe2", + "MCD_JOIN_WBTC_A": "0x6C0604d4b3EBB76DBA48cC0B5a54Bd0f260d962c", + "MCD_JOIN_ZRX_A": "0x2a5F3e35aBA017435b3c8A66F64da3509a6A71Ec", + "MCD_JUG": "0x8C4Be23DE45F82a4feC7a93F69929Bd2A13A4777", + "MCD_PAUSE": "0x9F3CEceFEb8bCCEd859A983cB3A9b4DA65D79bD1", + "MCD_PAUSE_PROXY": "0xB68fbD349C6810a96a4cA1035e6Afb29CC10e401", + "MCD_POT": "0xb002A319887185e56d787A5c90900e13834a85E3", + "MCD_SPOT": "0x7aDf0ddD0776042B87FA7F504270257c269bF61e", + "MCD_VAT": "0x8D68d36D45A34A6Ff368069bD0baa32ad49A6092", + "MCD_VOW": "0x36fdda9B5DAbdDA030598116D09f1E1c6bB1DeaB", + "MULTICALL": "0xbD4d6688B679F27Bf6829922A4AE4E43D29153E4", + "OMG": "0x927F29F213c691ACe67cBC9FDb6eBBfd04D07EC4", + "OSM_MOM": "0x296D06095288397615E024AfF4FeCc0C57edF70B", "PIP_BAT": "0xdD35201726c511474e7E1EE426B5C78B014AddCc", "PIP_DGD": "0xb564f1dC7D220f8E20de45547de71620543c0053", "PIP_ETH": "0x2B2fBfcA02F8C29c750ed193828b40887e8BBb32", "PIP_GNT": "0x9783d28387f5097d72397388d98c52Ca9b18dec8", "PIP_OMG": "0xE0d81d47aC1e791dd2559013cf1fF005e619d733", "PIP_REP": "0x2d3AdFCa1e6aD360A138cBCF2F286f70a5Ff614A", - "PIP_SAI": "0x8A74211B5fC144A846fD1daA4dC8ABbB6268E18f", + "PIP_TUSD": "0x870Cc2aFa004e22a49CAEa7392CC3bCD2ca96A3A", "PIP_USDC": "0xA70B7c2a55a76f89b64b4b15381FfF87279dD3d7", - "PIP_WBTC": "0x870Cc2aFa004e22a49CAEa7392CC3bCD2ca96A3A", + "PIP_WBTC": "0x298E3eb3C76938DA922EF01b99c87dF156985701", "PIP_ZRX": "0x80f178c7b47cb635Ceb12aBB891338744e98365C", - "PROXY_ACTIONS": "0x0E69131732c7700d5d598350504ba885D677CCA8", - "PROXY_ACTIONS_DSR": "0xE425CA42d0CB22D0D82366f6B811d559cff437B4", - "PROXY_ACTIONS_END": "0x5E6085775Cd0B41fC70d1A6B48a0451bf7aCa801", - "PROXY_DEPLOYER": "0xde78bC0e2a1C5118773b692F5ed999f3B626F1AF", - "PROXY_FACTORY": "0x5e73B1F57f673EC875C1624D7C13F06Ef8259b23", - "PROXY_PAUSE_ACTIONS": "0xAE130aEcdF43abbEfdBb97D87bA8Ea38f922CcD8", - "PROXY_REGISTRY": "0x7294588Da9cA5494fa6861A10B1Cc26096dC3b11", - "REP": "0xC3e78EA1b93D134f795c84e01caa2966f2180892", - "SAI": "0xC226F3CD13d508bc319F4f4290172748199d6612", - "SAI_TUB": "0xE82CE3D6Bf40F2F9414C8d01A35E3d9eb16a1761", - "USDC": "0xDa4EbE73ff9e11FC6f97cEf200199Ddb385d7982", + "PROXY_ACTIONS": "0x565e5E6d6C43Aff09A5b3C2b33d710d9c2c63e06", + "PROXY_ACTIONS_DSR": "0xE6666822E10D3c5c33726Ea732506AaA50Ea0C88", + "PROXY_ACTIONS_END": "0x9dFCC19cc49f9961020a152629Db481F12b6b4Ba", + "PROXY_DEPLOYER": "0xe502f772B4303dD6ae8A7A0167c38C8dc9BeA922", + "PROXY_FACTORY": "0x7294588Da9cA5494fa6861A10B1Cc26096dC3b11", + "PROXY_PAUSE_ACTIONS": "0x00ED8CcEF5351aF14aa6214e6153c39a5e1d1528", + "PROXY_REGISTRY": "0xc6c39b56d3dafcb213b4344D54e70E232b10ca48", + "REP": "0xDC901A38a2Ec3283556F039b115423049517B50c", + "TUSD": "0x7581e647b7b5d522B198EF44F51E1121b3D837B0", + "USDC": "0x77d6250c22eCBA016a4F6D1a917BF5b2ED0704C5", "VAL_BAT": "0xdD35201726c511474e7E1EE426B5C78B014AddCc", "VAL_DGD": "0xb564f1dC7D220f8E20de45547de71620543c0053", "VAL_ETH": "0x2B2fBfcA02F8C29c750ed193828b40887e8BBb32", "VAL_GNT": "0x9783d28387f5097d72397388d98c52Ca9b18dec8", "VAL_OMG": "0xE0d81d47aC1e791dd2559013cf1fF005e619d733", "VAL_REP": "0x2d3AdFCa1e6aD360A138cBCF2F286f70a5Ff614A", + "VAL_TUSD": "0x870Cc2aFa004e22a49CAEa7392CC3bCD2ca96A3A", "VAL_USDC": "0xA70B7c2a55a76f89b64b4b15381FfF87279dD3d7", - "VAL_WBTC": "0x870Cc2aFa004e22a49CAEa7392CC3bCD2ca96A3A", + "VAL_WBTC": "0x298E3eb3C76938DA922EF01b99c87dF156985701", "VAL_ZRX": "0x80f178c7b47cb635Ceb12aBB891338744e98365C", - "VOTE_PROXY_FACTORY": "0x9d0C1845c18bD93FB3514705715AAc54FB2135dd", - "WBTC": "0xcf4a441593Fbf1Bf56960674C5a3a18049C7bbe2", - "ZRX": "0xb13094D7341fA2F77aD8a5eD61A9bB7cF9F62093", - - "MCD_JOIN_USDC_B": "0x77d6250c22eCBA016a4F6D1a917BF5b2ED0704C5", - "MCD_FLIP_USDC_B": "0xb957a5d4113eC015AF73796099e6654d66A6115e", - "TUSD": "0xDa4EbE73ff9e11FC6f97cEf200199Ddb385d7982", - "PIP_TUSD": "0xA70B7c2a55a76f89b64b4b15381FfF87279dD3d7", - "MCD_JOIN_TUSD_A": "0x77d6250c22eCBA016a4F6D1a917BF5b2ED0704C5", - "MCD_FLIP_TUSD_A": "0xb957a5d4113eC015AF73796099e6654d66A6115e" - + "VOTE_PROXY_FACTORY": "0x17c7D82597A3a07AEd1FDF1db560B7502AeB3ADf", + "WBTC": "0x2A3a2f87403d675748eb11B6fCe92a16A0084eb6", + "ZRX": "0xc677d837a437c24Db14E1225416d52BcC9B86E94" } diff --git a/packages/dai-plugin-migrations/contracts/addresses/testnet.json b/packages/dai-plugin-migrations/contracts/addresses/testnet.json index f78df368e..1d14853ac 100644 --- a/packages/dai-plugin-migrations/contracts/addresses/testnet.json +++ b/packages/dai-plugin-migrations/contracts/addresses/testnet.json @@ -1,23 +1,23 @@ { "TUB": "0xE82CE3D6Bf40F2F9414C8d01A35E3d9eb16a1761", "TAP": "0x6896659267c3c9fd055d764327199a98e571e00d", - "GET_CDPS_1": "0x883c76966eA1D1AFEC54a1c20f84A57a287BB021", - "CDP_MANAGER_1": "0xb3dc8De316349D8cE5168FE33C2E75c4f0cd0FFE", - "MCD_END_1": "0xb002A319887185e56d787A5c90900e13834a85E3", - "MCD_VAT_1": "0xF2Cba62837A52B0c1847f225438C82D050b4aC19", - "MCD_DAI_1": "0x88015F50fb5b2bB1aBF8a9C3e1Db231E267b5C4f", - "MCD_POT_1": "0x7aDf0ddD0776042B87FA7F504270257c269bF61e", + "GET_CDPS_1": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2", + "CDP_MANAGER_1": "0xAE3AFb153a36d3E48D4CbC2D0A83EBF9fD2f89Ca", + "MCD_END_1": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43", + "MCD_VAT_1": "0x8D68d36D45A34A6Ff368069bD0baa32ad49A6092", + "MCD_DAI_1": "0x55320248dC50Ef6dABc88ECbc294Fd5e2e1f4eC6", + "MCD_POT_1": "0xb002A319887185e56d787A5c90900e13834a85E3", "REDEEMER": "0x2DaF1c09275B0b72277909377Eb20CCf10eFA02E", "OLD_MKR": "0xa3bFc24194007416fa73fC6E3A7D3B245f647d6E", "OLD_CHIEF": "0x1d24598fa8B77811E68243A2746CC553E68ca03B", "OLD_VOTE_PROXY_FACTORY": "0xa9D33Ce18803b0742460ffb1b33B6c40f95178BC", - "MIGRATION": "0x2978B18F7c68B2957e701FC6D82C8De5B55833f2", - "MIGRATION_PROXY_ACTIONS": "0x19BDC4b950285a608E50F3b5E7DF154FacBda861", - "PROXY_ACTIONS_END": "0x5E6085775Cd0B41fC70d1A6B48a0451bf7aCa801", - "MCD_JOIN_ETH_A": "0xF7Cbc73FE7d30c68AD7b64D293D4F52F76027261", - "MCD_JOIN_DAI": "0x55320248dC50Ef6dABc88ECbc294Fd5e2e1f4eC6", - "MCD_JOIN_BAT_A": "0xEB9d9336b4A89260bC4B94ee6a34e2faF46B0CA5", - "MCD_JOIN_USDC_A": "0x77d6250c22eCBA016a4F6D1a917BF5b2ED0704C5", + "MIGRATION": null, + "MIGRATION_PROXY_ACTIONS": null, + "PROXY_ACTIONS_END": "0x9dFCC19cc49f9961020a152629Db481F12b6b4Ba", + "MCD_JOIN_ETH_A": "0x71ce2f5A1ee392425B749956f9B58481A7c6b707", + "MCD_JOIN_DAI": "0x2A92CCF051f33912115f86eA0530f4999E3AC1Ac", + "MCD_JOIN_BAT_A": "0x8752bdE45da8B2665CD36754A39FD5cc82F0AD05", + "MCD_JOIN_USDC_A": "0x8a339ADa3b96d6139BBDCe3Bd0375725Fc411133", "SAI_CAGEFREE": "0xb0ae8c0856259C6fe000F8e2C14507E5FC167D48", - "MCD_ESM": "0x2125C30dA5DcA0819aEC5e4cdbF58Bfe91918e43" + "MCD_ESM": "0x32fE44E2061A19419C0F112596B6f6ea77EC6511" } diff --git a/packages/dai-plugin-scd/contracts/addresses/testnet.json b/packages/dai-plugin-scd/contracts/addresses/testnet.json index 4ff3d2cd9..df43474c2 100644 --- a/packages/dai-plugin-scd/contracts/addresses/testnet.json +++ b/packages/dai-plugin-scd/contracts/addresses/testnet.json @@ -1,20 +1,20 @@ { "ETH_FROM": "0x16fb96a5fa0427af0c8f7cf1eb4870231c8154b6", - "SAI_GEM": "0x7ba25f791fa76c3ef40ac98ed42634a8bc24c238", - "SAI_GOV": "0x1c3ac7216250edc5b9daa5598da0579688b9dbd5", - "SAI_PIP": "0xb7092ee7a8c4c85431962662310bbdcd4fd519e9", - "SAI_PEP": "0xc0ee05307ae4a5316f34874a3525d10c94b3c217", - "SAI_PIT": "0x0000000000000000000000000000000000000123", - "SAI_ADM": "0x4986C24C7f752C2ac2D738F1270639Dd9E9D7BF5", + "GEM": "0x7ba25f791fa76c3ef40ac98ed42634a8bc24c238", + "GOV": "0x1c3ac7216250edc5b9daa5598da0579688b9dbd5", + "PIP": "0xb7092ee7a8c4c85431962662310bbdcd4fd519e9", + "PEP": "0xc0ee05307ae4a5316f34874a3525d10c94b3c217", + "PIT": "0x0000000000000000000000000000000000000123", + "ADM": "0x4986C24C7f752C2ac2D738F1270639Dd9E9D7BF5", "SAI": "0xC226F3CD13d508bc319F4f4290172748199d6612", - "SAI_SIN": "0xE9E2B40d676Fc998EdE8c676D9f529CCbbc13740", - "SAI_SKR": "0xA6164A2e88e258A663772ED4912a0865af8f6d06", - "SAI_DAD": "0x7b61731911E46Da837E3dcD2d8797DE684c8cEd1", - "SAI_MOM": "0x603D52D6AE2b98A49f8f32817ad4EfFe7E8A2502", - "SAI_VOX": "0xE16bf7AaFeB33cC921d6D311E0ff33C4faA836dD", - "SAI_TUB": "0xE82CE3D6Bf40F2F9414C8d01A35E3d9eb16a1761", - "SAI_TAP": "0x6896659267C3C9FD055d764327199A98E571e00D", - "SAI_TOP": "0x2774031B3898fbe414F929b3223cE1039325e7Dc", + "SIN": "0xE9E2B40d676Fc998EdE8c676D9f529CCbbc13740", + "SKR": "0xA6164A2e88e258A663772ED4912a0865af8f6d06", + "DAD": "0x7b61731911E46Da837E3dcD2d8797DE684c8cEd1", + "MOM": "0x603D52D6AE2b98A49f8f32817ad4EfFe7E8A2502", + "VOX": "0xE16bf7AaFeB33cC921d6D311E0ff33C4faA836dD", + "TUB": "0xE82CE3D6Bf40F2F9414C8d01A35E3d9eb16a1761", + "TAP": "0x6896659267C3C9FD055d764327199A98E571e00D", + "TOP": "0x2774031B3898fbe414F929b3223cE1039325e7Dc", "MAKER_OTC": "0x06ef37A95603cb52e2dFF4C2b177C84Cdb3cE989", "PROXY_REGISTRY": "0x23F67A19Dc232835EAedA2075728f8295f54dfCA", "DS_PROXY": "0x0x570074CCb147ea3dE2E23fB038D4d78324278886", @@ -27,5 +27,6 @@ "POLLING": "0x9A2810a12197CB844af4BA74a4b81bC1CA727130", "OLD_VOTE_PROXY_FACTORY": "0xa9D33Ce18803b0742460ffb1b33B6c40f95178BC", "LINE_SPELL": "0x26ea0dd33Aa37e15D95a9Ae166092a139Ad62013", - "SAI_CAGEFREE": "0xb0ae8c0856259C6fe000F8e2C14507E5FC167D48" + "SAI_CAGEFREE": "0xb0ae8c0856259C6fe000F8e2C14507E5FC167D48", + "MULTICALL": "0xbD4d6688B679F27Bf6829922A4AE4E43D29153E4" } diff --git a/packages/dai/contracts/addresses/testnet.json b/packages/dai/contracts/addresses/testnet.json index d04abf79e..df43474c2 100644 --- a/packages/dai/contracts/addresses/testnet.json +++ b/packages/dai/contracts/addresses/testnet.json @@ -28,5 +28,5 @@ "OLD_VOTE_PROXY_FACTORY": "0xa9D33Ce18803b0742460ffb1b33B6c40f95178BC", "LINE_SPELL": "0x26ea0dd33Aa37e15D95a9Ae166092a139Ad62013", "SAI_CAGEFREE": "0xb0ae8c0856259C6fe000F8e2C14507E5FC167D48", - "MULTICALL": "0x298E3eb3C76938DA922EF01b99c87dF156985701" + "MULTICALL": "0xbD4d6688B679F27Bf6829922A4AE4E43D29153E4" } diff --git a/yarn.lock b/yarn.lock index 821ef20fb..6f45fb308 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1896,10 +1896,10 @@ dependencies: node-fetch "^2.6.0" -"@makerdao/testchain@^1.1.5": - version "1.1.5" - resolved "https://registry.yarnpkg.com/@makerdao/testchain/-/testchain-1.1.5.tgz#85be3f25cf245d21aa54263eb07a29cb54a6714c" - integrity sha512-a1wmYI97UeVFa9IJfhEK6yuFmEjJzkcHPWzTlrAmEu2uc4LO3E9NchE6xQlAj5S0E4NXNn2B9CciqmbrllNA+g== +"@makerdao/testchain@^1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@makerdao/testchain/-/testchain-1.1.6.tgz#f5d50ecb4551c34daa7229580be5d5c4a4b80d40" + integrity sha512-ISL+dAqqmFynOU6i1IO+1bE4kTVBpklu0ubTdlQVVsUmziKiMEiDPDHhuffAmBMGb7gXKSRUVWt09xN2Vc+DcA== dependencies: ganache-cli makerdao/ganache-cli#fix/gas-est-crash @@ -6037,7 +6037,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@makerdao/ganache-cli#fix/gas-est-crash: +"ganache-cli@github: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: From e130efb42b10d167f05fa180e86c70f0526e863a Mon Sep 17 00:00:00 2001 From: Ethan Date: Sat, 6 Jun 2020 18:53:34 -0400 Subject: [PATCH 03/10] Skip tests that rely on deprecated migration contracts --- packages/dai-plugin-governance/umd/index.js | 2 +- packages/dai-plugin-governance/umd/index.js.map | 2 +- .../dai-plugin-migrations/test/MigrationService.spec.js | 2 +- .../dai-plugin-migrations/test/migrations/DaiToSai.spec.js | 2 +- .../dai-plugin-migrations/test/migrations/SaiToDai.spec.js | 2 +- .../test/migrations/SingleToMultiCdp.spec.js | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) 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("