Update contract addresses to 1.1.0 (#27)

makerdao · Sep 4, 2020 · 69fdf5e · 69fdf5e
1 parent 16941ef
commit 69fdf5e
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 34 deletions.
diff --git a/libexec/mcd/conf/kovan.json b/libexec/mcd/conf/kovan.json
@@ -8,7 +8,7 @@
   "MCD_ADM": "0xbBFFC76e94B34F72D96D054b31f6424249c1337d",
   "MCD_VAT": "0xbA987bDB501d131f766fEe8180Da5d81b34b69d9",
   "MCD_JUG": "0xcbB7718c9F39d05aEEDE1c472ca8Bf804b2f1EaD",
-  "MCD_CAT": "0x0511674A67192FE51e86fE55Ed660eB4f995BDd6",
+  "MCD_CAT": "0xdDb5F7A3A5558b9a6a1f3382BD75E2268d1c6958",
   "MCD_VOW": "0x0F4Cbe6CBA918b7488C26E29d9ECd7368F38EA3b",
   "MCD_JOIN_DAI": "0x5AA71a3ae1C0bd6ac27A1f28e1415fFFB6F15B8c",
   "MCD_FLAP": "0xc6d3C83A080e2Ef16E4d7d4450A869d0891024F5",
@@ -27,45 +27,45 @@
   "CDP_MANAGER": "0x1476483dD8C35F25e568113C5f70249D3976ba21",
   "DSR_MANAGER": "0x7f5d60432DE4840a3E7AE7218f7D6b7A2412683a",
   "GET_CDPS": "0x592301a23d37c591C5856f28726AF820AF8e7014",
-  "ILK_REGISTRY": "0x6618BD7bBaBFacC518Fdec43542E4a73629B0819",
+  "ILK_REGISTRY": "0xedE45A0522CA19e979e217064629778d6Cc2d9Ea",
   "OSM_MOM": "0x5dA9D1C3d4f1197E5c52Ff963916Fe84D2F5d8f3",
-  "FLIPPER_MOM": "0xf3828caDb05E5F22844f6f9314D99516D68a0C84",
+  "FLIPPER_MOM": "0x50dC6120c67E456AdA2059cfADFF0601499cf681",
   "PROXY_FACTORY": "0xe11E3b391F7E8bC47247866aF32AF67Dd58Dc800",
   "PROXY_REGISTRY": "0x64A436ae831C1672AE81F674CAb8B6775df3475C",
   "ETH": "0xd0A1E359811322d97991E03f863a0C30C2cF029C",
   "PIP_ETH": "0x75dD74e8afE8110C8320eD397CcCff3B8134d981",
   "MCD_JOIN_ETH_A": "0x775787933e92b709f2a3C70aa87999696e74A9F8",
-  "MCD_FLIP_ETH_A": "0xc78EdADA7e8bEa29aCc3a31bBA1D516339deD350",
+  "MCD_FLIP_ETH_A": "0x750295A8db0580F32355f97de7918fF538c818F1",
   "BAT": "0x9f8cFB61D3B2aF62864408DD703F9C3BEB55dff7",
   "PIP_BAT": "0x5C40C9Eb35c76069fA4C3A00EA59fAc6fFA9c113",
   "MCD_JOIN_BAT_A": "0x2a4C485B1B8dFb46acCfbeCaF75b6188A59dBd0a",
-  "MCD_FLIP_BAT_A": "0xc0126c3383777bDc175E659A51020E56307dDe21",
+  "MCD_FLIP_BAT_A": "0x44Acf0eb2C7b9F0B55723e5289437AefE8ef7a1c",
   "USDC": "0xBD84be3C303f6821ab297b840a99Bd0d4c4da6b5",
   "PIP_USDC": "0x4c51c2584309b7BF328F89609FDd03B3b95fC677",
   "MCD_JOIN_USDC_A": "0x4c514656E7dB7B859E994322D2b511d99105C1Eb",
-  "MCD_FLIP_USDC_A": "0xc29Ad1913C3B415497fdA1eA15c132502B8fa372",
+  "MCD_FLIP_USDC_A": "0x17C144eaC1B3D6777eF2C3fA1F98e3BC3c18DB4F",
   "MCD_JOIN_USDC_B": "0xaca10483e7248453BB6C5afc3e403e8b7EeDF314",
-  "MCD_FLIP_USDC_B": "0x3c9eF711B68882d9732F60758e7891AcEae2Aa7c",
+  "MCD_FLIP_USDC_B": "0x6DCd745D91AB422e962d08Ed1a9242adB47D8d0C",
   "WBTC": "0x7419f744bBF35956020C1687fF68911cD777f865",
   "PIP_WBTC": "0x2f38a1bD385A9B395D01f2Cbf767b4527663edDB",
   "MCD_JOIN_WBTC_A": "0xB879c7d51439F8e7AC6b2f82583746A0d336e63F",
-  "MCD_FLIP_WBTC_A": "0x28dd4263e1FcE04A9016Bd7BF71a4f0F7aB93810",
+  "MCD_FLIP_WBTC_A": "0x80Fb08f2EF268f491D6B58438326a3006C1a0e09",
   "TUSD": "0xD6CE59F06Ff2070Dd5DcAd0866A7D8cd9270041a",
   "PIP_TUSD": "0xE4bAECdba7A8Ff791E14c6BF7e8089Dfdf75C7E7",
   "MCD_JOIN_TUSD_A": "0xe53f6755A031708c87d80f5B1B43c43892551c17",
-  "MCD_FLIP_TUSD_A": "0xD4A145d161729A4B43B7Ab7DD683cB9A16E01a1b",
+  "MCD_FLIP_TUSD_A": "0x867711f695e11663eC8adCFAAD2a152eFBA56dfD",
   "ZRX": "0xC2C08A566aD44129E69f8FC98684EAA28B01a6e7",
   "PIP_ZRX": "0x218037a42947E634191A231fcBAEAE8b16a39b3f",
   "MCD_JOIN_ZRX_A": "0x85D38fF6a6FCf98bD034FB5F9D72cF15e38543f2",
-  "MCD_FLIP_ZRX_A": "0xe07F1219f7d6ccD59431a6b151179A9181e3902c",
+  "MCD_FLIP_ZRX_A": "0x798eB3126f1d5cb54743E3e93D3512C58f461084",
   "KNC": "0x9800a0a3c7e9682e1AEb7CAA3200854eFD4E9327",
   "PIP_KNC": "0x10799280EF9d7e2d037614F5165eFF2cB8522651",
   "MCD_JOIN_KNC_A": "0xE42427325A0e4c8e194692FfbcACD92C2C381598",
-  "MCD_FLIP_KNC_A": "0x644699674D06cF535772D0DC19Ad5EA695000F51",
+  "MCD_FLIP_KNC_A": "0xF2c21882Bd14A5F7Cb46291cf3c86E53057FaD06",
   "MANA": "0x221F4D62636b7B51b99e36444ea47Dc7831c2B2f",
   "PIP_MANA": "0xE97D2b077Fe19c80929718d377981d9F754BF36e",
   "MCD_JOIN_MANA_A": "0xdC9Fe394B27525e0D9C827EE356303b49F607aaF",
-  "MCD_FLIP_MANA_A": "0x5CB9D33A9fE5244019e6F5f45e68F18600805264",
+  "MCD_FLIP_MANA_A": "0xb2B7430D49D2D2e7abb6a6B4699B2659c141A2a6",
   "PROXY_PAUSE_ACTIONS": "0x7c52826c1efEAE3199BDBe68e3916CC3eA222E29",
   "PROXY_DEPLOYER": "0xA9fCcB07DD3f774d5b9d02e99DE1a27f47F91189"
 }
diff --git a/libexec/mcd/conf/mainnet.json b/libexec/mcd/conf/mainnet.json
@@ -8,7 +8,7 @@
   "MCD_ADM": "0x9eF05f7F6deB616fd37aC3c959a2dDD25A54E4F5",
   "MCD_VAT": "0x35D1b3F3D7966A1DFe207aa4514C12a259A0492B",
   "MCD_JUG": "0x19c0976f590D67707E62397C87829d896Dc0f1F1",
-  "MCD_CAT": "0x78F2c2AF65126834c51822F56Be0d7469D7A523E",
+  "MCD_CAT": "0xa5679C04fc3d9d8b0AaB1F0ab83555b301cA70Ea",
   "MCD_VOW": "0xA950524441892A31ebddF91d3cEEFa04Bf454466",
   "MCD_JOIN_DAI": "0x9759A6Ac90977b93B58547b4A71c78317f391A28",
   "MCD_FLAP": "0xC4269cC7acDEdC3794b221aA4D9205F564e27f0d",
@@ -27,44 +27,44 @@
   "CDP_MANAGER": "0x5ef30b9986345249bc32d8928B7ee64DE9435E39",
   "DSR_MANAGER": "0x373238337Bfe1146fb49989fc222523f83081dDb",
   "GET_CDPS": "0x36a724Bd100c39f0Ea4D3A20F7097eE01A8Ff573",
-  "ILK_REGISTRY": "0xbE4F921cdFEf2cF5080F9Cf00CC2c14F1F96Bd07",
+  "ILK_REGISTRY": "0x8b4ce5DCbb01e0e1f0521cd8dCfb31B308E52c24",
   "OSM_MOM": "0x76416A4d5190d071bfed309861527431304aA14f",
-  "FLIPPER_MOM": "0x9BdDB99625A711bf9bda237044924E34E8570f75",
+  "FLIPPER_MOM": "0xc4bE7F74Ee3743bDEd8E0fA218ee5cf06397f472",
   "PROXY_FACTORY": "0xA26e15C895EFc0616177B7c1e7270A4C7D51C997",
   "PROXY_REGISTRY": "0x4678f0a6958e4D2Bc4F1BAF7Bc52E8F3564f3fE4",
   "ETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
   "PIP_ETH": "0x81FE72B5A8d1A857d176C3E7d5Bd2679A9B85763",
   "MCD_JOIN_ETH_A": "0x2F0b23f53734252Bda2277357e97e1517d6B042A",
-  "MCD_FLIP_ETH_A": "0x0F398a2DaAa134621e4b687FCcfeE4CE47599Cc1",
+  "MCD_FLIP_ETH_A": "0xF32836B9E1f47a0515c6Ec431592D5EbC276407f",
   "BAT": "0x0D8775F648430679A709E98d2b0Cb6250d2887EF",
   "PIP_BAT": "0xB4eb54AF9Cc7882DF0121d26c5b97E802915ABe6",
   "MCD_JOIN_BAT_A": "0x3D0B1912B66114d4096F48A8CEe3A56C231772cA",
-  "MCD_FLIP_BAT_A": "0x5EdF770FC81E7b8C2c89f71F30f211226a4d7495",
+  "MCD_FLIP_BAT_A": "0xF7C569B2B271354179AaCC9fF1e42390983110BA",
   "USDC": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
   "PIP_USDC": "0x77b68899b99b686F415d074278a9a16b336085A0",
   "MCD_JOIN_USDC_A": "0xA191e578a6736167326d05c119CE0c90849E84B7",
-  "MCD_FLIP_USDC_A": "0x545521e0105C5698f75D6b3C3050CfCC62FB0C12",
+  "MCD_FLIP_USDC_A": "0xbe359e53038E41a1ffA47DAE39645756C80e557a",
   "MCD_JOIN_USDC_B": "0x2600004fd1585f7270756DDc88aD9cfA10dD0428",
-  "MCD_FLIP_USDC_B": "0x6002d3B769D64A9909b0B26fC00361091786fe48",
+  "MCD_FLIP_USDC_B": "0x77282aD36aADAfC16bCA42c865c674F108c4a616",
   "WBTC": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
   "PIP_WBTC": "0xf185d0682d50819263941e5f4EacC763CC5C6C42",
   "MCD_JOIN_WBTC_A": "0xBF72Da2Bd84c5170618Fbe5914B0ECA9638d5eb5",
-  "MCD_FLIP_WBTC_A": "0xF70590Fa4AaBe12d3613f5069D02B8702e058569",
+  "MCD_FLIP_WBTC_A": "0x58CD24ac7322890382eE45A3E4F903a5B22Ee930",
   "TUSD": "0x0000000000085d4780B73119b644AE5ecd22b376",
   "PIP_TUSD": "0xeE13831ca96d191B688A670D47173694ba98f1e5",
   "MCD_JOIN_TUSD_A": "0x4454aF7C8bb9463203b66C816220D41ED7837f44",
-  "MCD_FLIP_TUSD_A": "0x04C42fAC3e29Fd27118609a5c36fD0b3Cb8090b3",
+  "MCD_FLIP_TUSD_A": "0x9E4b213C4defbce7564F2Ac20B6E3bF40954C440",
   "ZRX": "0xE41d2489571d322189246DaFA5ebDe1F4699F498",
   "PIP_ZRX": "0x7382c066801E7Acb2299aC8562847B9883f5CD3c",
-  "MCD_FLIP_ZRX_A": "0x92645a34d07696395b6e5b8330b000D0436A9aAD",
+  "MCD_FLIP_ZRX_A": "0xa4341cAf9F9F098ecb20fb2CeE2a0b8C78A18118",
   "MCD_JOIN_ZRX_A": "0xc7e8Cd72BDEe38865b4F5615956eF47ce1a7e5D0",
   "KNC": "0xdd974D5C2e2928deA5F71b9825b8b646686BD200",
   "PIP_KNC": "0xf36B79BD4C0904A5F350F1e4f776B81208c13069",
-  "MCD_FLIP_KNC_A": "0xAD4a0B5F3c6Deb13ADE106Ba6E80Ca6566538eE6",
+  "MCD_FLIP_KNC_A": "0x57B01F1B3C59e2C0bdfF3EC9563B71EEc99a3f2f",
   "MCD_JOIN_KNC_A": "0x475F1a89C1ED844A08E8f6C50A00228b5E59E4A9",
   "MANA": "0x0F5D2fB29fb7d3CFeE444a200298f468908cC942",
   "PIP_MANA": "0x8067259EA630601f319FccE477977E55C6078C13",
-  "MCD_FLIP_MANA_A": "0x4bf9D2EBC4c57B9B783C12D30076507660B58b3a",
+  "MCD_FLIP_MANA_A": "0x0a1D75B4f49BA80724a214599574080CD6B68357",
   "MCD_JOIN_MANA_A": "0xA6EA3b9C04b8a38Ff5e224E7c3D6937ca44C0ef9",
   "PROXY_PAUSE_ACTIONS": "0x6bda13D43B7EDd6CAfE1f70fB98b5d40f61A1370",
   "PROXY_DEPLOYER": "0x1b93556AB8dcCEF01Cd7823C617a6d340f53Fb58"

diff --git a/libexec/mcd/mcd-cdp b/libexec/mcd/mcd-cdp
@@ -6,12 +6,12 @@
 ###           count [<owner>]                 Cdp count
 ###           open                            Open a new Cdp
 ###           <id> urn                        Cdp state
-###           <id> lock <wad>                 Join & lock standard gem collateral
-###           <id> safe-lock <wad>            Join & safely lock standard gem collateral (checks it is your CDP)
-###           <id> free <wad>                 Free & exit standard gem collateral
-###           <id> draw <wad>                 Draw & exit dai
-###           <id> wipe <wad>                 Join & wipe dai
-###           <id> safe-wipe <wad>            Join & wipe dai (checks it is your CDP)
+###           <id> lock <amt>                 Join & lock standard gem collateral (amt in currency units)
+###           <id> safe-lock <amt>            Join & safely lock standard gem collateral (checks it is your CDP)
+###           <id> free <amt>                 Free & exit standard gem collateral
+###           <id> draw <amt>                 Draw & exit dai
+###           <id> wipe <amt>                 Join & wipe dai
+###           <id> safe-wipe <amt>            Join & wipe dai (checks it is your CDP)
 ###           <id> wipe-all                   Join & wipe dai to leave debt=0
 ###           <id> safe-wipe-all              Join & wipe dai to leave debt=0 (checks it is your CDP)
 ###           <id> give <address>             Give a Cdp to another owner

diff --git a/libexec/mcd/mcd-cdp-cmd b/libexec/mcd/mcd-cdp-cmd
@@ -16,7 +16,7 @@ require-wad() {
 require-amount() {
   [ -n "$1" ] || mcd --fail "mcd-cdp: Please specify an amount to $act"
   decimals=$(mcd gem decimals)
-  amount="$(echo "$1 * 10^$decimals" | bc)"
+  amount="$(printf "%.0f" "$(echo "$1 * 10^$decimals" | bc)")"
 }
 
 require-dst() {

diff --git a/libexec/mcd/mcd-gem-exit b/libexec/mcd/mcd-gem-exit
@@ -8,7 +8,7 @@ gem="$(mcd gem address)"
 exit="$(mcd gem adapter)"
 decimals="$(mcd gem decimals)"
 
-amount="$(echo "$1 * 10^$decimals" | bc)"
+amount="$(printf "%.0f" "$(echo "$1 * 10^$decimals" | bc)")"
 
 urn="$(mcd --get-urn "$gem")"
 

diff --git a/libexec/mcd/mcd-gem-join b/libexec/mcd/mcd-gem-join
@@ -7,7 +7,7 @@ mcd --require-ilk
 gem="$(mcd gem address)"
 join="$(mcd gem adapter)"
 decimals="$(mcd gem decimals)"
-amount="$(echo "$1 * 10^$decimals" | bc)"
+amount="$(printf "%.0f" "$(echo "$1 * 10^$decimals" | bc)")"
 
 mcd --gem-approve "$join" "$amount"
 

diff --git a/version b/version
@@ -1 +1 @@
-1.0.9-rc.1
+1.1.0-rc.1