From c263f3b2ad1521c70e367e9fdac3b3b8904005ab Mon Sep 17 00:00:00 2001 From: Dan Connolly Date: Wed, 6 Dec 2023 16:27:07 -0600 Subject: [PATCH 1/8] use dapp-game-pieces (in agoric-labs) by default --- packages/agoric-cli/src/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/agoric-cli/src/main.js b/packages/agoric-cli/src/main.js index 3b75a181a2e..488ed9a3af5 100644 --- a/packages/agoric-cli/src/main.js +++ b/packages/agoric-cli/src/main.js @@ -19,8 +19,8 @@ import followMain from './follow.js'; import walletMain from './open.js'; import { makeWalletCommand } from './commands/wallet.js'; -const DEFAULT_DAPP_TEMPLATE = 'dapp-fungible-faucet'; -const DEFAULT_DAPP_URL_BASE = 'https://github.com/Agoric/'; +const DEFAULT_DAPP_TEMPLATE = 'dapp-game-places'; +const DEFAULT_DAPP_URL_BASE = 'https://github.com/agoric-labs/'; const DEFAULT_DAPP_BRANCH = undefined; const STAMP = '_agstate'; From b3ad1887a2907ab74933b165690bac95de0c4028 Mon Sep 17 00:00:00 2001 From: Dan Connolly Date: Thu, 14 Dec 2023 17:11:29 -0600 Subject: [PATCH 2/8] feat: use dapp-offer-up in @agoric/dapp --- packages/agoric-cli/src/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/agoric-cli/src/main.js b/packages/agoric-cli/src/main.js index 488ed9a3af5..e5e259943e0 100644 --- a/packages/agoric-cli/src/main.js +++ b/packages/agoric-cli/src/main.js @@ -19,8 +19,8 @@ import followMain from './follow.js'; import walletMain from './open.js'; import { makeWalletCommand } from './commands/wallet.js'; -const DEFAULT_DAPP_TEMPLATE = 'dapp-game-places'; -const DEFAULT_DAPP_URL_BASE = 'https://github.com/agoric-labs/'; +const DEFAULT_DAPP_TEMPLATE = 'dapp-offer-up'; +const DEFAULT_DAPP_URL_BASE = 'https://github.com/Agoric/'; const DEFAULT_DAPP_BRANCH = undefined; const STAMP = '_agstate'; From 2097951e7ebc39a0438d95e987972f9f71279ef5 Mon Sep 17 00:00:00 2001 From: Luqi Pan Date: Thu, 25 Jan 2024 12:40:24 -0800 Subject: [PATCH 3/8] fix(integration-test): update initOptions with '--dapp-template' parameter --- packages/agoric-cli/tools/getting-started.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/agoric-cli/tools/getting-started.js b/packages/agoric-cli/tools/getting-started.js index ea4014e83bc..5ffbf560666 100644 --- a/packages/agoric-cli/tools/getting-started.js +++ b/packages/agoric-cli/tools/getting-started.js @@ -103,6 +103,7 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => { if (process.env.AGORIC_INIT_OPTIONS) { const opts = JSON.parse(process.env.AGORIC_INIT_OPTIONS); initOptions.push(...opts); + initOptions['--dapp-template'] = 'dapp-fungible-faucet'; } t.is( await myMain(['init', ...initOptions, 'dapp-foo']), From 8ec4ed33fe9e7e0a8cca2d4eb0d0dc35cb64ab1d Mon Sep 17 00:00:00 2001 From: Luqi Pan Date: Thu, 25 Jan 2024 14:56:04 -0800 Subject: [PATCH 4/8] fix(integration-test): set --dapp-template at registry.sh level --- scripts/registry.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/registry.sh b/scripts/registry.sh index b5f0e3ddc82..dc0bd1478e6 100755 --- a/scripts/registry.sh +++ b/scripts/registry.sh @@ -107,7 +107,7 @@ integrationTest() { persistVar AGORIC_INSTALL_OPTIONS "[\"$DISTTAG\"]" } persistVar AGORIC_START_OPTIONS '["--rebuild"]' - persistVar AGORIC_INIT_OPTIONS "[\"--dapp-branch=$2\"]" + persistVar AGORIC_INIT_OPTIONS "[\"--dapp-template=dapp-fungible-faucet\"]" ( cd "$thisdir/../packages/agoric-cli" From 9c7dc7402ed06b12ef86f310f111ea5f6c63edd2 Mon Sep 17 00:00:00 2001 From: Luqi Pan Date: Thu, 25 Jan 2024 15:30:24 -0800 Subject: [PATCH 5/8] Revert "fix(integration-test): update initOptions with '--dapp-template' parameter" This reverts commit 2097951e7ebc39a0438d95e987972f9f71279ef5. --- packages/agoric-cli/tools/getting-started.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/agoric-cli/tools/getting-started.js b/packages/agoric-cli/tools/getting-started.js index 5ffbf560666..ea4014e83bc 100644 --- a/packages/agoric-cli/tools/getting-started.js +++ b/packages/agoric-cli/tools/getting-started.js @@ -103,7 +103,6 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => { if (process.env.AGORIC_INIT_OPTIONS) { const opts = JSON.parse(process.env.AGORIC_INIT_OPTIONS); initOptions.push(...opts); - initOptions['--dapp-template'] = 'dapp-fungible-faucet'; } t.is( await myMain(['init', ...initOptions, 'dapp-foo']), From cf379025300937184fd26ec99cb20d85c33cffb4 Mon Sep 17 00:00:00 2001 From: Luqi Pan Date: Fri, 26 Jan 2024 10:31:02 -0800 Subject: [PATCH 6/8] Revert "fix(integration-test): set --dapp-template at registry.sh level" This reverts commit 8ec4ed33fe9e7e0a8cca2d4eb0d0dc35cb64ab1d. --- scripts/registry.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/registry.sh b/scripts/registry.sh index dc0bd1478e6..b5f0e3ddc82 100755 --- a/scripts/registry.sh +++ b/scripts/registry.sh @@ -107,7 +107,7 @@ integrationTest() { persistVar AGORIC_INSTALL_OPTIONS "[\"$DISTTAG\"]" } persistVar AGORIC_START_OPTIONS '["--rebuild"]' - persistVar AGORIC_INIT_OPTIONS "[\"--dapp-template=dapp-fungible-faucet\"]" + persistVar AGORIC_INIT_OPTIONS "[\"--dapp-branch=$2\"]" ( cd "$thisdir/../packages/agoric-cli" From 35acc3d90ba64045b92fd39489d7e84580288401 Mon Sep 17 00:00:00 2001 From: Luqi Pan Date: Fri, 26 Jan 2024 10:34:46 -0800 Subject: [PATCH 7/8] fix(integration-test): add --dapp-template parameter to myMain command --- packages/agoric-cli/tools/getting-started.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/agoric-cli/tools/getting-started.js b/packages/agoric-cli/tools/getting-started.js index ea4014e83bc..22d74646047 100644 --- a/packages/agoric-cli/tools/getting-started.js +++ b/packages/agoric-cli/tools/getting-started.js @@ -105,7 +105,7 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => { initOptions.push(...opts); } t.is( - await myMain(['init', ...initOptions, 'dapp-foo']), + await myMain(['init', '--dapp-template', 'dapp-fungible-faucet', ...initOptions, 'dapp-foo']), 0, 'init dapp-foo works', ); From 9196b92b8d36a4f327bf95c4d68ede4834876103 Mon Sep 17 00:00:00 2001 From: Luqi Pan Date: Fri, 26 Jan 2024 11:19:05 -0800 Subject: [PATCH 8/8] fixup! fix(integration-test): add --dapp-template parameter to myMain command --- packages/agoric-cli/tools/getting-started.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/agoric-cli/tools/getting-started.js b/packages/agoric-cli/tools/getting-started.js index 22d74646047..5a4a9df8577 100644 --- a/packages/agoric-cli/tools/getting-started.js +++ b/packages/agoric-cli/tools/getting-started.js @@ -105,7 +105,13 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => { initOptions.push(...opts); } t.is( - await myMain(['init', '--dapp-template', 'dapp-fungible-faucet', ...initOptions, 'dapp-foo']), + await myMain([ + 'init', + '--dapp-template', + 'dapp-fungible-faucet', + ...initOptions, + 'dapp-foo', + ]), 0, 'init dapp-foo works', );