From 9e6ffe89de27dd923ff0837cd6ddb2aecc31239d Mon Sep 17 00:00:00 2001 From: Philipp Hoenisch Date: Sun, 17 Sep 2023 09:28:54 +0200 Subject: [PATCH] fix: use new testnet setup Signed-off-by: Philipp Hoenisch --- .env.sample | 6 +++--- .github/workflows/deliverables-push-main.yml | 12 ++++++------ crates/ln-dlc-node/src/tests/load.rs | 4 ++-- crates/ln-dlc-node/src/tests/load/coordinator.rs | 4 ++-- justfile | 8 ++++---- mobile/lib/features/wallet/share_invoice_screen.dart | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.env.sample b/.env.sample index 1d4f1c7b1..27c2890b7 100644 --- a/.env.sample +++ b/.env.sample @@ -1,12 +1,12 @@ ALTOOL_API_KEY=TBA ALTOOL_API_ISSUER=TBA # test vm esplora endpoint -ESPLORA_ENDPOINT=http://35.189.57.114:3000 +ESPLORA_ENDPOINT=http://34.32.0.52:3000 # test vm coordinator -COORDINATOR_P2P_ENDPOINT=03507b924dae6595cfb78492489978127c5f1e3877848564de2015cd6d41375802@35.189.57.114:9045 +COORDINATOR_P2P_ENDPOINT=03507b924dae6595cfb78492489978127c5f1e3877848564de2015cd6d41375802@34.32.0.52:9045 COORDINATOR_PORT_HTTP=80 NETWORK=regtest -ORACLE_ENDPOINT=http://api.test.10101.finance:8081 +ORACLE_ENDPOINT=http://34.32.0.52:8081 ORACLE_PUBKEY=5d12d79f575b8d99523797c46441c0549eb0defb6195fe8a080000cbe3ab3859 # Fastlane android variables diff --git a/.github/workflows/deliverables-push-main.yml b/.github/workflows/deliverables-push-main.yml index 0a804df9f..7a5fcb62e 100644 --- a/.github/workflows/deliverables-push-main.yml +++ b/.github/workflows/deliverables-push-main.yml @@ -42,12 +42,12 @@ jobs: uses: ./.github/workflows/ios-fastlane.yml secrets: inherit with: - esplora_endpoint: http://35.189.57.114:3000 - coordinator_p2p_endpoint: 03507b924dae6595cfb78492489978127c5f1e3877848564de2015cd6d41375802@35.189.57.114:9045 + esplora_endpoint: http://34.32.0.52:3000 + coordinator_p2p_endpoint: 03507b924dae6595cfb78492489978127c5f1e3877848564de2015cd6d41375802@34.32.0.52:9045 coordinator_port_http: 80 network: regtest tag: main - oracle_endpoint: http://api.test.10101.finance:8081 + oracle_endpoint: http://34.32.0.52:8081 oracle_pubkey: 5d12d79f575b8d99523797c46441c0549eb0defb6195fe8a080000cbe3ab3859 fastlane_developer_app_identifier: finance.get10101.app.test fastlane_provisioning_profile_specifier: match AppStore finance.get10101.app.test @@ -63,9 +63,9 @@ jobs: secrets: inherit with: tag: main - esplora_endpoint: http://35.189.57.114:3000 - coordinator_p2p_endpoint: 03507b924dae6595cfb78492489978127c5f1e3877848564de2015cd6d41375802@35.189.57.114:9045 + esplora_endpoint: http://34.32.0.52:3000 + coordinator_p2p_endpoint: 03507b924dae6595cfb78492489978127c5f1e3877848564de2015cd6d41375802@34.32.0.52:9045 coordinator_port_http: 80 network: regtest - oracle_endpoint: http://api.test.10101.finance:8081 + oracle_endpoint: http://34.32.0.52:8081 oracle_pubkey: 5d12d79f575b8d99523797c46441c0549eb0defb6195fe8a080000cbe3ab3859 diff --git a/crates/ln-dlc-node/src/tests/load.rs b/crates/ln-dlc-node/src/tests/load.rs index c15454d0f..786e352f1 100644 --- a/crates/ln-dlc-node/src/tests/load.rs +++ b/crates/ln-dlc-node/src/tests/load.rs @@ -20,8 +20,8 @@ use std::time::Duration; mod coordinator; -const ESPLORA_ORIGIN_PUBLIC_REGTEST: &str = "http://35.189.57.114:3000"; -const ORACLE_ORIGIN_PUBLIC_REGTEST: &str = "http://35.189.57.114:8081"; +const ESPLORA_ORIGIN_PUBLIC_REGTEST: &str = "http://34.32.0.52:3000"; +const ORACLE_ORIGIN_PUBLIC_REGTEST: &str = "http://34.32.0.52:8081"; const ORACLE_PUBKEY_PUBLIC_REGTEST: &str = "5d12d79f575b8d99523797c46441c0549eb0defb6195fe8a080000cbe3ab3859"; diff --git a/crates/ln-dlc-node/src/tests/load/coordinator.rs b/crates/ln-dlc-node/src/tests/load/coordinator.rs index cfeacb5ae..482e0beee 100644 --- a/crates/ln-dlc-node/src/tests/load/coordinator.rs +++ b/crates/ln-dlc-node/src/tests/load/coordinator.rs @@ -38,9 +38,9 @@ impl Coordinator { } pub fn new_public_regtest() -> Self { - const HTTP_ENDPOINT: &str = "35.189.57.114:80"; + const HTTP_ENDPOINT: &str = "34.32.0.52:80"; const PK: &str = "03507b924dae6595cfb78492489978127c5f1e3877848564de2015cd6d41375802"; - const P2P_ADDRESS: &str = "35.189.57.114:9045"; + const P2P_ADDRESS: &str = "34.32.0.52:9045"; Self::new(HTTP_ENDPOINT, PK, P2P_ADDRESS).expect("correct coordinator parameters") } diff --git a/justfile b/justfile index 49ec07243..1fb0be4e5 100644 --- a/justfile +++ b/justfile @@ -8,10 +8,10 @@ maker_log_file := "$PWD/data/maker/regtest.log" pubspec := "$PWD/mobile/pubspec.yaml" # public regtest constants -public_regtest_coordinator := "03507b924dae6595cfb78492489978127c5f1e3877848564de2015cd6d41375802@35.189.57.114:9045" -public_regtest_esplora := "http://35.189.57.114:3000" +public_regtest_coordinator := "03507b924dae6595cfb78492489978127c5f1e3877848564de2015cd6d41375802@34.32.0.52:9045" +public_regtest_esplora := "http://34.32.0.52:3000" public_coordinator_http_port := "80" -public_regtest_oracle_endpoint := "http://api.test.10101.finance:8081" +public_regtest_oracle_endpoint := "http://34.32.0.52:8081" public_regtest_oracle_pk := "5d12d79f575b8d99523797c46441c0549eb0defb6195fe8a080000cbe3ab3859" # command to get the local IP of this machine @@ -133,7 +133,7 @@ fund args="": # Fund remote regtest instance fund-regtest: - cargo run --example fund -- --faucet=http://35.189.57.114:8080 --coordinator=http://35.189.57.114:80 + cargo run --example fund -- --faucet=http://34.32.0.52:8080 --coordinator=http://34.32.0.52:80 clean: #!/usr/bin/env bash diff --git a/mobile/lib/features/wallet/share_invoice_screen.dart b/mobile/lib/features/wallet/share_invoice_screen.dart index 1e23a7401..37cbefe8c 100644 --- a/mobile/lib/features/wallet/share_invoice_screen.dart +++ b/mobile/lib/features/wallet/share_invoice_screen.dart @@ -242,7 +242,7 @@ class _ShareInvoiceScreenState extends State { // locally if needed for dev testing // It's not populated in Config struct, as it's not used in production String faucet = - const String.fromEnvironment("REGTEST_FAUCET", defaultValue: "http://35.189.57.114:8080"); + const String.fromEnvironment("REGTEST_FAUCET", defaultValue: "http://34.32.0.52:8080"); final data = {'payment_request': invoice}; final encodedData = json.encode(data);