mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-31 06:58:42 +01:00
jwinterm
dd449f2594
Catches up from the May 12 fork point (v6.1.2+23) through v6.5.0: 535 upstream commits, including the Monero silent-open fix, Monero on Trezor, Ledger/Trezor BLE fixes, the new seed and history screens, quick Bitcoin sync, git-pinned dependencies (pubspec_overrides.yaml), frozen Hive adapters (*.part.dart), monero_c v0.18.4.6-RC2 and Flutter 3.41.9. Merged with both sides normalized first (import rename, 100-column format), which took the conflict count from 614 paths to 322. The procedure is now scripts/upstream_sync.sh. Kept from Hash Bags: - WalletType enum order and Hive IDs. SQLite stores WalletType.index and our order differs from upstream's; taking theirs would reread saved wallets as other chains. Our frozen adapter keeps the shipped IDs. - The 1.0.2 legacy PIN and wallet-password decode and self-heal. - Removed chains (Solana, Tron, Zano, Zcash, Decred, Haven) and the new Robinhood chain stay out; Cake Pay and non-Trocador swaps stay out. - Default nodes (node.wownero.org, sethforprivacy, Blockstream, bysh.me), converted to upstream's isDefault node-list key; Wownero is back in the node reset list. - Privacy: address resolvers limited to domain-anchored sources again; prices.neroswap.com for fiat; upstream's charts tab, which reads prices.cakewallet.com, sits behind FeatureFlag.isChartsEnabled = false. - Lightning stays behind FeatureFlag.isLightningEnabled, including upstream's new post-seed Lightning username step. - Our icon pipeline, branding and bundle identifiers. Twelve new upstream widget tests are skipped: test and code are unchanged from v6.5.0 apart from renames (not rerun on a pristine upstream checkout; upstream's top_bar_test does not compile against its own TopBar). flutter analyze lib: 0 errors; flutter test: 345 passed, 12 skipped; flutter build bundle compiles. Built with Flutter 3.41.9.
62 lines
1.6 KiB
Bash
62 lines
1.6 KiB
Bash
#!/bin/sh
|
|
|
|
APP_IOS_NAME=""
|
|
APP_IOS_VERSION=""
|
|
APP_IOS_BUILD_VERSION=""
|
|
APP_IOS_BUNDLE_ID=""
|
|
|
|
MONERO_COM="monero.com"
|
|
CAKEWALLET="cakewallet"
|
|
|
|
TYPES=($MONERO_COM $CAKEWALLET)
|
|
APP_IOS_TYPE=$1
|
|
|
|
MONERO_COM_NAME="Monero.com"
|
|
MONERO_COM_VERSION="6.5.0"
|
|
MONERO_COM_BUILD_NUMBER=178
|
|
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
|
|
|
|
# Source CAKEWALLET version + build number from pubspec_description.yaml
|
|
# (single source of truth). Without this, the hardcoded build number
|
|
# here silently overrode pubspec via app_config.sh's PlistBuddy step,
|
|
# so iOS uploads all shipped as the same CFBundleVersion and Apple
|
|
# rejected duplicates.
|
|
_PUBSPEC_VERSION=$(awk -F': ' '/^version:/ {print $2; exit}' ../../pubspec_description.yaml)
|
|
CAKEWALLET_NAME="Hash Bags"
|
|
CAKEWALLET_VERSION="${_PUBSPEC_VERSION%+*}"
|
|
CAKEWALLET_BUILD_NUMBER="${_PUBSPEC_VERSION#*+}"
|
|
CAKEWALLET_BUNDLE_ID="com.suchsoftware.hashwallet"
|
|
|
|
|
|
if ! [[ " ${TYPES[*]} " =~ " ${APP_IOS_TYPE} " ]]; then
|
|
echo "Wrong app type."
|
|
exit 1
|
|
fi
|
|
|
|
case $APP_IOS_TYPE in
|
|
$MONERO_COM)
|
|
APP_IOS_NAME=$MONERO_COM_NAME
|
|
APP_IOS_VERSION=$MONERO_COM_VERSION
|
|
APP_IOS_BUILD_NUMBER=$MONERO_COM_BUILD_NUMBER
|
|
APP_IOS_BUNDLE_ID=$MONERO_COM_BUNDLE_ID
|
|
;;
|
|
$CAKEWALLET)
|
|
APP_IOS_NAME=$CAKEWALLET_NAME
|
|
APP_IOS_VERSION=$CAKEWALLET_VERSION
|
|
APP_IOS_BUILD_NUMBER=$CAKEWALLET_BUILD_NUMBER
|
|
APP_IOS_BUNDLE_ID=$CAKEWALLET_BUNDLE_ID
|
|
;;
|
|
$HAVEN)
|
|
APP_IOS_NAME=$HAVEN_NAME
|
|
APP_IOS_VERSION=$HAVEN_VERSION
|
|
APP_IOS_BUILD_NUMBER=$HAVEN_BUILD_NUMBER
|
|
APP_IOS_BUNDLE_ID=$HAVEN_BUNDLE_ID
|
|
;;
|
|
esac
|
|
|
|
export APP_IOS_TYPE
|
|
export APP_IOS_NAME
|
|
export APP_IOS_VERSION
|
|
export APP_IOS_BUILD_NUMBER
|
|
export APP_IOS_BUNDLE_ID
|