0.2.9-rc.1

makerdao · Jul 2, 2019 · 44b01bf · 44b01bf
1 parent 191b93b
commit 44b01bf
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 82 deletions.
diff --git a/README.md b/README.md
@@ -110,7 +110,7 @@ ILK      GEM    DESC
 
 ETH-A    WETH   Ethereum
 ETH-B    WETH   Ethereum
-COL1-A   COL1   Token 1
+REP-A    REP    Augur
 ```
 
 Each Ilk has its own set of configuration parameters which can be viewed via the `ilk` command. The `I, --ilk=<id>` option is used to scope commands to a particular Ilk:
@@ -288,38 +288,38 @@ vat 0.000060682318362511884962000000000000000000000 Vat balance
 ext 500.000000000000000000 ERC20 balance
 ```
 
-### 2. Managed Cdp - lock 100 COL1 & draw 50 Dai
+### 2. Managed Cdp - lock 100 REP & draw 50 Dai
 
 ```sh
 # i) Open
-$ mcd --ilk=COL1-A cdp open
+$ mcd --ilk=REP-A cdp open
 mcd-cdp-open: Waiting for transaction receipt...
 0x800e5578d3ac4b77b7ada1aba48cf80d0d238d4392d2676d79159eac2c2cdd73
 Opened: cdp 19
 
 # ii) Lock
-$ mcd --ilk=COL1-A cdp 19 lock 100
+$ mcd --ilk=REP-A cdp 19 lock 100
 seth-send: Published transaction with 260 bytes of calldata.
 seth-send: 0x4d30cb4863ca997d24ff2346c9a92e86648369ce7b4a86ed004c73b8d4ef299a
 seth-send: Waiting for transaction receipt...
 seth-send: Transaction included in block 333.
-ilk  COL1-A                                     Collateral type
+ilk  REP-A                                      Collateral type
 urn  0x4518c4709a50C915b7996A0e6Dfb38c67248BBcF Urn handler
-ink  100.000000000000000000                     Locked collateral (COL1)
+ink  100.000000000000000000                     Locked collateral (REP)
 art  0.000000000000000000                       Issued debt (Dai)
 tab  0                                          Outstanding debt (Dai)
 rap  0                                          Accumulated stability fee (Dai)
 -->  0                                          Collateralization ratio
 
 # iii) Draw
-$ mcd --ilk=COL1-A cdp 19 draw 500
+$ mcd --ilk=REP-A cdp 19 draw 500
 seth-send: Published transaction with 260 bytes of calldata.
 seth-send: 0xd5fb7ddf94bb910fbba2af118ecde88a03a13129b2e1979238236afe672781c3
 seth-send: Waiting for transaction receipt...
 seth-send: Transaction included in block 335.
-ilk  COL1-A                                     Collateral type
+ilk  REP-A                                      Collateral type
 urn  0x4518c4709a50C915b7996A0e6Dfb38c67248BBcF Urn handler
-ink  100.000000000000000000                     Locked collateral (COL1)
+ink  100.000000000000000000                     Locked collateral (REP)
 art  49.999505439113270178                      Issued debt (Dai)
 tab  50.000000000000000000000000000             Outstanding debt (Dai)
 rap  0.000494560886729822000020743              Accumulated stability fee (Dai)

diff --git a/libexec/mcd/conf/ilks b/libexec/mcd/conf/ilks
@@ -1,10 +1,10 @@
-ILK    | GEM  | DESC
-       |      |
-ETH-A  | WETH | Ethereum
-ETH-B  | WETH | Ethereum
-ETH-C  | WETH | Ethereum
-COL1-A | COL1 | Token 1
-COL2-A | COL2 | Token 2
-COL3-A | COL3 | Token 3
-COL4-A | COL4 | Token 4
-COL5-A | COL5 | Token 5
+ILK   | GEM  | DESC
+      |      |
+ETH-A | WETH | Ethereum
+ETH-B | WETH | Ethereum
+ETH-C | WETH | Ethereum
+REP-A | REP  | Augur
+ZRX-A | ZRX  | 0x
+OMG-A | OMG  | OmiseGO
+BAT-A | BAT  | Basic Attention Token
+DGD-A | DGD  | Digix
diff --git a/libexec/mcd/conf/kovan.json b/libexec/mcd/conf/kovan.json
@@ -1,64 +1,68 @@
 {
-  "MULTICALL": "0x81dcf75604d228df5c609ca4d61a979f2077a0c9",
-  "FAUCET": "0xa402e771a4662dcbe661e839a6e8c294d2ce44cf",
-  "MCD_DEPLOY": "0xc0fb0c166013030a1a5e4d45139f125f8d225421",
-  "MCD_GOV": "0xa90843676a7f747a3c8adda142471369346369c1",
-  "MCD_GOV_GUARD": "0x7314f25497369907a40b3272c53a4f3025caeb3f",
-  "MCD_IOU": "0xaf018b5ae18a9ee1182e758a8565f1ff2d46b1db",
-  "MCD_ADM": "0xe5d22b1887cac1e3f84c5bbefb7c25526e6a0c37",
-  "VOTE_PROXY_FACTORY": "0xdc0e2cc2477eb4063078ba5cc346a7b4f7619d08",
-  "MCD_VAT": "0x284ecb5880cdc3362d979d07d162bf1d8488975d",
-  "MCD_JUG": "0x92da9b203523bd9bd877ec57cce308dd493b85f2",
-  "MCD_CAT": "0x9097e908c691e8cc77290305b69b0c5f4e8c31c9",
-  "MCD_VOW": "0xdbf8e0d733bb42ac3a2016d7e579824a8903e10c",
-  "MCD_JOIN_DAI": "0xd7e736c39173c2d571b07abf467fddeb68040d3c",
-  "MCD_FLAP": "0x164a942d9d7a269b2dc8551c8dfad32e8ffd0b80",
-  "MCD_FLOP": "0x668001c75a9c02d6b10c7a17dbd8aa4afff95037",
-  "MCD_PAUSE": "0xb4fec50aac35146e67a1ad426f74bae647f34e60",
-  "MCD_PAUSE_PROXY": "0x29a6f0ac0bf5a3d658abc877bcf6dbbb70a48e75",
-  "MCD_GOV_ACTIONS": "0x924b5beb03c77da75c79d2d47cfd21822dc8d721",
-  "MCD_DAI": "0x4cb763de9ad80e0e347fb1ff763e5cf85ebf7c33",
-  "MCD_SPOT": "0xee4b1f689251f70b05cdcceff2dbe144fc596922",
-  "MCD_POT": "0xd097295f999608a8a69e892a6b6d51fa0676ca4c",
-  "MCD_END": "0x59a779cc66c688f5acf11e7c50fab5558d1d1773",
-  "MCD_ESM": "0x90f2b6bb1eb20b6b5ff8a0728b3cb6edb79b225e",
-  "PROXY_ACTIONS": "0x98e3a3d95e380804668c7ad5f851f78c26861f24",
-  "CDP_MANAGER": "0xb254b61e5b314d60443c9e4097335809421643ef",
-  "GET_CDPS": "0x070b621a890f60bab21930cf3ad2f57850b59b4a",
-  "PROXY_FACTORY": "0x786f4a6f59d05b2498f387ca6f255ad8b7478da5",
-  "PROXY_REGISTRY": "0x5365f60e92ed9d77ed922181a6ac050edf12cfe6",
-  "ETH": "0xb39862d7d1b11cd9b781b1473e142cbb545a6871",
-  "PIP_ETH": "0x8C73Ec0fBCdEC6b8C060BC224D94740FD41f3774",
-  "MCD_JOIN_ETH_A": "0x1ff550fbbc6b03e9847054e2dc911005602e12f5",
-  "MCD_FLIP_ETH_A": "0x43c331c0389a92af62ee726d5ae0c8a424320c31",
-  "MCD_JOIN_ETH_B": "0x4f0914cbbc8ec0298d621c4963b0e1431787b58d",
-  "MCD_FLIP_ETH_B": "0x2151047513dbeac7eccd0c97ece5f270649b3604",
-  "MCD_JOIN_ETH_C": "0x547eb61fc9990ded3281d1a19abd9ba0c1fbe2ac",
-  "MCD_FLIP_ETH_C": "0xf4d49a91a37ba0eeada456977e18f2f23f1b3ebc",
-  "COL1": "0xc644e83399f3c0b4011d3dd3c61bc8b1617253e5",
-  "PIP_COL1": "0xF2643546d27c8a5388D9Be48170d74b9c9Be39a6",
-  "MCD_JOIN_COL1_A": "0x7a09d1f114a26c5508ddaa8e135e9844192f0bbe",
-  "MCD_FLIP_COL1_A": "0x911c1bb935ce7fe5acb8069acd52d50d3c896353",
-  "COL2": "0x5500b807a9b2fada4d43c1cb5610c4338c4219cb",
-  "PIP_COL2": "0x8Df8f06DC2dE0434db40dcBb32a82A104218754c",
-  "MCD_JOIN_COL2_A": "0xd1f1f269128e98004d825dab15c39a0f65b8fbfe",
-  "MCD_FLIP_COL2_A": "0x6b982b27c732ced61e12c50b000cdb209164122c",
-  "COL3": "0xc6f281b59782be94c9e5404b13a1c8fa17ba5998",
-  "PIP_COL3": "0xaa32EB42CBf3Bdb746b659c8DAF443f710497d80",
-  "MCD_JOIN_COL3_A": "0x9293f89907f4b7d99719dca5112ebd4113fa4aa9",
-  "MCD_FLIP_COL3_A": "0xd1300443f52157ab267e66cb818d122b2c021820",
-  "COL4": "0xa5f3f333350bbaeb6d78c9bdebc77fcbf4b51e73",
-  "PIP_COL4": "0xc9eb67DA2d05702459C521CE3BFED097cB490F8b",
-  "MCD_JOIN_COL4_A": "0x0baa37d053b184dc42a46029570a5613fab45da4",
-  "MCD_FLIP_COL4_A": "0x21a13c6678377ff2fcf74f924777aad69e1dc4ac",
-  "COL5": "0x96650321379353cd636aa2d4e5d69cee1a0dd174",
-  "PIP_COL5": "0xA53e6EFB4cBeD841Eace02220498860905E94998",
-  "MCD_JOIN_COL5_A": "0x29d6ec0d86548a81d4c4196eb0198fc81f817ace",
-  "MCD_FLIP_COL5_A": "0x4f3c0d0f42b9f2052c6d9cacadb6d88d9b50e037",
-  "PROXY_PAUSE_ACTIONS": "0xda5f2c93c2a5d287b04a2571c1e2aaeb909c8991",
-  "PROXY_DEPLOYER": "0xe0854e0529049b21d38535e7241f5acfe2129dd0",
-  "GOV_POLL_GEN": "0xdfe504525aa3c2aae0630f66c3a6c538a80666ac",
+  "MULTICALL": "0x869b1ca48e7a36f69059e74acc91fd5e7fb919ce",
+  "FAUCET": "0x94598157fcf0715c3bc9b4a35450cce82ac57b20",
+  "MCD_DEPLOY": "0xd1e29e79a20fbadf7644c1201ff1a36f1f234561",
+  "MCD_GOV": "0xaaf64bfcc32d0f15873a02163e7e500671a4ffcd",
+  "MCD_GOV_GUARD": "0xffce50ef87b95eff009f9bb7edeb9ddaa692e267",
+  "MCD_IOU": "0x7cc45b1f8f7ba8964808597904bec61e82c6f33c",
+  "MCD_ADM": "0xa5c01f15ed567e9860afba802af54dd7514bd2c2",
+  "VOTE_PROXY_FACTORY": "0xdcda36b73aff7841f395fd921a18a01a9cb32bae",
+  "MCD_VAT": "0xb2c1cae3d4e8992ce5a396d20fc3793a146f3955",
+  "MCD_JUG": "0x2a7cc8771aeaff4f5f5d9f9ec4b0e1cf3f3dce13",
+  "MCD_CAT": "0x05d371b20cd593d0b04756d196dae4fa99f98d38",
+  "MCD_VOW": "0xc7814b696f8d596debc4608d9bb97cf936f39a00",
+  "MCD_JOIN_DAI": "0x331ece09650238ee9418b6b895e7f504b6859611",
+  "MCD_FLAP": "0x72a758542bcb375d3275a2f65a03ae27da48ff30",
+  "MCD_FLOP": "0x70b1a0fa8cc13cd3ce3cd65064c226dd9bc65f49",
+  "MCD_PAUSE": "0x74b02284697048fd68ff2060f60bf457d8e3f569",
+  "MCD_PAUSE_PROXY": "0x68bd964fd0851ade1106690ce6c3d33e864e6c6c",
+  "MCD_GOV_ACTIONS": "0xa74445ceca5c1bde037e46198334a2fc02057e50",
+  "MCD_DAI": "0x8255fd21fcce9e77f81737e48ec3da3dacff5ea5",
+  "MCD_SPOT": "0x0eff7d0d5dacbf86460ecd6ccdbbd7b6d81a8588",
+  "MCD_POT": "0x016a00f9ddda6f39d2fd337d34e13e0bf7aecf80",
+  "MCD_END": "0x516184be305626841e618a6e3b8001b0c000e2ba",
+  "MCD_ESM": "0xc0f74c9594a603ac397a529e1963966dcf365527",
+  "PROXY_ACTIONS": "0xb698c7c7b5713c8664b153fa55a462a70354fbaf",
+  "CDP_MANAGER": "0xbe949e7641385bc5157fc19f60ce4831e34583ee",
+  "GET_CDPS": "0x8698f51e63a0bc1c04e058f0c7367ea413b780e1",
+  "PROXY_FACTORY": "0x36a3fce9f2395e058740daaabb4f25e212d10d78",
+  "PROXY_REGISTRY": "0x80e89c57e7ee70f6302b9f756492e3f8b2ca91eb",
+  "ETH": "0xd0a1e359811322d97991e03f863a0c30c2cf029c",
+  "PIP_ETH": "0x75dd74e8afe8110c8320ed397cccff3b8134d981",
+  "MCD_JOIN_ETH_A": "0x30af1abc1213126f7ef5b6c2c93bd57e788904e0",
+  "MCD_FLIP_ETH_A": "0xc12c2813ecc2941fca50c09a8a514fdbecc72056",
+  "MCD_JOIN_ETH_B": "0x731fca169de27ca9817cfd4f1b75be2925f9746f",
+  "MCD_FLIP_ETH_B": "0xf476977cf1941a3b6fd187f2bec814ab5946c3a3",
+  "MCD_JOIN_ETH_C": "0xf9e10440332127e6201f035223a69ccb05b62728",
+  "MCD_FLIP_ETH_C": "0xa73d02788d2e0ffd9f7bfde51b1ef5a08f646a2c",
+  "REP": "0xc7aa227823789e363f29679f23f7e8f6d9904a9b",
+  "PIP_REP": "0x5debc8c4124db0c1d3bad99e69287a576c7b2ccc",
+  "MCD_JOIN_REP_A": "0x0a3873806eb69e5912e9b29625f74b3caafe950f",
+  "MCD_FLIP_REP_A": "0xded0baddee04d6e15d7b208d1f8c16e311e1aab6",
+  "ZRX": "0x18392097549390502069c17700d21403ea3c721a",
+  "PIP_ZRX": "0xc010f1bbde279a5bb05c93f5fc902293d5a9f7a9",
+  "MCD_JOIN_ZRX_A": "0xfb1cc4663481b46eb041990cccd0ec57526bfb45",
+  "MCD_FLIP_ZRX_A": "0x0d333806f554218ce744d42c92bca66bd3395cdd",
+  "OMG": "0x441b1a74c69ee6e631834b626b29801d42076d38",
+  "PIP_OMG": "0x1e9740f61e80650a60ba70f2d0b477fb85db2b03",
+  "MCD_JOIN_OMG_A": "0x68f01b504698a2a4aef4a92c4e607ab5284bcf2c",
+  "MCD_FLIP_OMG_A": "0x74c32e9ac5295f02a42f223745ec4a136277c2e3",
+  "BAT": "0x9f8cfb61d3b2af62864408dd703f9c3beb55dff7",
+  "PIP_BAT": "0x5c40c9eb35c76069fa4c3a00ea59fac6ffa9c113",
+  "MCD_JOIN_BAT_A": "0x88ec2e551e95c9bf25e55708fdb0025db853b091",
+  "MCD_FLIP_BAT_A": "0x175ecf9063f83eeff5d4bd4a1194ef16240f6dc3",
+  "DGD": "0x62aeec5fb140bb233b1c5612a8747ca1dc56dc1b",
+  "PIP_DGD": "0x112bf99e873317643fbfcc22d197e3e01b825cb0",
+  "MCD_JOIN_DGD_A": "0x72aaae6d99ab3eeb6be67825560496c3cb31d352",
+  "MCD_FLIP_DGD_A": "0xfb9a83347dc4ef0ee33e673213a3c8c123972f61",
+  "GNT": "0xc81ba844f451d4452a01bbb2104c1c4f89252907",
+  "PIP_GNT": "0xf46e96a6f23fdcb5870f0ac0dbe9d2c605485ddc",
+  "MCD_JOIN_GNT_A": "0x75ca420abafb3c5430991b8ac58c1fe3fb5cc08d",
+  "MCD_FLIP_GNT_A": "0x520b847e75d701086db0e465ce330d7c96ea3dfd",
+  "PROXY_PAUSE_ACTIONS": "0x196c86b13e037fd0ebc840b8f8886d5b709e5306",
+  "PROXY_DEPLOYER": "0xe28ae470dc214d493dde012366e68f84a5911fe7",
+  "GOV_POLL_GEN": "0xaed7d3a49647bcd29a5893213610f01377b1efe5",
   "POLL_ID": "0",
-  "VOTE_YES": "0x998daaf2e1eeb10eea314aa1238d5d9eeae2a9b1",
-  "VOTE_NO": "0x4d8e5d321a1d0a74d5fa9968b5a1f1167a02c289"
+  "VOTE_YES": "0xa391d8e77f0dfbcd986425d88e6c8e016b48d91d",
+  "VOTE_NO": "0x92029bd9d24d2f5c4dcbb8808bc25fc02d8001bf"
 }
diff --git a/libexec/mcd/mcd-test b/libexec/mcd/mcd-test
@@ -66,7 +66,7 @@ testEthFrob() {
 testEthFrob
 
 testBite() {
-  export MCD_ILK=COL1-A
+  export MCD_ILK=REP-A
   dink=10
   spot=$(mcd ilk spot); mat=$(mcd ilk mat)
   dart=$(echo "($dink * $spot) - 1" | bc -l)
@@ -89,7 +89,7 @@ testCdpOpen() {
 }
 
 testCdp() {
-  export MCD_ILK=COL1-A
+  export MCD_ILK=REP-A
   id=$(testCdpOpen)
   testDec "cdp $id lock" "10" "gem balance ext"
   testInc "cdp $id draw" "10" "dai balance ext"