From e79819cca81225f20485a72196603572ff2143ad Mon Sep 17 00:00:00 2001
From: Marco Argentieri <3596602+tiero@users.noreply.github.com>
Date: Tue, 13 Aug 2024 18:17:57 +0200
Subject: [PATCH] arkd: migrate to 7070 as default port (#246)
---
docker-compose.clark.regtest.yml | 2 +-
docker-compose.regtest.yml | 4 ++--
docker-compose.yml | 2 +-
pkg/client-sdk/example/covenant/alice_to_bob.go | 2 +-
pkg/client-sdk/example/covenant/wasm/index.html | 2 +-
pkg/client-sdk/example/covenantless/alice_to_bob.go | 2 +-
pkg/client-sdk/example/covenantless/wasm/index.html | 2 +-
pkg/client-sdk/store/store_test.go | 2 +-
pkg/client-sdk/wallet/wallet_test.go | 2 +-
server/Makefile | 2 +-
server/internal/config/config.go | 2 +-
server/test/e2e/covenant/e2e_test.go | 10 +++++-----
server/test/e2e/covenantless/e2e_test.go | 10 +++++-----
13 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/docker-compose.clark.regtest.yml b/docker-compose.clark.regtest.yml
index 7e90d92..cb703a1 100644
--- a/docker-compose.clark.regtest.yml
+++ b/docker-compose.clark.regtest.yml
@@ -17,7 +17,7 @@ services:
- ARK_NO_TLS=true
- ARK_NO_MACAROONS=true
ports:
- - "6000:6000"
+ - "7070:7070"
volumes:
- clarkd:/app/data
- clark:/app/wallet-data
diff --git a/docker-compose.regtest.yml b/docker-compose.regtest.yml
index 9bbe644..2da9e6d 100644
--- a/docker-compose.regtest.yml
+++ b/docker-compose.regtest.yml
@@ -33,11 +33,11 @@ services:
- ARK_ROUND_LIFETIME=512
- ARK_DB_TYPE=sqlite
- ARK_TX_BUILDER_TYPE=covenant
- - ARK_PORT=8080
+ - ARK_PORT=6060
- ARK_NO_TLS=true
- ARK_NO_MACAROONS=true
ports:
- - "8080:8080"
+ - "6060:6060"
volumes:
- arkd:/app/data
- ark:/app/wallet-data
diff --git a/docker-compose.yml b/docker-compose.yml
index b36bed8..e59db2f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,7 +31,7 @@ services:
- ARK_ROUND_INTERVAL=10
- ARK_NETWORK=liquidtestnet
ports:
- - "8080:6000"
+ - "7070:7070"
volumes:
- arkd:/app/data
- ark:/app/wallet-data
diff --git a/pkg/client-sdk/example/covenant/alice_to_bob.go b/pkg/client-sdk/example/covenant/alice_to_bob.go
index 20fa678..1c782e2 100644
--- a/pkg/client-sdk/example/covenant/alice_to_bob.go
+++ b/pkg/client-sdk/example/covenant/alice_to_bob.go
@@ -15,7 +15,7 @@ import (
)
var (
- aspUrl = "localhost:8080"
+ aspUrl = "localhost:6060"
clientType = arksdk.GrpcClient
password = "password"
walletType = arksdk.SingleKeyWallet
diff --git a/pkg/client-sdk/example/covenant/wasm/index.html b/pkg/client-sdk/example/covenant/wasm/index.html
index 6bc1a9f..a7f1e97 100644
--- a/pkg/client-sdk/example/covenant/wasm/index.html
+++ b/pkg/client-sdk/example/covenant/wasm/index.html
@@ -146,7 +146,7 @@
Wallet
-
+
diff --git a/pkg/client-sdk/example/covenantless/alice_to_bob.go b/pkg/client-sdk/example/covenantless/alice_to_bob.go
index a8c0e80..08c5790 100644
--- a/pkg/client-sdk/example/covenantless/alice_to_bob.go
+++ b/pkg/client-sdk/example/covenantless/alice_to_bob.go
@@ -15,7 +15,7 @@ import (
)
var (
- aspUrl = "localhost:8080"
+ aspUrl = "localhost:7070"
clientType = arksdk.GrpcClient
password = "password"
walletType = arksdk.SingleKeyWallet
diff --git a/pkg/client-sdk/example/covenantless/wasm/index.html b/pkg/client-sdk/example/covenantless/wasm/index.html
index a7178c3..80858e8 100644
--- a/pkg/client-sdk/example/covenantless/wasm/index.html
+++ b/pkg/client-sdk/example/covenantless/wasm/index.html
@@ -146,7 +146,7 @@
Wallet
-
+
diff --git a/pkg/client-sdk/store/store_test.go b/pkg/client-sdk/store/store_test.go
index 28b865a..0fa3d2d 100644
--- a/pkg/client-sdk/store/store_test.go
+++ b/pkg/client-sdk/store/store_test.go
@@ -18,7 +18,7 @@ func TestStore(t *testing.T) {
key, _ := btcec.NewPrivateKey()
ctx := context.Background()
testStoreData := store.StoreData{
- AspUrl: "localhost:8080",
+ AspUrl: "localhost:7070",
AspPubkey: key.PubKey(),
WalletType: wallet.SingleKeyWallet,
ClientType: client.GrpcClient,
diff --git a/pkg/client-sdk/wallet/wallet_test.go b/pkg/client-sdk/wallet/wallet_test.go
index afb243e..563b23e 100644
--- a/pkg/client-sdk/wallet/wallet_test.go
+++ b/pkg/client-sdk/wallet/wallet_test.go
@@ -21,7 +21,7 @@ func TestWallet(t *testing.T) {
key, _ := btcec.NewPrivateKey()
password := "password"
testStoreData := store.StoreData{
- AspUrl: "localhost:8080",
+ AspUrl: "localhost:7070",
AspPubkey: key.PubKey(),
WalletType: wallet.SingleKeyWallet,
ClientType: client.GrpcClient,
diff --git a/server/Makefile b/server/Makefile
index a23fb2e..a803054 100755
--- a/server/Makefile
+++ b/server/Makefile
@@ -37,7 +37,7 @@ run: clean
export ARK_ROUND_INTERVAL=10; \
export ARK_LOG_LEVEL=5; \
export ARK_NETWORK=regtest; \
- export ARK_PORT=8080; \
+ export ARK_PORT=7070; \
export ARK_NO_TLS=true; \
export ARK_NO_MACAROONS=true; \
export ARK_TX_BUILDER_TYPE=covenantless; \
diff --git a/server/internal/config/config.go b/server/internal/config/config.go
index 894e159..204f0fb 100644
--- a/server/internal/config/config.go
+++ b/server/internal/config/config.go
@@ -60,7 +60,7 @@ var (
defaultDatadir = common.AppDataDir("arkd", false)
defaultRoundInterval = 5
- DefaultPort = 6000
+ DefaultPort = 7070
defaultWalletAddr = "localhost:18000"
defaultDbType = "sqlite"
defaultDbMigrationPath = "file://internal/infrastructure/db/sqlite/migration"
diff --git a/server/test/e2e/covenant/e2e_test.go b/server/test/e2e/covenant/e2e_test.go
index f7ce5e2..051da3a 100644
--- a/server/test/e2e/covenant/e2e_test.go
+++ b/server/test/e2e/covenant/e2e_test.go
@@ -35,7 +35,7 @@ func TestMain(m *testing.M) {
time.Sleep(3 * time.Second)
- _, err = runArkCommand("init", "--asp-url", "localhost:8080", "--password", utils.Password, "--network", common.LiquidRegTest.Name, "--explorer", "http://chopsticks-liquid:3000")
+ _, err = runArkCommand("init", "--asp-url", "localhost:6060", "--password", utils.Password, "--network", common.LiquidRegTest.Name, "--explorer", "http://chopsticks-liquid:3000")
if err != nil {
fmt.Printf("error initializing ark config: %s", err)
os.Exit(1)
@@ -185,7 +185,7 @@ func setupAspWallet() error {
Timeout: 15 * time.Second,
}
- req, err := http.NewRequest("GET", "http://localhost:8080/v1/admin/wallet/seed", nil)
+ req, err := http.NewRequest("GET", "http://localhost:6060/v1/admin/wallet/seed", nil)
if err != nil {
return fmt.Errorf("failed to prepare generate seed request: %s", err)
}
@@ -205,7 +205,7 @@ func setupAspWallet() error {
}
reqBody := bytes.NewReader([]byte(fmt.Sprintf(`{"seed": "%s", "password": "%s"}`, seed.Seed, utils.Password)))
- req, err = http.NewRequest("POST", "http://localhost:8080/v1/admin/wallet/create", reqBody)
+ req, err = http.NewRequest("POST", "http://localhost:6060/v1/admin/wallet/create", reqBody)
if err != nil {
return fmt.Errorf("failed to prepare wallet create request: %s", err)
}
@@ -217,7 +217,7 @@ func setupAspWallet() error {
}
reqBody = bytes.NewReader([]byte(fmt.Sprintf(`{"password": "%s"}`, utils.Password)))
- req, err = http.NewRequest("POST", "http://localhost:8080/v1/admin/wallet/unlock", reqBody)
+ req, err = http.NewRequest("POST", "http://localhost:6060/v1/admin/wallet/unlock", reqBody)
if err != nil {
return fmt.Errorf("failed to prepare wallet unlock request: %s", err)
}
@@ -230,7 +230,7 @@ func setupAspWallet() error {
time.Sleep(time.Second)
- req, err = http.NewRequest("GET", "http://localhost:8080/v1/admin/wallet/address", nil)
+ req, err = http.NewRequest("GET", "http://localhost:6060/v1/admin/wallet/address", nil)
if err != nil {
return fmt.Errorf("failed to prepare new address request: %s", err)
}
diff --git a/server/test/e2e/covenantless/e2e_test.go b/server/test/e2e/covenantless/e2e_test.go
index 1a71a77..aad30a2 100644
--- a/server/test/e2e/covenantless/e2e_test.go
+++ b/server/test/e2e/covenantless/e2e_test.go
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
time.Sleep(3 * time.Second)
- _, err = runClarkCommand("init", "--asp-url", "localhost:6000", "--password", utils.Password, "--network", "regtest", "--explorer", "http://chopsticks:3000")
+ _, err = runClarkCommand("init", "--asp-url", "localhost:7070", "--password", utils.Password, "--network", "regtest", "--explorer", "http://chopsticks:3000")
if err != nil {
fmt.Printf("error initializing ark config: %s", err)
os.Exit(1)
@@ -190,7 +190,7 @@ func setupAspWallet() error {
Timeout: 15 * time.Second,
}
- req, err := http.NewRequest("GET", "http://localhost:6000/v1/admin/wallet/seed", nil)
+ req, err := http.NewRequest("GET", "http://localhost:7070/v1/admin/wallet/seed", nil)
if err != nil {
return fmt.Errorf("failed to prepare generate seed request: %s", err)
}
@@ -210,7 +210,7 @@ func setupAspWallet() error {
}
reqBody := bytes.NewReader([]byte(fmt.Sprintf(`{"seed": "%s", "password": "%s"}`, seed.Seed, utils.Password)))
- req, err = http.NewRequest("POST", "http://localhost:6000/v1/admin/wallet/create", reqBody)
+ req, err = http.NewRequest("POST", "http://localhost:7070/v1/admin/wallet/create", reqBody)
if err != nil {
return fmt.Errorf("failed to prepare wallet create request: %s", err)
}
@@ -222,7 +222,7 @@ func setupAspWallet() error {
}
reqBody = bytes.NewReader([]byte(fmt.Sprintf(`{"password": "%s"}`, utils.Password)))
- req, err = http.NewRequest("POST", "http://localhost:6000/v1/admin/wallet/unlock", reqBody)
+ req, err = http.NewRequest("POST", "http://localhost:7070/v1/admin/wallet/unlock", reqBody)
if err != nil {
return fmt.Errorf("failed to prepare wallet unlock request: %s", err)
}
@@ -235,7 +235,7 @@ func setupAspWallet() error {
time.Sleep(time.Second)
- req, err = http.NewRequest("GET", "http://localhost:6000/v1/admin/wallet/address", nil)
+ req, err = http.NewRequest("GET", "http://localhost:7070/v1/admin/wallet/address", nil)
if err != nil {
return fmt.Errorf("failed to prepare new address request: %s", err)
}