Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docker_entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,16 @@ if [ $(yq e '.wasabi.managesettings' /root/data/start9/config.yaml) = "true" ];
BITCOIND_PASS=$(yq e '.wasabi.server.password' /root/data/start9/config.yaml)
yq e -i "
.UseBitcoinRpc = true |
.MainNetBitcoinRpcEndPoint = \"$BITCOIND_IP:8332\" |
.MainNetBitcoinRpcCredentialString = \"$BITCOIND_USER:$BITCOIND_PASS\"" -o=json /config/.walletwasabi/client/Config.json
.BitcoinRpcEndPoint = \"$BITCOIND_IP:8332\" |
.BitcoinRpcCredentialString = \"$BITCOIND_USER:$BITCOIND_PASS\"" -o=json /config/.walletwasabi/client/Config.json
;;
"none")
echo "Configuring Wasabi for public Bitcoin nodes"
# reset it to default (127.0.0.1:8332), an empty string is not allowed
yq e -i "
.UseBitcoinRpc = false |
.MainNetBitcoinRpcEndPoint = \"127.0.0.1:8332\" |
.MainNetBitcoinRpcCredentialString = \"\"" -o=json /config/.walletwasabi/client/Config.json
.BitcoinRpcEndPoint = \"127.0.0.1:8332\" |
.BitcoinRpcCredentialString = \"\"" -o=json /config/.walletwasabi/client/Config.json
;;
*)
echo "Unknown server selected, not configuring Wasabi"
Expand Down
3 changes: 2 additions & 1 deletion manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
id: wasabi-webtop
title: "Wasabi"
version: 2.7.0
version: 2.7.0.1
release-notes: |
* 2.7.0.1: Use new config values for Bitcoin RPC endpoint and credentials.
* Update Wasabi to version 2.7.0 - See [full changelog](https://github.com/WalletWasabi/WalletWasabi/releases/tag/v2.7.0)
* Update KASM base container image to the latest version.
license: MIT
Expand Down
18 changes: 5 additions & 13 deletions root/defaults/.walletwasabi/client/Config.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,13 @@
{
"Network": "Main",
"MainNetBackendUri": "https://api.wasabiwallet.io/",
"TestNetBackendUri": "https://api.wasabiwallet.co/",
"RegTestBackendUri": "http://localhost:37127/",
"MainNetCoordinatorUri": "",
"TestNetCoordinatorUri": "",
"RegTestCoordinatorUri": "http://localhost:37128/",
"BackendUri": "https://api.wasabiwallet.io/",
"CoordinatorUri": "",
"UseTor": "Enabled",
"TerminateTorOnExit": false,
"TorBridges": [],
"DownloadNewVersion": false,
"UseBitcoinRpc": true,
"MainNetBitcoinRpcCredentialString": "",
"TestNetBitcoinRpcCredentialString": "",
"RegTestBitcoinRpcCredentialString": "",
"MainNetBitcoinRpcEndPoint": "255.255.255.255:8332",
"TestNetBitcoinRpcEndPoint": "255.255.255.255:48332",
"RegTestBitcoinRpcEndPoint": "255.255.255.255:18443",
"BitcoinRpcCredentialString": "",
"BitcoinRpcEndPoint": "255.255.255.255:8332",
"JsonRpcServerEnabled": false,
"JsonRpcUser": "",
"JsonRpcPassword": "",
Expand All @@ -32,5 +23,6 @@
"ExternalTransactionBroadcaster": "MempoolSpace",
"MaxCoinJoinMiningFeeRate": 150.0,
"AbsoluteMinInputCount": 21,
"MaxDaysInMempool": 30,
"ConfigVersion": 2
}
2 changes: 1 addition & 1 deletion scripts/procedures/migrations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ export const migration: T.ExpectedExports.migration =
),
},
},
"2.7.0"
"2.7.0.1"
);