Skip to content

Commit

Permalink
Merge pull request #1305 from get10101/fix/testnet-maker
Browse files Browse the repository at this point in the history
  • Loading branch information
bonomat authored Sep 18, 2023
2 parents b8b3786 + 9e6ffe8 commit 536412b
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/deliverables-push-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions crates/ln-dlc-node/src/tests/load.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions crates/ln-dlc-node/src/tests/load/coordinator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
8 changes: 4 additions & 4 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mobile/lib/features/wallet/share_invoice_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ class _ShareInvoiceScreenState extends State<ShareInvoiceScreen> {
// 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);
Expand Down

0 comments on commit 536412b

Please sign in to comment.