Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-01-03 17:40:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into CW-292-Save-historical-fiat-API-rate

Browse source
This commit is contained in:
Serhii 2024-05-03 16:45:09 +03:00
commit 444eeccc58
7 changed files with 24 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/text/Release_Notes.txt
View file

@ -1,3 +1 @@
Support restoring Non-Electrum Bitcoin Wallets (check supported derivation paths https://github.com/cake-tech/cake_wallet/blob/main/cw_bitcoin/lib/bitcoin_derivations.dart)
Bitcoin enhancements and bug fixes
Generic bug fixes and enhancements
Bitcoin Bug fixes and enhancements

8
cw_bitcoin/lib/bitcoin_wallet.dart
View file

@ -51,15 +51,14 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
// the sideHd derivation path = m/84'/0'/0'/1 (account 1, index unspecified here)
String derivationPath = walletInfo.derivationInfo!.derivationPath!;
String sideDerivationPath = derivationPath.substring(0, derivationPath.length - 1) + "1";
final hd = bitcoin.HDWallet.fromSeed(seedBytes, network: networkType);
walletAddresses = BitcoinWalletAddresses(
walletInfo,
electrumClient: electrumClient,
initialAddresses: initialAddresses,
initialRegularAddressIndex: initialRegularAddressIndex,
initialChangeAddressIndex: initialChangeAddressIndex,
mainHd: hd.derivePath(derivationPath),
sideHd: hd.derivePath(sideDerivationPath),
mainHd: hd,
sideHd: bitcoin.HDWallet.fromSeed(seedBytes, network: networkType).derivePath(sideDerivationPath),
network: networkParam ?? network,
);
autorun((_) {
@ -127,7 +126,8 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
);
// set the default if not present:
walletInfo.derivationInfo!.derivationPath = snp.derivationPath ?? "m/0'/1";
walletInfo.derivationInfo!.derivationPath = snp.derivationPath ?? "m/0'/0";
walletInfo.derivationInfo!.derivationType = snp.derivationType ?? DerivationType.electrum;
late Uint8List seedBytes;

32
cw_nano/pubspec.lock
View file

@ -173,10 +173,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
url: "https://pub.dev"
source: hosted
version: "1.17.2"
version: "1.17.1"
convert:
dependency: transitive
description:
@ -419,18 +419,18 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.15"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.2.0"
meta:
dependency: transitive
description:
@ -713,10 +713,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.9.1"
stack_trace:
dependency: transitive
description:
@ -761,10 +761,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
url: "https://pub.dev"
source: hosted
version: "0.6.0"
version: "0.5.1"
timing:
dependency: transitive
description:
@ -790,21 +790,13 @@ packages:
source: hosted
version: "2.1.4"
watcher:
dependency: "direct overridden"
dependency: transitive
description:
name: watcher
sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
web:
dependency: transitive
description:
name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
web_socket_channel:
dependency: transitive
description:
@ -838,5 +830,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.1.0-185.0.dev <4.0.0"
dart: ">=3.0.0 <4.0.0"
flutter: ">=3.7.0"

2
run-android.sh
View file

@ -4,6 +4,7 @@
get_current_branch() {
if git rev-parse --git-dir > /dev/null 2>&1; then
branch=$(git rev-parse --abbrev-ref HEAD)
branch=${branch//[-]/_} # Replace all dashes with underscores
echo "$branch"
else
echo "Error: Not a git repository."
@ -15,7 +16,6 @@ get_current_branch() {
update_app_properties() {
local branch=$1
local file_path="./android/app.properties"
sed -i "s/^id=.*/id=com.cakewallet.$branch/" "$file_path"
sed -i "s/^name=.*/name=$branch-Cake Wallet/" "$file_path"
}

4
scripts/android/app_env.sh
View file

@ -22,8 +22,8 @@ MONERO_COM_PACKAGE="com.monero.app"
MONERO_COM_SCHEME="monero.com"
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="4.15.5"
CAKEWALLET_BUILD_NUMBER=206
CAKEWALLET_VERSION="4.15.6"
CAKEWALLET_BUILD_NUMBER=207
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
CAKEWALLET_SCHEME="cakewallet"

4
scripts/ios/app_env.sh
View file

@ -18,8 +18,8 @@ MONERO_COM_BUILD_NUMBER=82
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="4.15.5"
CAKEWALLET_BUILD_NUMBER=231
CAKEWALLET_VERSION="4.15.6"
CAKEWALLET_BUILD_NUMBER=232
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
HAVEN_NAME="Haven"

4
scripts/macos/app_env.sh
View file

@ -21,8 +21,8 @@ MONERO_COM_BUILD_NUMBER=16
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="1.8.5"
CAKEWALLET_BUILD_NUMBER=66
CAKEWALLET_VERSION="1.8.6"
CAKEWALLET_BUILD_NUMBER=67
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then