aljaz/ark
1
0
Fork 0
mirror of https://github.com/aljazceru/ark.git synced 2025-12-17 04:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

arkd: migrate to 7070 as default port (#246)

Browse Source
This commit is contained in:
Marco Argentieri
2024-08-13 18:17:57 +02:00
committed by GitHub
parent cfb6f9ec41
commit e79819cca8
13 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.clark.regtest.yml
View File

@@ -17,7 +17,7 @@ services:
- ARK_NO_TLS=true - ARK_NO_TLS=true
- ARK_NO_MACAROONS=true - ARK_NO_MACAROONS=true
ports: ports:
- "6000:6000" - "7070:7070"
volumes: volumes:
- clarkd:/app/data - clarkd:/app/data
- clark:/app/wallet-data - clark:/app/wallet-data

4
docker-compose.regtest.yml
View File

@@ -33,11 +33,11 @@ services:
- ARK_ROUND_LIFETIME=512 - ARK_ROUND_LIFETIME=512
- ARK_DB_TYPE=sqlite - ARK_DB_TYPE=sqlite
- ARK_TX_BUILDER_TYPE=covenant - ARK_TX_BUILDER_TYPE=covenant
- ARK_PORT=8080 - ARK_PORT=6060
- ARK_NO_TLS=true - ARK_NO_TLS=true
- ARK_NO_MACAROONS=true - ARK_NO_MACAROONS=true
ports: ports:
- "8080:8080" - "6060:6060"
volumes: volumes:
- arkd:/app/data - arkd:/app/data
- ark:/app/wallet-data - ark:/app/wallet-data

2
docker-compose.yml
View File

@@ -31,7 +31,7 @@ services:
- ARK_ROUND_INTERVAL=10 - ARK_ROUND_INTERVAL=10
- ARK_NETWORK=liquidtestnet - ARK_NETWORK=liquidtestnet
ports: ports:
- "8080:6000" - "7070:7070"
volumes: volumes:
- arkd:/app/data - arkd:/app/data
- ark:/app/wallet-data - ark:/app/wallet-data

2
pkg/client-sdk/example/covenant/alice_to_bob.go
View File

@@ -15,7 +15,7 @@ import (
) )
var ( var (
aspUrl = "localhost:8080" aspUrl = "localhost:6060"
clientType = arksdk.GrpcClient clientType = arksdk.GrpcClient
password = "password" password = "password"
walletType = arksdk.SingleKeyWallet walletType = arksdk.SingleKeyWallet

2
pkg/client-sdk/example/covenant/wasm/index.html
View File

@@ -146,7 +146,7 @@
<h2>Wallet</h2> <h2>Wallet</h2>
<div> <div>
<button onclick="initWallet()">Init</button> <button onclick="initWallet()">Init</button>
<input type="text" id="aspUrl" placeholder="http://localhost:8080"> <input type="text" id="aspUrl" placeholder="http://localhost:6060">
<input type="password" id="i_password" placeholder="password"> <input type="password" id="i_password" placeholder="password">
<input type="text" id="prvkey" placeholder="Optional: privkey (hex)"> <input type="text" id="prvkey" placeholder="Optional: privkey (hex)">
</div> </div>

2
pkg/client-sdk/example/covenantless/alice_to_bob.go
View File

@@ -15,7 +15,7 @@ import (
) )
var ( var (
aspUrl = "localhost:8080" aspUrl = "localhost:7070"
clientType = arksdk.GrpcClient clientType = arksdk.GrpcClient
password = "password" password = "password"
walletType = arksdk.SingleKeyWallet walletType = arksdk.SingleKeyWallet

2
pkg/client-sdk/example/covenantless/wasm/index.html
View File

@@ -146,7 +146,7 @@
<h2>Wallet</h2> <h2>Wallet</h2>
<div> <div>
<button onclick="initWallet()">Init</button> <button onclick="initWallet()">Init</button>
<input type="text" id="aspUrl" placeholder="http://localhost:8080"> <input type="text" id="aspUrl" placeholder="http://localhost:7070">
<input type="password" id="i_password" placeholder="password"> <input type="password" id="i_password" placeholder="password">
<input type="text" id="prvkey" placeholder="Optional: privkey (hex)"> <input type="text" id="prvkey" placeholder="Optional: privkey (hex)">
</div> </div>

2
pkg/client-sdk/store/store_test.go
View File

@@ -18,7 +18,7 @@ func TestStore(t *testing.T) {
key, _ := btcec.NewPrivateKey() key, _ := btcec.NewPrivateKey()
ctx := context.Background() ctx := context.Background()
testStoreData := store.StoreData{ testStoreData := store.StoreData{
AspUrl: "localhost:8080", AspUrl: "localhost:7070",
AspPubkey: key.PubKey(), AspPubkey: key.PubKey(),
WalletType: wallet.SingleKeyWallet, WalletType: wallet.SingleKeyWallet,
ClientType: client.GrpcClient, ClientType: client.GrpcClient,

2
pkg/client-sdk/wallet/wallet_test.go
View File

@@ -21,7 +21,7 @@ func TestWallet(t *testing.T) {
key, _ := btcec.NewPrivateKey() key, _ := btcec.NewPrivateKey()
password := "password" password := "password"
testStoreData := store.StoreData{ testStoreData := store.StoreData{
AspUrl: "localhost:8080", AspUrl: "localhost:7070",
AspPubkey: key.PubKey(), AspPubkey: key.PubKey(),
WalletType: wallet.SingleKeyWallet, WalletType: wallet.SingleKeyWallet,
ClientType: client.GrpcClient, ClientType: client.GrpcClient,

2
server/Makefile
View File

@@ -37,7 +37,7 @@ run: clean
export ARK_ROUND_INTERVAL=10; \ export ARK_ROUND_INTERVAL=10; \
export ARK_LOG_LEVEL=5; \ export ARK_LOG_LEVEL=5; \
export ARK_NETWORK=regtest; \ export ARK_NETWORK=regtest; \
export ARK_PORT=8080; \ export ARK_PORT=7070; \
export ARK_NO_TLS=true; \ export ARK_NO_TLS=true; \
export ARK_NO_MACAROONS=true; \ export ARK_NO_MACAROONS=true; \
export ARK_TX_BUILDER_TYPE=covenantless; \ export ARK_TX_BUILDER_TYPE=covenantless; \

2
server/internal/config/config.go
View File

@@ -60,7 +60,7 @@ var (
defaultDatadir = common.AppDataDir("arkd", false) defaultDatadir = common.AppDataDir("arkd", false)
defaultRoundInterval = 5 defaultRoundInterval = 5
DefaultPort = 6000 DefaultPort = 7070
defaultWalletAddr = "localhost:18000" defaultWalletAddr = "localhost:18000"
defaultDbType = "sqlite" defaultDbType = "sqlite"
defaultDbMigrationPath = "file://internal/infrastructure/db/sqlite/migration" defaultDbMigrationPath = "file://internal/infrastructure/db/sqlite/migration"

10
server/test/e2e/covenant/e2e_test.go
View File

@@ -35,7 +35,7 @@ func TestMain(m *testing.M) {
time.Sleep(3 * time.Second) 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 { if err != nil {
fmt.Printf("error initializing ark config: %s", err) fmt.Printf("error initializing ark config: %s", err)
os.Exit(1) os.Exit(1)
@@ -185,7 +185,7 @@ func setupAspWallet() error {
Timeout: 15 * time.Second, 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 { if err != nil {
return fmt.Errorf("failed to prepare generate seed request: %s", err) 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))) 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 { if err != nil {
return fmt.Errorf("failed to prepare wallet create request: %s", err) 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))) 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 { if err != nil {
return fmt.Errorf("failed to prepare wallet unlock request: %s", err) return fmt.Errorf("failed to prepare wallet unlock request: %s", err)
} }
@@ -230,7 +230,7 @@ func setupAspWallet() error {
time.Sleep(time.Second) 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 { if err != nil {
return fmt.Errorf("failed to prepare new address request: %s", err) return fmt.Errorf("failed to prepare new address request: %s", err)
} }

10
server/test/e2e/covenantless/e2e_test.go
View File

@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
time.Sleep(3 * time.Second) 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 { if err != nil {
fmt.Printf("error initializing ark config: %s", err) fmt.Printf("error initializing ark config: %s", err)
os.Exit(1) os.Exit(1)
@@ -190,7 +190,7 @@ func setupAspWallet() error {
Timeout: 15 * time.Second, 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 { if err != nil {
return fmt.Errorf("failed to prepare generate seed request: %s", err) 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))) 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 { if err != nil {
return fmt.Errorf("failed to prepare wallet create request: %s", err) 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))) 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 { if err != nil {
return fmt.Errorf("failed to prepare wallet unlock request: %s", err) return fmt.Errorf("failed to prepare wallet unlock request: %s", err)
} }
@@ -235,7 +235,7 @@ func setupAspWallet() error {
time.Sleep(time.Second) 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 { if err != nil {
return fmt.Errorf("failed to prepare new address request: %s", err) return fmt.Errorf("failed to prepare new address request: %s", err)
} }