From e96396bb3cb20c89e86bd8c7619a54d4fd080621 Mon Sep 17 00:00:00 2001 From: Dan Connolly Date: Thu, 13 Oct 2022 00:25:38 -0500 Subject: [PATCH 1/5] test(vats): use {USDC,USDT}_{axl,grv} look-alikes for ephemeral nets Where we don't expect to have actual relayers, include production names for screenshots and such. Keep the AUSD keyword for compatibility with agoric-cli integration test scripts. --- packages/vats/decentral-devnet-config.json | 26 +++++++++++++++++++++- packages/vats/decentral-psm-config.json | 9 ++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/packages/vats/decentral-devnet-config.json b/packages/vats/decentral-devnet-config.json index e2e0e533f75..5662f6785a9 100644 --- a/packages/vats/decentral-devnet-config.json +++ b/packages/vats/decentral-devnet-config.json @@ -9,9 +9,33 @@ "anchorAssets": [ { "keyword": "AUSD", - "proposedName": "AUSD", + "proposedName": "Anchor USD", + "decimalPlaces": 6, + "denom": "ibc/toyellie" + }, + { + "keyword": "USDC_axl", + "proposedName": "USD Coin", "decimalPlaces": 6, "denom": "ibc/usdc1234" + }, + { + "keyword": "USDC_grv", + "proposedName": "USD Coin", + "decimalPlaces": 6, + "denom": "ibc/usdc5678" + }, + { + "keyword": "USDT_axl", + "proposedName": "Tether USD", + "decimalPlaces": 6, + "denom": "ibc/usdt1234" + }, + { + "keyword": "USDT_grv", + "proposedName": "Tether USD", + "decimalPlaces": 6, + "denom": "ibc/usdt5678" } ], "economicCommitteeAddresses": { diff --git a/packages/vats/decentral-psm-config.json b/packages/vats/decentral-psm-config.json index f7d0b656da7..f3c78d7e42a 100644 --- a/packages/vats/decentral-psm-config.json +++ b/packages/vats/decentral-psm-config.json @@ -8,7 +8,16 @@ "parameters": { "anchorAssets": [ { + "keyword": "USDC_axl", + "proposedName": "USD Coin", + "decimalPlaces": 6, "denom": "ibc/usdc1234" + }, + { + "keyword": "AUSD", + "proposedName": "Anchor USD", + "decimalPlaces": 6, + "denom": "ibc/toyellie" } ], "economicCommitteeAddresses": { From ade318b8055feca9de1d8ee36bf54f64af9f32d5 Mon Sep 17 00:00:00 2001 From: Dan Connolly Date: Thu, 13 Oct 2022 00:14:18 -0500 Subject: [PATCH 2/5] feat(vats): test config doesn't use up production token keywords For our long-lived testnet, we expect to have relayers, but they're not in place yet, so we don't know the final IBC denoms yet. We can start with just a toy token and vote the other tokens in as relayers become available. --- packages/vats/decentral-test-psm-config.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/vats/decentral-test-psm-config.json b/packages/vats/decentral-test-psm-config.json index 29d6d07111a..6cec2eae3d9 100644 --- a/packages/vats/decentral-test-psm-config.json +++ b/packages/vats/decentral-test-psm-config.json @@ -8,6 +8,9 @@ "parameters": { "anchorAssets": [ { + "keyword": "ToyUSD", + "proposedName": "Toy USD", + "decimalPlaces": 6, "denom": "ibc/usdc1234" } ], From b938a79f509840c974a89cd621429f2c9dbd9d6e Mon Sep 17 00:00:00 2001 From: Dan Connolly Date: Tue, 11 Oct 2022 11:08:48 -0500 Subject: [PATCH 3/5] feat: anchorAssets config for {USDC,USDT}_{axl,grv} on main --- packages/vats/decentral-main-psm-config.json | 23 +++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/packages/vats/decentral-main-psm-config.json b/packages/vats/decentral-main-psm-config.json index f7d0b656da7..c80d3e0ecb9 100644 --- a/packages/vats/decentral-main-psm-config.json +++ b/packages/vats/decentral-main-psm-config.json @@ -8,7 +8,28 @@ "parameters": { "anchorAssets": [ { - "denom": "ibc/usdc1234" + "keyword": "USDC_axl", + "proposedName": "USD Coin", + "decimalPlaces": 6, + "denom": "ibc/295548A78785A1007F232DE286149A6FF512F180AF5657780FC89C009E2C348F" + }, + { + "keyword": "USDC_grv", + "proposedName": "USD Coin", + "decimalPlaces": 6, + "denom": "ibc/6831292903487E58BF9A195FDDC8A2E626B3DF39B88F4E7F41C935CADBAF54AC" + }, + { + "keyword": "USDT_axl", + "proposedName": "Tether USD", + "decimalPlaces": 6, + "denom": "ibc/F2331645B9683116188EF36FC04A809C28BD36B54555E8705A37146D0182F045" + }, + { + "keyword": "USDT_grv", + "proposedName": "Tether USD", + "decimalPlaces": 6, + "denom": "ibc/386D09AE31DA7C0C93091BB45D08CB7A0730B1F697CD813F06A5446DCF02EEB2" } ], "economicCommitteeAddresses": { From 548c0968f2e811cf449eddb370bca3448314b06c Mon Sep 17 00:00:00 2001 From: Dan Connolly Date: Tue, 11 Oct 2022 11:09:07 -0500 Subject: [PATCH 4/5] feat: econ committee addresses --- packages/vats/decentral-main-psm-config.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/vats/decentral-main-psm-config.json b/packages/vats/decentral-main-psm-config.json index c80d3e0ecb9..02b2cf07299 100644 --- a/packages/vats/decentral-main-psm-config.json +++ b/packages/vats/decentral-main-psm-config.json @@ -33,7 +33,12 @@ } ], "economicCommitteeAddresses": { - "voter": "agoric1ersatz" + "Jason Potts": "agoric1gx9uu7y6c90rqruhesae2t7c2vlw4uyyxlqxrx", + "Chloe White": "agoric1d4228cvelf8tj65f4h7n2td90sscavln2283h5", + "Thibault Schrepel": "agoric14543m33dr28x7qhwc558hzlj9szwhzwzpcmw6a", + "Chris Berg": "agoric13p9adwk0na5npfq64g22l6xucvqdmu3xqe70wq", + "Youssef Amrani": "agoric1el6zqs8ggctj5vwyukyk4fh50wcpdpwgugd5l5", + "Joe Clark": "agoric1zayxg4e9vd0es9c9jlpt36qtth255txjp6a8yc" } }, "creationOptions": { From 438777d616d2730f477370d9df460ffb9e3bf600 Mon Sep 17 00:00:00 2001 From: Dan Connolly Date: Thu, 13 Oct 2022 11:52:09 -0500 Subject: [PATCH 5/5] test(vats): move AUSD to end of asset list (for screenshots, ...) --- packages/vats/decentral-devnet-config.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/vats/decentral-devnet-config.json b/packages/vats/decentral-devnet-config.json index 5662f6785a9..697bb9b3dde 100644 --- a/packages/vats/decentral-devnet-config.json +++ b/packages/vats/decentral-devnet-config.json @@ -7,12 +7,6 @@ "sourceSpec": "@agoric/vats/src/core/boot-psm.js", "parameters": { "anchorAssets": [ - { - "keyword": "AUSD", - "proposedName": "Anchor USD", - "decimalPlaces": 6, - "denom": "ibc/toyellie" - }, { "keyword": "USDC_axl", "proposedName": "USD Coin", @@ -36,6 +30,12 @@ "proposedName": "Tether USD", "decimalPlaces": 6, "denom": "ibc/usdt5678" + }, + { + "keyword": "AUSD", + "proposedName": "Anchor USD", + "decimalPlaces": 6, + "denom": "ibc/toyellie" } ], "economicCommitteeAddresses": {