From d4bb658bcda43bb796b08773d1f9c6f5c94abcfb Mon Sep 17 00:00:00 2001 From: Denis Kolodin Date: Fri, 11 Aug 2023 15:18:11 +0200 Subject: [PATCH] feat: use the stagenet (#229) --- libs/protocol/src/settings.rs | 7 ++- libs/sdm-assets/assets/config.toml | 54 +++++++++++++++++-- .../src/resources/images/l2_base_node.rs | 4 ++ 3 files changed, 60 insertions(+), 5 deletions(-) diff --git a/libs/protocol/src/settings.rs b/libs/protocol/src/settings.rs index 9a659f4b..f25d00c7 100644 --- a/libs/protocol/src/settings.rs +++ b/libs/protocol/src/settings.rs @@ -133,7 +133,7 @@ impl Default for LaunchpadSettings { fn default() -> Self { Self { data_directory: PathBuf::default(), - tari_network: TariNetwork::Esmeralda, + tari_network: TariNetwork::default(), tor_control_password: String::new(), base_node: None, wallet: None, @@ -158,6 +158,7 @@ pub enum TariNetwork { Dibbler, Esmeralda, Igor, + Stagenet, Mainnet, } @@ -167,6 +168,7 @@ impl TariNetwork { Self::Dibbler => "dibbler", Self::Esmeralda => "esmeralda", Self::Igor => "igor", + Self::Stagenet => "stagenet", Self::Mainnet => "mainnet", } } @@ -176,6 +178,7 @@ impl TariNetwork { Self::Dibbler => "DIBBLER", Self::Esmeralda => "ESMERALDA", Self::Igor => "IGOR", + Self::Stagenet => "STAGENET", Self::Mainnet => "MAINNET", } } @@ -184,7 +187,7 @@ impl TariNetwork { /// Default network is Esme. This will change after mainnet launch impl Default for TariNetwork { fn default() -> Self { - Self::Esmeralda + Self::Stagenet } } diff --git a/libs/sdm-assets/assets/config.toml b/libs/sdm-assets/assets/config.toml index a42face1..eab34558 100644 --- a/libs/sdm-assets/assets/config.toml +++ b/libs/sdm-assets/assets/config.toml @@ -1,8 +1,8 @@ # Config for launchpad v1.0.0 [base_node] -network = "esmeralda" +network = "stagenet" grpc_address = "/ip4/0.0.0.0/tcp/18142" -override_from = "esmeralda" +override_from = "stagenet" [base_node.storage] # pruning_horizon = 10_080 @@ -20,6 +20,12 @@ base_node_identity_file = "/var/tari/base_node/config/igor/tar_base_node_id.json identity_file = "/var/tari/base_node/config/esmeralda/tari_base_node_id.json" grpc_address = "/ip4/0.0.0.0/tcp/18142" +[stagenet.base_node] +identity_file = "/var/tari/base_node/config/stagenet/tari_base_node_id.json" + +[nextnet.base_node] +identity_file = "/var/tari/base_node/config/nextnet/tari_base_node_id.json" + [base_node.p2p] auxiliary_tcp_listener_address = "/dns4/base_node/tcp/18189" @@ -34,6 +40,48 @@ control_address = "/dns4/tor/tcp/9051" [base_node.p2p.transport.tcp] listener_address = "/dns4/base_node/tcp/18189" +[nextnet.p2p.seeds] +# DNS seeds hosts - DNS TXT records are queried from these hosts and the resulting peers added to the comms peer list. +dns_seeds = ["seeds.nextnet.tari.com"] +# Custom specified peer seed nodes +peer_seeds = [ + # 44444408d5fa29410d9752770f + "2c84ccdf0dcb7b4845f167ea8988166384a36451d068e0ae1bb84b5bf0d52425::/onion3/7gwfakr7ko5uo3fl3yz3fsjc7elccbzter5botggodrmmwi2exm3vbid:18141", + # bbbbbb87215db9ee00bb2763b5 + "64639314dc3c9a4b0fa57f812d68b381a882e72eb9cc20e861ce6e04936ef438::/onion3/lvsj75guqc4gfqasgyhg3of2clijf3vkgipbpufh6dmhyapp2dmuelad:18141", +] + +[stagenet.p2p.seeds] +# DNS seeds hosts - DNS TXT records are queried from these hosts and the resulting peers added to the comms peer list. +dns_seeds = ["seeds.stagenet.tari.com"] +# Custom specified peer seed nodes +peer_seeds = [ + # 1337e9449e63134fd5e0ba3207 + "a062ae2345b0db0df9fb1504b99511e23d98f8513f9b5503efcc6dad8eca7e47::/onion3/rhoqxfbzz3uidp23erxu4mkwwexc2gg4q45rcxfpbhb35ycdv4ex2fid:18141", + "a062ae2345b0db0df9fb1504b99511e23d98f8513f9b5503efcc6dad8eca7e47::/ip4/54.77.66.39/tcp/18189", + # 1a1a1a4b79a81467a2c815a371 + "b2c5db3a2858451d241d4e88677536f9e82a760111962785fb6a3cddc41f766e::/onion3/q32yxdg7l7os2zzx64e3f5u4mzib3lxlkdyguybkhtkd4pwfkpunjcyd:18141", + # 2b2b2b56e8e1479f1685d5f4ce + "1cdf34d27bee5e1edbc343a17f7d79a8a1974fe3f790e899d8987c1f11697e41::/onion3/fwvmhhcifr7yh7neqsweyjvu4bnlmljg6a6fsjdwify3b4aals2oc3yd:18141", + # 3c3c3c8c3aa72ea4c2a943564a + "a42eea2088e0ef663b8d29a9d039b0e5d51c1ddc1cf5ae28feb05ed52ead5a69::/onion3/k5khqg7fwkq7ujxievps22r42i5ykuieai64ze3kj5snsjkew3v7piid:18141", + # 4d4d4df1add5ac00a8c276f11e + "d49df057e1f1ae399ffabdeb59e7ad542439ab2b0bbd9ed23042175a93e4d03c::/onion3/hjeczose7rjo6o6qhsszkuzhrm6qfs7s4yeqzeuz2m67rkpijrtrwsad:18141", + # 5e5e5eace5fc25c4ce83fbaab6 + "e65f18cb4a362b33667e0d39b3c93f06c0e822af09906914bdc65907b7cdc130::/onion3/uuv6j3vwq4dac6z3dblc2mjcoecrnxfka3wg43bcass5avbzix4nmzyd:18141", + # 6f6f6f01facc230ad923de9159 + "0a755298f4bee8e6db64e345fe8f937e3882693a48c71b942b88744761b02067::/onion3/ksdogedobmqoud6ampvrjrhoozftgfkolhxqvnt7mo7ajqczku5tyyqd:18141", + # 777777aec8a3e4add50054d457 + "0c22d3dc3983c74131d7dfb0c4c8ae9fb90c434826cf8ccc71e793bb72d36213::/onion3/so2be7uyg4kf5l7ys3fbk4eqovsfi63yuaqj7pahkkw2crujq43jdnyd:18141", + "0c22d3dc3983c74131d7dfb0c4c8ae9fb90c434826cf8ccc71e793bb72d36213::/ip4/63.35.51.217/tcp/18189", + # 8888883587be3e94600c246c3b + "2ade610a2e95f1c686873944096f5a1f2c7ffcf47d67112b472c9208cc6e9532::/onion3/rmiknlrf7ngfvgpayf5qzuer2c547rzmyqbkbw45w5uessi3jodasdqd:18141", + "2ade610a2e95f1c686873944096f5a1f2c7ffcf47d67112b472c9208cc6e9532::/ip4/54.73.25.246/tcp/18189", + # 99999903f5951fa1ca9505c3c2 + "369ae9a89c3fc2804d6ec07e20bf10e5d0e72f565a71821fc7c611ae5bee0116::/onion3/crvsrmoyrk5uatvnafsmoykiqgywdqowupn3auq25iz7zxyf7xusjxid:18141", + "369ae9a89c3fc2804d6ec07e20bf10e5d0e72f565a71821fc7c611ae5bee0116::/ip4/34.252.174.111/tcp/18189", +] + [dibbler.p2p.seeds] dns_seeds = ["seeds.dibbler.tari.com"] peer_seeds = [ @@ -81,7 +129,7 @@ peer_seeds = [ ] [wallet] -override_from = "esmeralda" +override_from = "stagenet" db_file = "wallet/wallet.dat" grpc_address = "/ip4/0.0.0.0/tcp/18143" password = "tari" diff --git a/libs/sdm-launchpad/src/resources/images/l2_base_node.rs b/libs/sdm-launchpad/src/resources/images/l2_base_node.rs index a0d2d39a..a7fff236 100644 --- a/libs/sdm-launchpad/src/resources/images/l2_base_node.rs +++ b/libs/sdm-launchpad/src/resources/images/l2_base_node.rs @@ -80,6 +80,10 @@ impl ManagedContainer for TariBaseNode { "tari_base_node" } + fn tag(&self) -> &str { + "v0.49.2_20230628_e0e4ebc" + } + fn reconfigure(&mut self, config: Option<&LaunchpadConfig>) -> Option { self.settings = ConnectionSettings::try_extract(config?); let session = &self.settings.as_ref()?.session;