From 7fb7c935dddf4605ce13d962543b55357aaff249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Olav?= Date: Thu, 31 Oct 2024 09:15:00 +0100 Subject: [PATCH] multi: rename last instances of drivechain-server to bitwindow --- .github/workflows/build.yml | 2 +- .vscode/launch.json | 12 ++++++------ README.md | 11 +++++++---- clients/bitwindow/Justfile | 2 +- clients/bitwindow/README.md | 6 +++--- clients/bitwindow/scripts/download-binaries.sh | 14 +++++++------- 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76360cfb..e228c9d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,7 +73,7 @@ jobs: - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 - uses: extractions/setup-just@v1 - # Setup go for building drivechain-server + # Setup go for building bitwindowd - uses: actions/setup-go@v5 with: go-version: "1.23" diff --git a/.vscode/launch.json b/.vscode/launch.json index de4d91b9..4c56857f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -11,9 +11,9 @@ "type": "dart", "toolArgs": [ "--dart-define", - "DRIVECHAIN_HOST=localhost", + "BITWINDOWD_HOST=localhost", "--dart-define", - "DRIVECHAIN_PORT=8080" + "BITWINDOWD_PORT=8080" ] }, { @@ -24,9 +24,9 @@ "flutterMode": "profile", "toolArgs": [ "--dart-define", - "DRIVECHAIN_HOST=localhost", + "BITWINDOWD_HOST=localhost", "--dart-define", - "DRIVECHAIN_PORT=8080" + "BITWINDOWD_PORT=8080" ] }, { @@ -37,9 +37,9 @@ "flutterMode": "release", "toolArgs": [ "--dart-define", - "DRIVECHAIN_HOST=localhost", + "BITWINDOWD_HOST=localhost", "--dart-define", - "DRIVECHAIN_PORT=8080" + "BITWINDOWD_PORT=8080" ] }, { diff --git a/README.md b/README.md index 1f7d3162..84fda253 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ A collection of various Drivechain-related applications. -- [SideSail](packages/sidesail/README.md) -- [Faucet frontend](packages/faucet/README.md) -- [Faucet backend](faucet-backend/README.md) -- [Drivechain server](drivechain-server/README.md) +- [SideSail](clients/sidesail/README.md) + +- [Faucet frontend](clients/faucet/README.md) +- [Faucet server](servers/faucet/README.md) + +- [Bitwindow frontend](clients/bitwindow/README.md) +- [Bitwindow server](servers/bitwindow/README.md) diff --git a/clients/bitwindow/Justfile b/clients/bitwindow/Justfile index 1d7ab1ec..820fd0aa 100644 --- a/clients/bitwindow/Justfile +++ b/clients/bitwindow/Justfile @@ -2,7 +2,7 @@ format: find . -name "*.dart" -not -path "./lib/gen/*" | xargs dart format -l 120 gen: - buf generate ../../drivechain-server + buf generate ../../bitwindow gen-enforcer: buf generate --template buf.gen.yaml https://github.com/LayerTwo-Labs/cusf_sidechain_proto.git diff --git a/clients/bitwindow/README.md b/clients/bitwindow/README.md index f861a8de..02042cfc 100644 --- a/clients/bitwindow/README.md +++ b/clients/bitwindow/README.md @@ -7,14 +7,14 @@ This package contains a frontend for interacting with a Drivechain-enabled layer To get the app(s) up and running, make sure you have the following dependencies: * The [Flutter SDK](https://flutter.dev) -* An instance of [drivechain-server](../../drivechain-server) running -* The `DRIVECHAIN_HOST` and `DRIVECHAIN_PORT` environment variable pointing to the above instance +* An instance of [bitwindowd](../../servers/bitwindow) running +* The `BITWINDOWD_HOST` and `BITWINDOWD_PORT` environment variable pointing to the above instance * A BIP 300/301 enabled node running Running the app is as simple as the following command: ```bash -flutter run --dart-define DRIVECHAIN_HOST=localhost --dart-define DRIVECHAIN_PORT=8080 +flutter run --dart-define BITWINDOWD_HOST=localhost --dart-define BITWINDOWD_PORT=8080 ``` The project is set up with launch configurations for Visual Studio Code as well. \ No newline at end of file diff --git a/clients/bitwindow/scripts/download-binaries.sh b/clients/bitwindow/scripts/download-binaries.sh index 5430fdf4..0719328f 100755 --- a/clients/bitwindow/scripts/download-binaries.sh +++ b/clients/bitwindow/scripts/download-binaries.sh @@ -116,24 +116,24 @@ fi echo Going back to $old_cwd cd $old_cwd -cd ../../drivechain-server +cd ../../servers/bitwindow server_cwd=$(pwd) -# Build bdk-cli and drivechain-server -echo "Building bdk-cli and drivechain-server in $server_cwd" +# Build bdk-cli and bitwindowd +echo "Building bdk-cli and bitwindowd in $server_cwd" # Build bdk-cli echo "Building bdk-cli" just build-bdk-cli -# Build drivechain-server -echo "Building drivechain-server" +# Build bitwindowd +echo "Building bitwindowd" just build-go # Move the necessary binaries to the assets directory -mv bin/drivechain-server $assets_dir/ +mv bin/bitwindowd $assets_dir/ -echo "drivechain-server with embedded bdk-cli have been built and moved to $assets_dir" +echo "bitwindowd with embedded bdk-cli have been built and moved to $assets_dir" echo Going back to $old_cwd cd $old_cwd \ No newline at end of file