Skip to content

Commit 697a6b7

Browse files
committed
sample-tapd.conf+tapcfg: add default signet/testnet4 uni servers
Uses our universe servers as proof couriers by default for the networks testnet4 and signet. The ports are different from the testnet and mainnet instances because the infrastructure was set up slightly differently.
1 parent 608bed8 commit 697a6b7

File tree

3 files changed

+64
-4
lines changed

3 files changed

+64
-4
lines changed

sample-tapd.conf

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,14 @@
5757
; reorgsafedepth=6
5858

5959
; Default proof courier service address
60-
; proofcourieraddr=universerpc://testnet.universe.lightning.finance:10029
60+
; Default: (testnet)
61+
; proofcourieraddr=universerpc://testnet.universe.lightning.finance:10029
62+
; Default for testnet4:
63+
; proofcourieraddr=universerpc://testnet4.universe.lightning.finance:443
64+
; Default for signet:
65+
; proofcourieraddr=universerpc://signet.universe.lightning.finance:443
66+
; Default for mainnet:
67+
; proofcourieraddr=universerpc://universe.lightning.finance:10029
6168

6269
; The number of seconds the custodian waits after identifying an asset transfer
6370
; on-chain and before retrieving the corresponding proof. Valid time units are

tapcfg/config.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ const (
5454

5555
defaultNetwork = "testnet"
5656

57-
defaultMainnetFederationServer = "universe.lightning.finance:10029"
58-
defaultTestnetFederationServer = "testnet.universe.lightning.finance:10029"
57+
defaultMainnetFederationServer = "universe.lightning.finance:10029"
58+
defaultTestnetFederationServer = "testnet.universe.lightning.finance:10029"
59+
defaultTestnet4FederationServer = "testnet4.universe.lightning.finance:443"
60+
defaultSignetFederationServer = "signet.universe.lightning.finance:443"
5961

6062
// DefaultAutogenValidity is the default validity of a self-signed
6163
// certificate. The value corresponds to 14 months

tapcfg/server.go

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger,
205205
}
206206

207207
// For mainnet, we need to overwrite the default universe proof
208-
// courier address to use the mainnet server.
208+
// courier address to use the mainnet server (the default is
209+
// the testnet3 server).
209210
if cfg.DefaultProofCourierAddr == defaultProofCourierAddr {
210211
cfg.DefaultProofCourierAddr = fmt.Sprintf(
211212
"%s://%s", proof.UniverseRpcCourierType,
@@ -228,6 +229,56 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger,
228229
)
229230
}
230231

232+
case "testnet4":
233+
// Add our default testnet4 federation server to the list of
234+
// federation servers if not disabled by the user for privacy
235+
// reasons.
236+
if !cfg.Universe.NoDefaultFederation {
237+
cfgLogger.Infof("Configuring %v as initial Universe "+
238+
"federation server",
239+
defaultTestnet4FederationServer)
240+
241+
federationMembers = append(
242+
federationMembers,
243+
defaultTestnet4FederationServer,
244+
)
245+
}
246+
247+
// For testnet4, we need to overwrite the default universe proof
248+
// courier address to use the testnet4 server (the default is
249+
// the testnet3 server).
250+
if cfg.DefaultProofCourierAddr == defaultProofCourierAddr {
251+
cfg.DefaultProofCourierAddr = fmt.Sprintf(
252+
"%s://%s", proof.UniverseRpcCourierType,
253+
defaultTestnet4FederationServer,
254+
)
255+
}
256+
257+
case "signet":
258+
// Add our default signet federation server to the list of
259+
// federation servers if not disabled by the user for privacy
260+
// reasons.
261+
if !cfg.Universe.NoDefaultFederation {
262+
cfgLogger.Infof("Configuring %v as initial Universe "+
263+
"federation server",
264+
defaultSignetFederationServer)
265+
266+
federationMembers = append(
267+
federationMembers,
268+
defaultSignetFederationServer,
269+
)
270+
}
271+
272+
// For signet, we need to overwrite the default universe proof
273+
// courier address to use the signet server (the default is
274+
// the testnet3 server).
275+
if cfg.DefaultProofCourierAddr == defaultProofCourierAddr {
276+
cfg.DefaultProofCourierAddr = fmt.Sprintf(
277+
"%s://%s", proof.UniverseRpcCourierType,
278+
defaultSignetFederationServer,
279+
)
280+
}
281+
231282
default:
232283
// For any other network, such as regtest, we can't use a
233284
// universe proof courier by default, as we don't know what

0 commit comments

Comments
 (0)