From 870d2052ce1ca6778f6afa4396e01d5833b7ef38 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Tue, 9 Jul 2024 02:22:51 -0600 Subject: [PATCH 1/4] fix(vm-config): always use `init-localchain` and `init-transfer` --- packages/cosmic-swingset/economy-template.json | 1 + packages/vm-config/decentral-itest-vaults-config.json | 2 ++ 2 files changed, 3 insertions(+) diff --git a/packages/cosmic-swingset/economy-template.json b/packages/cosmic-swingset/economy-template.json index 3964d202326..2a825654f80 100644 --- a/packages/cosmic-swingset/economy-template.json +++ b/packages/cosmic-swingset/economy-template.json @@ -6,6 +6,7 @@ [ "@agoric/builders/scripts/vats/init-network.js", "@agoric/builders/scripts/pegasus/init-core.js", + "@agoric/builders/scripts/vats/init-localchain.js", "@agoric/builders/scripts/vats/init-transfer.js" ], [ diff --git a/packages/vm-config/decentral-itest-vaults-config.json b/packages/vm-config/decentral-itest-vaults-config.json index 2f75efe3211..4e3dc96ae75 100644 --- a/packages/vm-config/decentral-itest-vaults-config.json +++ b/packages/vm-config/decentral-itest-vaults-config.json @@ -5,6 +5,8 @@ "coreProposals": [ "@agoric/builders/scripts/vats/init-core.js", "@agoric/builders/scripts/vats/init-network.js", + "@agoric/builders/scripts/vats/init-localchain.js", + "@agoric/builders/scripts/vats/init-transfer.js", { "module": "@agoric/builders/scripts/inter-protocol/init-core.js", "entrypoint": "defaultProposalBuilder", From 236a3f03c33cbee1e393e05db24d905e782b4e63 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Tue, 9 Jul 2024 02:34:00 -0600 Subject: [PATCH 2/4] chore(vm-config): remove obsolete `pegasus/init-core.js` --- packages/cosmic-swingset/economy-template.json | 3 +-- packages/vm-config/demo-proposals.json | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/cosmic-swingset/economy-template.json b/packages/cosmic-swingset/economy-template.json index 2a825654f80..56e5373c35e 100644 --- a/packages/cosmic-swingset/economy-template.json +++ b/packages/cosmic-swingset/economy-template.json @@ -5,9 +5,8 @@ ], [ "@agoric/builders/scripts/vats/init-network.js", - "@agoric/builders/scripts/pegasus/init-core.js", "@agoric/builders/scripts/vats/init-localchain.js", - "@agoric/builders/scripts/vats/init-transfer.js" + "@agoric/builders/scripts/vats/init-transfer.js" ], [ { diff --git a/packages/vm-config/demo-proposals.json b/packages/vm-config/demo-proposals.json index df3895f5e1a..6ca8d416540 100644 --- a/packages/vm-config/demo-proposals.json +++ b/packages/vm-config/demo-proposals.json @@ -1,6 +1,5 @@ [ "@agoric/builders/scripts/inter-protocol/init-core.js", - "@agoric/builders/scripts/pegasus/init-core.js", "@agoric/builders/scripts/vats/init-network.js", "@agoric/builders/scripts/vats/init-localchain.js", "@agoric/builders/scripts/vats/init-transfer.js" From 7f7a8bd0a0f07b172b7879bdc19ac81d8f37cb37 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Tue, 9 Jul 2024 02:42:50 -0600 Subject: [PATCH 3/4] chore(bank): demote noisy logs to `debug` level --- packages/vats/src/vat-bank.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vats/src/vat-bank.js b/packages/vats/src/vat-bank.js index 63630a20874..5922a85586c 100644 --- a/packages/vats/src/vat-bank.js +++ b/packages/vats/src/vat-bank.js @@ -200,7 +200,7 @@ const prepareBankChannelHandler = zone => updater = addressToUpdater.get(address); } } catch (e) { - console.error('Unregistered denom in', update, e); + console.debug('Unregistered denom in', update, e); } if (updater) { try { From 9b317a08ead45f314330d609fe7915cd00f9e0e3 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 9 Jul 2024 12:33:39 -0700 Subject: [PATCH 4/4] docs: purpose of itest-vaults config --- packages/vm-config/decentral-itest-vaults-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vm-config/decentral-itest-vaults-config.json b/packages/vm-config/decentral-itest-vaults-config.json index 4e3dc96ae75..e77ee9a410d 100644 --- a/packages/vm-config/decentral-itest-vaults-config.json +++ b/packages/vm-config/decentral-itest-vaults-config.json @@ -1,5 +1,5 @@ { - "$comment": "This SwingSet config file (see loadSwingsetConfigFile) is designed to bring up vaults test networks in an automated fashion. It includes coreProposals to start vaults. Testing facilities are limited to an initialPrice for ATOM and addresses with known keys.", + "$comment": "Not just vaults! This SwingSet config (see loadSwingsetConfigFile) started for integration testing of Vaults is designed to bring up vaults but became the defacto config for integration testing outside this repo (e.g. instagoric). It includes coreProposals to start Inter Protocol (including vaults) plus Orchestration. Testing facilities are limited to an initialPrice for ATOM and addresses with known keys.", "bootstrap": "bootstrap", "defaultReapInterval": 1000, "coreProposals": [