Skip to content

Commit b423ad7

Browse files
jeremy-thenjeremy-then
committed
Fixes config
1 parent 196baaf commit b423ad7

File tree

6 files changed

+18
-76
lines changed

6 files changed

+18
-76
lines changed

‎config/node-configs/fourth-federation/fed3.conf‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
peer {
32
privateKey = "0c6768b0905fa1ff4a63313a6e61e89e6bb0a511b44ec5a449921b24abfa1b4f"
43
}
@@ -10,35 +9,6 @@ federator {
109
"127.0.0.1:18444"
1110
]
1211
gasPrice = 1000
13-
signers {
14-
BTC {
15-
type = "hsm"
16-
host = "127.0.0.1"
17-
port = 9993
18-
keyId = "m/44'/1'/0'/0/0"
19-
bookkeeping {
20-
difficultyTarget = "3"
21-
informerInterval = "8000"
22-
maxAmountBlockHeaders = "50"
23-
maxChunkSizeToHsm = "100"
24-
},
25-
socketTimeout = 60000
26-
maxAttempts = 12
27-
intervalBetweenAttempts = 4000
28-
}
29-
RSK {
30-
type = "hsm"
31-
host = "127.0.0.1"
32-
port = 9993
33-
keyId = "m/44'/1'/1'/0/0"
34-
}
35-
MST {
36-
type = "hsm"
37-
host = "127.0.0.1"
38-
port = 9993
39-
keyId = "m/44'/1'/2'/0/0"
40-
}
41-
}
4212
}
4313

4414
rpc {

‎config/node-configs/fourth-federation/fed4.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ federator {
1414
BTC {
1515
type = "hsm"
1616
host = "127.0.0.1"
17-
port = 9988
17+
port = 9989
1818
keyId = "m/44'/1'/0'/0/0"
1919
bookkeeping {
2020
difficultyTarget = "3"
@@ -29,13 +29,13 @@ federator {
2929
RSK {
3030
type = "hsm"
3131
host = "127.0.0.1"
32-
port = 9988
32+
port = 9989
3333
keyId = "m/44'/1'/1'/0/0"
3434
}
3535
MST {
3636
type = "hsm"
3737
host = "127.0.0.1"
38-
port = 9988
38+
port = 9989
3939
keyId = "m/44'/1'/2'/0/0"
4040
}
4141
}

‎config/node-configs/third-federation/fed3.conf‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
peer {
32
privateKey = "214bfe85db3fe3154fe149731e5816b762e909029c1d5d76e9214e986da0d392"
43
}
@@ -10,35 +9,6 @@ federator {
109
"127.0.0.1:18444"
1110
]
1211
gasPrice = 1000
13-
signers {
14-
BTC {
15-
type = "hsm"
16-
host = "127.0.0.1"
17-
port = 9989
18-
keyId = "m/44'/1'/0'/0/0"
19-
bookkeeping {
20-
difficultyTarget = "3"
21-
informerInterval = "8000"
22-
maxAmountBlockHeaders = "50"
23-
maxChunkSizeToHsm = "100"
24-
},
25-
socketTimeout = 60000
26-
maxAttempts = 12
27-
intervalBetweenAttempts = 4000
28-
}
29-
RSK {
30-
type = "hsm"
31-
host = "127.0.0.1"
32-
port = 9989
33-
keyId = "m/44'/1'/1'/0/0"
34-
}
35-
MST {
36-
type = "hsm"
37-
host = "127.0.0.1"
38-
port = 9989
39-
keyId = "m/44'/1'/2'/0/0"
40-
}
41-
}
4212
}
4313

4414
rpc {

‎config/node-configs/third-federation/fed4.conf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
peer {
3-
privateKey = "c3f1c2b28026a648f817f0e73b3cf769789e2eaed535a225765b065d75570028"
3+
privateKey = "cb0878d04ae1d7d30df5866f845467b1d3ead5116b7732b894d69b89dc90f03a"
44
}
55

66
# federator configuration
@@ -14,7 +14,7 @@ federator {
1414
BTC {
1515
type = "hsm"
1616
host = "127.0.0.1"
17-
port = 9982
17+
port = 9985
1818
keyId = "m/44'/1'/0'/0/0"
1919
bookkeeping {
2020
difficultyTarget = "3"
@@ -29,13 +29,13 @@ federator {
2929
RSK {
3030
type = "hsm"
3131
host = "127.0.0.1"
32-
port = 9982
32+
port = 9985
3333
keyId = "m/44'/1'/1'/0/0"
3434
}
3535
MST {
3636
type = "hsm"
3737
host = "127.0.0.1"
38-
port = 9982
38+
port = 9985
3939
keyId = "m/44'/1'/2'/0/0"
4040
}
4141
}

‎config/regtest-key-files-and-hsms.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ const bookkeepingConfigurations = {
1111
maxChunkSizeToHsm: "100"
1212
};
1313

14+
const DIFFICULTY_TARGET_IN_HEX = DIFFICULTY_TARGET_IN_HEX;
15+
1416
module.exports = {
1517
init: {
1618
mineInitialBitcoin: true,
@@ -185,7 +187,7 @@ module.exports = {
185187
federationId: 'second-federation',
186188
type: 'hsm',
187189
hsmPort: 9981,
188-
hsmDifficultyTarget: '0x03',
190+
hsmDifficultyTarget: DIFFICULTY_TARGET_IN_HEX,
189191
logbackFile: `${federatesLogbackPath}/second-federation/fed2.xml`,
190192
classpath: powpegNodeJarPath,
191193
configFile: `${nodesConfigPath}/second-federation/fed2.conf`,
@@ -220,7 +222,7 @@ module.exports = {
220222
federationId: 'second-federation',
221223
type: 'hsm',
222224
hsmPort: 9983,
223-
hsmDifficultyTarget: '0x03',
225+
hsmDifficultyTarget: DIFFICULTY_TARGET_IN_HEX,
224226
logbackFile: `${federatesLogbackPath}/second-federation/fed3.xml`,
225227
classpath: powpegNodeJarPath,
226228
configFile: `${nodesConfigPath}/second-federation/fed3.conf`,
@@ -307,7 +309,7 @@ module.exports = {
307309
federationId: 'third-federation',
308310
type: 'hsm',
309311
hsmPort: 9987,
310-
hsmDifficultyTarget: '0x03',
312+
hsmDifficultyTarget: DIFFICULTY_TARGET_IN_HEX,
311313
logbackFile: `${federatesLogbackPath}/third-federation/fed2.xml`,
312314
classpath: powpegNodeJarPath,
313315
configFile: `${nodesConfigPath}/third-federation/fed2.conf`,
@@ -380,8 +382,8 @@ module.exports = {
380382
id: 'federator-4-third-federation',
381383
federationId: 'third-federation',
382384
type: 'hsm',
383-
hsmPort: 9982,
384-
hsmDifficultyTarget: '0x03',
385+
hsmPort: 9985,
386+
hsmDifficultyTarget: DIFFICULTY_TARGET_IN_HEX,
385387
logbackFile: `${federatesLogbackPath}/third-federation/fed4.xml`,
386388
classpath: powpegNodeJarPath,
387389
configFile: `${nodesConfigPath}/third-federation/fed4.conf`,
@@ -464,7 +466,7 @@ module.exports = {
464466
federationId: 'fourth-federation',
465467
type: 'hsm',
466468
hsmPort: 9991,
467-
hsmDifficultyTarget: '0x03',
469+
hsmDifficultyTarget: DIFFICULTY_TARGET_IN_HEX,
468470
logbackFile: `${federatesLogbackPath}/fourth-federation/fed2.xml`,
469471
classpath: powpegNodeJarPath,
470472
configFile: `${nodesConfigPath}/fourth-federation/fed2.conf`,
@@ -537,8 +539,8 @@ module.exports = {
537539
id: 'federator-4-fourth-federation',
538540
federationId: 'fourth-federation',
539541
type: 'hsm',
540-
hsmPort: 9988,
541-
hsmDifficultyTarget: '0x03',
542+
hsmPort: 9989,
543+
hsmDifficultyTarget: DIFFICULTY_TARGET_IN_HEX,
542544
logbackFile: `${federatesLogbackPath}/fourth-federation/fed4.xml`,
543545
classpath: powpegNodeJarPath,
544546
configFile: `${nodesConfigPath}/fourth-federation/fed4.conf`,

‎lib/tcpsigner-runner.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class TcpSignerRunner {
5656
this.process = spawn(scriptPath, args, processOptions);
5757

5858
this.process.on('exit', () => {
59-
console.log(`TcpSignerRunner has stopped.`);
59+
console.log(`Tcpsigner with id "${this.id}" has stopped.`);
6060
this.isRunning = false;
6161
});
6262

0 commit comments

Comments
 (0)