Skip to content

Commit 3b961d7

Browse files
committed
Set default net to signet
1 parent 88ebaff commit 3b961d7

5 files changed

Lines changed: 39 additions & 6 deletions

File tree

.github/workflows/build-ios-release-pullrequest.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,9 @@ jobs:
241241
bundle config path vendor/bundle
242242
bundle install --jobs 4 --retry 3 --quiet
243243
244+
- name: Set default network
245+
run: ./scripts/set-network.sh signet
246+
244247
- name: Install Node Modules
245248
run: npm ci --omit=dev --yes
246249

.github/workflows/build-mac-catalyst.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ jobs:
7474
ruby-version: 3.4.8
7575
bundler-cache: true
7676

77+
- name: Set default network
78+
if: github.event_name == 'workflow_dispatch' || steps.labels.outputs.has_mac_dmg == 'true'
79+
run: ./scripts/set-network.sh signet
80+
7781
- name: Install Node modules
7882
if: github.event_name == 'workflow_dispatch' || steps.labels.outputs.has_mac_dmg == 'true'
7983
run: npm ci

.github/workflows/build-release-apk.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ jobs:
5858
yes | sdkmanager --licenses
5959
sdkmanager "platforms;android-36" "platform-tools" "build-tools;36.0.0" "ndk;27.1.12297006"
6060
61+
- name: Set default network
62+
run: ./scripts/set-network.sh signet
63+
6164
- name: Install node_modules (include dev deps for patch-package)
6265
run: npm ci --yes
6366

components/Context/SettingsProvider.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export const SettingsProvider: React.FC<{ children: React.ReactNode }> = React.m
153153
const [totalBalancePreferredUnit, setTotalBalancePreferredUnit] = useState<BitcoinUnit>(BitcoinUnit.BTC);
154154
const [selectedBlockExplorer, setSelectedBlockExplorer] = useState<BlockExplorer>(BLOCK_EXPLORERS.default);
155155
const [isElectrumDisabled, setIsElectrumDisabled] = useState<boolean>(true);
156-
const [networkType, setNetworkType] = useState<NetworkType>('mainnet');
156+
const [networkType, setNetworkType] = useState<NetworkType>(defaultSettingsContext.networkType);
157157
const [settingsLoaded, setSettingsLoaded] = useState<boolean>(false);
158158

159159
const { walletsInitialized } = useStorage();
@@ -170,11 +170,12 @@ export const SettingsProvider: React.FC<{ children: React.ReactNode }> = React.m
170170
BlueElectrum.isDisabled().then(disabled => {
171171
setIsElectrumDisabled(disabled);
172172
}),
173-
DefaultPreference.get(NETWORK_TYPE_KEY).then(network => {
174-
if (network === 'testnet' || network === 'signet') {
175-
setNetworkType(network);
176-
setGlobalNetworkType(network);
177-
}
173+
DefaultPreference.get(NETWORK_TYPE_KEY).then(maybeNetwork => {
174+
// Can be null if nothing is set
175+
const network = (maybeNetwork as NetworkType) || defaultSettingsContext.networkType;
176+
console.log(`[BlueWallet] Starting with network: ${network}`);
177+
setNetworkType(network);
178+
setGlobalNetworkType(network);
178179
}),
179180
getIsHandOffUseEnabled().then(handOff => {
180181
setIsHandOffUseEnabledState(handOff);

scripts/set-network.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
# Usage: ./scripts/set-network.sh [mainnet|testnet|signet]
3+
# Defaults to signet if no argument given.
4+
set -euo pipefail
5+
6+
N="${1:-signet}"
7+
case "$N" in mainnet|testnet|signet) ;; *) echo "Invalid network: $N" >&2; exit 1 ;; esac
8+
9+
DIR="$(cd "$(dirname "$0")/.." && pwd)"
10+
11+
# macOS sed needs -i '', GNU sed needs just -i
12+
if sed --version 2>/dev/null | grep -q GNU; then
13+
I=(-i)
14+
else
15+
I=(-i '')
16+
fi
17+
18+
sed "${I[@]}" "s/let _networkType: NetworkType = '.*'/let _networkType: NetworkType = '$N'/" "$DIR/models/network.ts"
19+
sed "${I[@]}" "s/let currentNetwork: NetworkType = '.*'/let currentNetwork: NetworkType = '$N'/" "$DIR/blue_modules/BlueElectrum.ts"
20+
sed "${I[@]}" "s/networkType: '.*' as NetworkType/networkType: '$N' as NetworkType/" "$DIR/components/Context/SettingsProvider.tsx"
21+
22+
echo "Default network set to: $N"

0 commit comments

Comments
 (0)