Improved config feature #198

prxgr4mm3r · 2023-12-29T22:25:45Z

No description provided.

src/lib/swankyCommand.ts

src/types/index.ts

src/lib/swankyCommand.ts

src/lib/command-utils.ts

src/commands/account/default.ts

src/commands/contract/deploy.ts

src/commands/init/index.ts

src/lib/swankyCommand.ts

ipapandinas

I've made a series of detailed commits that address various aspects of the logic. When new comments are fixed, I would appreciate it if you could thoroughly retest the entire flow to make sure everything is working correctly.

src/lib/swankyCommand.ts

src/commands/check/index.ts

src/lib/contractCall.ts

src/lib/command-utils.ts

src/commands/init/index.ts

src/commands/contract/deploy.ts

src/lib/swankyCommand.ts

…to feature/update-swanky-config # Conflicts: # src/lib/command-utils.ts

prxgr4mm3r · 2024-01-26T14:12:51Z

@ipapandinas What do you think? If an account was created outside the project dir, should it be merged into this.swankyConfig from the system config when we call the command from the project dir?

ipapandinas · 2024-01-29T11:44:24Z

@prxgr4mm3r I do not think so, if it's a personal dev account you do not want to share it publicly.
Here is how I see it:

Account created/set outside the project dir: Update Swanky system config only
Account created/set in the project dir: Update both Swanky project + system config
Account created/set passing an env Swanky config variable: Update Swanky env config only

When setting the default account we can check if the alias belongs to the current account list.

For example:

Scenario 1

I created an "hello" dev account outside a project dir => Swanky system config only is updated
I navigate to a project dir and I set change "hello" as default => Swanky system config only is updated, the default account in the Swanky local project dir config is unchanged

Scenario 2

I created a "bye" dev account inside a project dir => Swanky system config + project dir config are updated
I set "bye" as default account => Swanky system config + project dir config are updated

Scenario 3

I use account create command with an env Swanky config => Swanky env config only is updated
I use account default command with an env Swanky config => Swanky env config only is updated

prxgr4mm3r · 2024-01-29T16:17:06Z

@ipapandinas What about accounts that are stored in the system config before the project is created? Should it be stored in the local config of the new project?

ipapandinas · 2024-01-30T10:35:47Z

@prxgr4mm3r good question but I don't think so. System account are personal accounts and project accounts are shared with project contributors.

ipapandinas · 2024-01-30T18:20:54Z

@prxgr4mm3r I created this commit 3a70313 on another branch to explore the possibility of using a config builder. The goal is to streamline the process of updating the configuration in a safe and controlled manner. What do you think? If you agree, you can cherry pick my commit and go from there.

prxgr4mm3r · 2024-01-31T12:47:33Z

@ipapandinas I like this idea! Will work on that.

…eature/update-swanky-config

src/commands/account/default.ts

src/lib/swankyCommand.ts

pmikolajczyk41

greatly improves the experience!

pmikolajczyk41 · 2024-02-22T09:50:12Z

src/lib/swankyCommand.ts

+  protected async loadAndMergeConfig(): Promise<void> {
+    try {
+      const systemConfig = getSwankyConfig("global");
+      this.swankyConfig = { ...this.swankyConfig, ...systemConfig };


shouldn't it be like { ...systemConfig, ...this.swankyConfig }? or we are sure that they are disjoint, so it doesn't matter?

Here this.swankyConfig holds the default state set during the buildSwankyConfig init phase. I will rename it to make it clear: this.swankyConfig = { ...swankyDefaultConfig, ...systemConfig };

pmikolajczyk41 · 2024-02-22T09:59:49Z

src/commands/contract/query.ts

@@ -6,13 +6,15 @@ export class Query extends ContractCall<typeof Query> {

  static args = { ...ContractCall.callArgs };

+  static flags = { ...ContractCall.callFlags };
+
  public async run(): Promise<void> {
    const { flags, args } = await this.parse(Query);


does this destructor shadow the new static flags?

After testing it, I've observed that this.parse primarily uses static flags and args. However, I must admit is confusing..

pmikolajczyk41 · 2024-02-22T10:01:59Z

src/commands/contract/new.ts

-
-      await writeJSON(path.resolve("swanky.config.json"), this.swankyConfig, { spaces: 2 });
+      const configBuilder = new ConfigBuilder(getSwankyConfig("local"));
+      configBuilder.addContract(args.contractName);


nit: it might be a bit more convenient to make addContract, addContractDeployment methods more suited for the builder pattern (to return this) - we could then chain all configuration into a single expression

Indeed! Let me adjust it

prxgr4mm3r added 4 commits December 30, 2023 00:24

Update SwankyConfig, make local and system configs

d4a9163

Clean up imports

cb80429

Clean up imports

356ad63

Fix default account feature

9b264a7

ipapandinas requested changes Jan 22, 2024

View reviewed changes

ipapandinas requested changes Jan 24, 2024

View reviewed changes

src/lib/swankyCommand.ts Show resolved Hide resolved

prxgr4mm3r and others added 6 commits January 24, 2024 20:11

Fixes

b70851d

fix: Swanky config pre-populated in context to remove type assertions

355eb39

fix: config update logic fixed for account create & default command

2e3da70

fix: isLocalConfigCheck fixed

6007e31

fix: Allow some commands to be used without local config

39bf8fa

fix: Wait for config store async functions

5cff10e

ipapandinas requested changes Jan 25, 2024

View reviewed changes

ipapandinas and others added 9 commits January 26, 2024 08:30

fix: isLocalConfigCheck fixed

b8b947f

fix: Make config name dynamic

e4fffc7

fix: Make config name dynamic

fc0a000

Merge remote-tracking branch 'origin/feature/update-swanky-config' in…

00ea4c5

…to feature/update-swanky-config # Conflicts: # src/lib/command-utils.ts

fix: Add alice and bob to accountsby default

ede09f6

fix: Display account alias in Errors

1c95829

fix: Remove useless warning

7a42fd3

fix: Change config merging

30000e8

fix: Fix merging accounts created outside of project

b96ebfa

prxgr4mm3r added 4 commits January 26, 2024 16:44

fix: Fix mismatched versions displaying

bb5f10b

fix: Remove useless debug output

ebde7ad

fix: Fix dev account check in local network

ba681bc

fix: Add check for node binary existence

15a0330

ipapandinas and others added 4 commits January 30, 2024 12:37

fix: Correct account alias used for deploy and tx commands

1ab38dd

fix: Fix default command

9a25dd8

fix: Correct work when env SWANKY_CONFIG variable is set

f9a604c

feat: (WIP) Config builder created

3a70313

prxgr4mm3r added 3 commits January 31, 2024 15:02

Merge remote-tracking branch 'origin/exploring-config-builder' into f…

64cda21

…eature/update-swanky-config

fix: Correct use of new store config func

fe99bb1

fix: Use ConfigBuilder to change SwankyConfig

93d41d6

prxgr4mm3r linked an issue Jan 31, 2024 that may be closed by this pull request

Improved Config Feature #62

Closed

6 tasks

fix: refactoring

4708ab4

prxgr4mm3r commented Feb 2, 2024

View reviewed changes

src/commands/account/default.ts Outdated Show resolved Hide resolved

prxgr4mm3r commented Feb 2, 2024

View reviewed changes

src/commands/account/default.ts Outdated Show resolved Hide resolved

prxgr4mm3r commented Feb 2, 2024

View reviewed changes

src/lib/swankyCommand.ts Show resolved Hide resolved

prxgr4mm3r and others added 2 commits February 2, 2024 15:26

fix: Fix account storing

78e0208

feat: addContractDeployment methode added to config builder

01b7cf6

ipapandinas approved these changes Feb 5, 2024

View reviewed changes

pmikolajczyk41 self-requested a review February 22, 2024 09:46

pmikolajczyk41 approved these changes Feb 22, 2024

View reviewed changes

ipapandinas changed the base branch from master to ink-devhub-1 February 26, 2024 13:52

ipapandinas added 3 commits February 26, 2024 16:41

chore: chain configuration into a single builder expression

6a574a0

Merge branch 'ink-devhub-1' into feature/update-swanky-config

8ec01e2

fix: config update for contract build verification

563c96e

ipapandinas merged commit e315716 into ink-devhub-1 Feb 27, 2024
3 checks passed

ipapandinas deleted the feature/update-swanky-config branch February 27, 2024 10:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improved config feature #198

Improved config feature #198

prxgr4mm3r commented Dec 29, 2023

ipapandinas left a comment

prxgr4mm3r commented Jan 26, 2024

ipapandinas commented Jan 29, 2024

prxgr4mm3r commented Jan 29, 2024

ipapandinas commented Jan 30, 2024

ipapandinas commented Jan 30, 2024

prxgr4mm3r commented Jan 31, 2024

pmikolajczyk41 left a comment

pmikolajczyk41 Feb 22, 2024

ipapandinas Feb 26, 2024

pmikolajczyk41 Feb 22, 2024

ipapandinas Feb 26, 2024

pmikolajczyk41 Feb 22, 2024

ipapandinas Feb 26, 2024

Improved config feature #198

Improved config feature #198

Conversation

prxgr4mm3r commented Dec 29, 2023

ipapandinas left a comment

Choose a reason for hiding this comment

prxgr4mm3r commented Jan 26, 2024

ipapandinas commented Jan 29, 2024

Scenario 1

Scenario 2

Scenario 3

prxgr4mm3r commented Jan 29, 2024

ipapandinas commented Jan 30, 2024

ipapandinas commented Jan 30, 2024

prxgr4mm3r commented Jan 31, 2024

pmikolajczyk41 left a comment

Choose a reason for hiding this comment

pmikolajczyk41 Feb 22, 2024

Choose a reason for hiding this comment

ipapandinas Feb 26, 2024

Choose a reason for hiding this comment

pmikolajczyk41 Feb 22, 2024

Choose a reason for hiding this comment

ipapandinas Feb 26, 2024

Choose a reason for hiding this comment

pmikolajczyk41 Feb 22, 2024

Choose a reason for hiding this comment

ipapandinas Feb 26, 2024

Choose a reason for hiding this comment