Skip to content

Commit 343c887

Browse files
joshuakarpCMCDragonkai
authored andcommitted
Seed nodes: provided seed nodes should override defaults if overlapping
1 parent 6e2e39f commit 343c887

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

src/bin/agent/CommandStart.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,14 @@ class CommandStart extends CommandPolykey {
7474
options.recoveryCodeFile,
7575
this.fs,
7676
);
77+
// Will be `[{}, true]` if `--seed-nodes` is not set
78+
// Will be '[{}, true]' if `--seed-nodes='<defaults>'`
79+
// Will be '[{...}, true]' if `--seed-nodes='...;<defaults>'`
80+
// Will be '[{}, false]' if `--seed-nodes=''`
81+
// Will be '[{...}, false]' if `--seed-nodes='...'`
7782
const [seedNodes, defaults] = options.seedNodes;
78-
if (defaults) Object.assign(seedNodes, options.network);
83+
let seedNodes_ = seedNodes;
84+
if (defaults) seedNodes_ = {...options.network, ...seedNodes};
7985
const agentConfig = {
8086
password,
8187
nodePath: options.nodePath,
@@ -92,7 +98,7 @@ class CommandStart extends CommandPolykey {
9298
proxyHost: options.proxyHost,
9399
proxyPort: options.proxyPort,
94100
},
95-
seedNodes,
101+
seedNodes: seedNodes_,
96102
fresh: options.fresh,
97103
};
98104
let recoveryCodeOut: RecoveryCode | undefined;

0 commit comments

Comments
 (0)