From 9d28f4f484b63aed0d621a19e061f13b79fffe94 Mon Sep 17 00:00:00 2001 From: fish <920886811@163.com> Date: Thu, 27 Oct 2022 11:01:46 +0800 Subject: [PATCH 1/2] feat: drop status domain --- init.go | 6 +++--- migrations.go | 10 +++++----- services.go | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/init.go b/init.go index 1e5c245..8bab2fe 100644 --- a/init.go +++ b/init.go @@ -212,7 +212,7 @@ func flatfsSpec() map[string]interface{} { // DefaultServicesConfig returns the default set of configs for external services. func DefaultServicesConfig() Services { return Services{ - StatusServerDomain: "https://status.btfs.io", + //StatusServerDomain: "https://status.btfs.io", OnlineServerDomain: "https://online.btfs.io", HubDomain: "https://score.btfs.io", EscrowDomain: "https://escrow.btfs.io", @@ -229,7 +229,7 @@ func DefaultServicesConfig() Services { // DefaultServicesConfigDev returns the default set of configs for dev external services. func DefaultServicesConfigDev() Services { return Services{ - StatusServerDomain: "https://status-dev.btfs.io", + //StatusServerDomain: "https://status-dev.btfs.io", OnlineServerDomain: "https://online-dev.btfs.io", HubDomain: "https://score-dev.btfs.io", EscrowDomain: "https://escrow-dev.btfs.io", @@ -246,7 +246,7 @@ func DefaultServicesConfigDev() Services { // DefaultServicesConfigTestnet returns the default set of configs for testnet external services. func DefaultServicesConfigTestnet() Services { return Services{ - StatusServerDomain: "https://status-staging.btfs.io", + //StatusServerDomain: "https://status-staging.btfs.io", OnlineServerDomain: "https://online-staging.btfs.io", HubDomain: "https://score-staging.btfs.io", EscrowDomain: "https://escrow-staging.btfs.io", diff --git a/migrations.go b/migrations.go index edf75c4..cd228d8 100644 --- a/migrations.go +++ b/migrations.go @@ -21,11 +21,11 @@ func migrate_1_Services(cfg *Config) bool { } func migrate_2_StatusUrl(cfg *Config) bool { - if strings.Contains(cfg.Services.StatusServerDomain, "db.btfs.io") { - ds := DefaultServicesConfig() - cfg.Services.StatusServerDomain = ds.StatusServerDomain - return true - } + //if strings.Contains(cfg.Services.StatusServerDomain, "db.btfs.io") { + // ds := DefaultServicesConfig() + // cfg.Services.StatusServerDomain = ds.StatusServerDomain + // return true + //} return false } diff --git a/services.go b/services.go index ff390eb..4ad8ae2 100644 --- a/services.go +++ b/services.go @@ -1,7 +1,7 @@ package config type Services struct { - StatusServerDomain string + //StatusServerDomain string OnlineServerDomain string HubDomain string EscrowDomain string From 2f79b8eebb1ddefc59b30cdd4624086747b1cdfc Mon Sep 17 00:00:00 2001 From: fish <920886811@163.com> Date: Thu, 27 Oct 2022 11:58:53 +0800 Subject: [PATCH 2/2] mod: DefaultTestnetBootstrapAddresses --- bootstrap_peers.go | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/bootstrap_peers.go b/bootstrap_peers.go index de080af..a08378f 100644 --- a/bootstrap_peers.go +++ b/bootstrap_peers.go @@ -37,22 +37,21 @@ var DefaultBootstrapAddresses = []string{ "/ip4/15.184.96.102/tcp/4001/p2p/16Uiu2HAmFVWTvouWpQTRjMb4bUaidfLzsH2RVogcGHb6RwvPSxuT", } var DefaultTestnetBootstrapAddresses = []string{ - "/ip4/18.158.67.141/tcp/4000/p2p/16Uiu2HAmNvMMxEEfP1mg5d6TUQQLWhHd4s4moAB8xPgCgZBTwwZF", - "/ip4/18.158.67.141/tcp/4001/p2p/16Uiu2HAmUYNteRBWb12KGZ2UwogfuVdCFJfuH3fYP3bcndTUY4ZF", - "/ip4/18.158.67.141/tcp/4002/p2p/16Uiu2HAmJCoTMZkmW1zkCVCnohTiCk1PyepxeGMgnvQYpnQMxqVb", - "/ip4/18.158.67.141/tcp/4003/p2p/16Uiu2HAkxcrp6Pf5WvzQEEbEMVMZfTrtMpnTJCJcUaN6PGDKvegX", - "/ip4/18.163.235.175/tcp/4000/p2p/16Uiu2HAkw8Pkrf4fARvKZUcPBH7LhhVG4PoZBqKni3kbWkYsPYog", - "/ip4/18.163.235.175/tcp/4001/p2p/16Uiu2HAmJ9xHAr4ymFBt16tvst1psSc9jMRsbxvUDC2xw1XtnAEg", - "/ip4/18.163.235.175/tcp/4002/p2p/16Uiu2HAmLVmEkbxbq3Pmem5qun8HB1t9npkjycmqCf3Sk4wy8EPx", - "/ip4/18.163.235.175/tcp/4003/p2p/16Uiu2HAmLxRpzJKTzGkW8ajtbg89p8TTgagdHrvAWbum7rftTrQS", - "/ip4/18.224.174.215/tcp/4000/p2p/16Uiu2HAmDonyuAvQtGJ7kvM5xB3aJz25niDAzYoYQUjSuaZJopoZ", - "/ip4/18.224.174.215/tcp/4001/p2p/16Uiu2HAm3CyQ4o9adf642iZDUfQW4qVsm9FeBummYDzY9ExTrf3v", - "/ip4/18.224.174.215/tcp/4002/p2p/16Uiu2HAkyu5b6D7TwLNSQfvK2xyZWevTaLLaiKG2tKsQfd272LGs", - "/ip4/18.224.174.215/tcp/4003/p2p/16Uiu2HAm6biQRpXPKi92X4i9bCjnbTtPAmQ97czMjWhutvdE9m46", - "/ip4/54.151.185.243/tcp/4000/p2p/16Uiu2HAmU9ysnuasmdyq1rRePYTwHntmyhZdfC9wm4qCPQMAh9Qq", - "/ip4/54.151.185.243/tcp/4001/p2p/16Uiu2HAmBr4p1met83wxVCyVwpQexBVzSZrawfnLeWH9Ce8wwwtg", - "/ip4/54.151.185.243/tcp/4002/p2p/16Uiu2HAmBqxLRBmjF16sQuyQxdWf9dgXVzY3Qp5YXjKT5zgkmsVN", - "/ip4/54.151.185.243/tcp/4003/p2p/16Uiu2HAmSg1CHTDNEazJnDGfhA5pGbw1RZK1g2HZJmi3JVPkHGW8", + "/ip4/18.224.174.215/tcp/45301/p2p/16Uiu2HAmFFwNdgSoLhfgJUPEfPEVodppRxaeZBVpAvrH5s3qSkWo", + "/ip4/18.224.174.215/tcp/34237/p2p/16Uiu2HAmDigS3SDx6g9Sp6MUfdFHvDwS8Zw8E14V6bLhCAHA3jjB", + "/ip4/18.224.174.215/tcp/43097/p2p/16Uiu2HAm7HQoEbQe1fYt4LtnG6z5TqwTrrqUv5xsnt4nukskWmAi", + "/ip4/18.224.174.215/tcp/38955/p2p/16Uiu2HAm5WrYvkJwaRP7ZAroWCfjaUxKkNssqcSmEmKJ8vXVYp1o", + "/ip4/54.151.185.243/tcp/36707/p2p/16Uiu2HAmDis3wAorW46YyNmXNk963VAAHwZ1phjHXj5yduyawAUy", + "/ip4/54.151.185.243/tcp/42741/p2p/16Uiu2HAmSfqLCyqH5qQQF8zpzPMQvWiQunhWpYtSxwGw5QR2jhgU", + "/ip4/54.151.185.243/tcp/37403/p2p/16Uiu2HAmBHwyRUETsGqjYpgPRpnMC9y39tcVYH6vKxZidCBcBeFG", + "/ip4/54.151.185.243/tcp/37739/p2p/16Uiu2HAm2oKy37KvYmiv1nnRWZwUoLPZumNKFxPzhM1t8F3KxADu", + "/ip4/18.158.67.141/tcp/40155/p2p/16Uiu2HAmTMEqndByECXuxk1Rg8szxMqwS3tUFFWhAUduFzwfwmfK", + "/ip4/18.158.67.141/tcp/44569/p2p/16Uiu2HAmL4QNi68nSNbedUWp1A1cRR3z3NuJqQYmAYoj19ht6iNv", + "/ip4/18.158.67.141/tcp/39703/p2p/16Uiu2HAkzF6JMx4EL2C4cLoCLyQH8t1sgyttQxPfQtNt5FZhvpxs", + "/ip4/18.158.67.141/tcp/46713/p2p/16Uiu2HAm85HXJA7xmgNxxTVdFRuRCGstvrY8nW6KqfTtkuZrZg64", + "/ip4/18.163.235.175/tcp/36335/p2p/16Uiu2HAm8wVUsVsqksBfxy6yzHpVv5gELQnpU7Q2uhDyXFwr9bfV", + "/ip4/18.163.235.175/tcp/44029/p2p/16Uiu2HAmBvnQU5FWgEcfY1jaAK2Q9iQBy6FwQdDUtyT7mo8HU1Yu", + "/ip4/18.163.235.175/tcp/40191/p2p/16Uiu2HAkurshicwtTrqbrL3yv9xR7hogPvreUHJP3W8n9W5XMibz", } // ErrInvalidPeerAddr signals an address is not a valid peer address.