diff --git a/pubspec.lock b/pubspec.lock index 8bdf56e80..c74b3910d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -352,21 +352,19 @@ packages: coinlib: dependency: "direct overridden" description: - path: coinlib - ref: "0acacfd17eacf72135c693a7b862bd9b7cc56739" - resolved-ref: "0acacfd17eacf72135c693a7b862bd9b7cc56739" - url: "https://github.com/julian-CStack/coinlib.git" - source: git - version: "2.2.0" + name: coinlib + sha256: f99c090ca300b6c9b5414dc100f7f36f49a5a2af31d477b3ce04a605c5f1103c + url: "https://pub.dev" + source: hosted + version: "3.1.0" coinlib_flutter: dependency: "direct main" description: - path: coinlib_flutter - ref: "0acacfd17eacf72135c693a7b862bd9b7cc56739" - resolved-ref: "0acacfd17eacf72135c693a7b862bd9b7cc56739" - url: "https://github.com/julian-CStack/coinlib.git" - source: git - version: "2.2.0" + name: coinlib_flutter + sha256: "185c622986d12d2ccda98f151ce047360464dd7a6cbb6877781a9816d14bb8c4" + url: "https://pub.dev" + source: hosted + version: "3.0.0" collection: dependency: transitive description: @@ -832,8 +830,8 @@ packages: dependency: "direct main" description: path: "." - ref: ca0c72cecc40fc0bfbafc0d26af675d973ab516b - resolved-ref: ca0c72cecc40fc0bfbafc0d26af675d973ab516b + ref: "33e1034911b842c57bdf6ddaa825cbf635a0c9db" + resolved-ref: "33e1034911b842c57bdf6ddaa825cbf635a0c9db" url: "https://github.com/cypherstack/flutter_libsparkmobile.git" source: git version: "0.0.2" @@ -1247,7 +1245,7 @@ packages: path: "crypto_plugins/flutter_liblelantus" relative: true source: path - version: "0.0.2" + version: "0.0.3" lints: dependency: transitive description: diff --git a/scripts/android/build_all.sh b/scripts/android/build_all.sh index 47c36fd79..3b19c1c5b 100755 --- a/scripts/android/build_all.sh +++ b/scripts/android/build_all.sh @@ -2,19 +2,13 @@ set -x -e -# libepiccash requires old rust -source ../rust_version.sh -set_rust_to_181 - mkdir -p build . ./config.sh -./install_ndk.sh PLUGINS_DIR=../../crypto_plugins (cd "${PLUGINS_DIR}"/flutter_liblelantus/scripts/android && ./build_all.sh ) (cd "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android && ./build_all.sh ) -set_rust_to_1720 (cd "${PLUGINS_DIR}"/frostdart/scripts/android && ./build_all.sh ) wait diff --git a/scripts/android/build_all_campfire.sh b/scripts/android/build_all_campfire.sh index ccb8830b1..3b19c1c5b 100755 --- a/scripts/android/build_all_campfire.sh +++ b/scripts/android/build_all_campfire.sh @@ -2,18 +2,13 @@ set -x -e -source ../rust_version.sh -set_rust_to_181 - mkdir -p build . ./config.sh -./install_ndk.sh PLUGINS_DIR=../../crypto_plugins (cd "${PLUGINS_DIR}"/flutter_liblelantus/scripts/android && ./build_all.sh ) (cd "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android && ./build_all.sh ) -set_rust_to_1720 (cd "${PLUGINS_DIR}"/frostdart/scripts/android && ./build_all.sh ) wait diff --git a/scripts/android/build_all_duo.sh b/scripts/android/build_all_duo.sh index cd1ba0174..25b3ce9ea 100755 --- a/scripts/android/build_all_duo.sh +++ b/scripts/android/build_all_duo.sh @@ -4,18 +4,13 @@ set -x -e # todo: revisit following at some point -source ../rust_version.sh -set_rust_to_181 - mkdir -p build . ./config.sh -./install_ndk.sh PLUGINS_DIR=../../crypto_plugins (cd "${PLUGINS_DIR}"/flutter_liblelantus/scripts/android && ./build_all.sh ) (cd "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android && ./build_all.sh ) -set_rust_to_1720 (cd "${PLUGINS_DIR}"/frostdart/scripts/android && ./build_all.sh ) wait diff --git a/scripts/android/config.sh b/scripts/android/config.sh index 864c78c18..8d560ec36 100644 --- a/scripts/android/config.sh +++ b/scripts/android/config.sh @@ -1,7 +1,5 @@ #!/bin/sh export WORKDIR="$(pwd)/"build -export ANDROID_NDK_ZIP=${WORKDIR}/android-ndk-r20b.zip -export TOOLCHAIN_DIR="${WORKDIR}/toolchain" # Change this Value to a lower number if you run out of memory while compiling export OVERRIDE_THREADS="$(nproc)" \ No newline at end of file diff --git a/scripts/android/install_ndk.sh b/scripts/android/install_ndk.sh deleted file mode 100755 index 0864a2bde..000000000 --- a/scripts/android/install_ndk.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -mkdir -p build -. ./config.sh -ANDROID_NDK_SHA256="8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c" - -if [ ! -e "$ANDROID_NDK_ZIP" ]; then - curl https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip -o "${ANDROID_NDK_ZIP}" -fi -echo "${ANDROID_NDK_SHA256}" "${ANDROID_NDK_ZIP}" | sha256sum -c || exit 1 - - -PLUGINS_DIR=../../crypto_plugins - -mkdir -p "${PLUGINS_DIR}"/flutter_libmonero/scripts/android/build -mkdir -p "${PLUGINS_DIR}"/flutter_liblelantus/scripts/android/build -mkdir -p "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android/build - -cp "${ANDROID_NDK_ZIP}" "${PLUGINS_DIR}"/flutter_libmonero/scripts/android/build/ -cp "${ANDROID_NDK_ZIP}" "${PLUGINS_DIR}"/flutter_liblelantus/scripts/android/build/ -cp "${ANDROID_NDK_ZIP}" "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android/build/ diff --git a/scripts/ios/build_all.sh b/scripts/ios/build_all.sh index b9eab976f..6ac527632 100755 --- a/scripts/ios/build_all.sh +++ b/scripts/ios/build_all.sh @@ -2,9 +2,6 @@ set -x -e -source ../rust_version.sh -set_rust_to_181 - # ensure ios rust triples are there rustup target add aarch64-apple-ios rustup target add x86_64-apple-ios @@ -15,7 +12,6 @@ rustup target add x86_64-apple-ios (cd ../../crypto_plugins/flutter_liblelantus/scripts/ios && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/ios && ./build_all.sh ) -set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/ios && ./build_all.sh ) wait diff --git a/scripts/ios/build_all_campfire.sh b/scripts/ios/build_all_campfire.sh index b9eab976f..6ac527632 100755 --- a/scripts/ios/build_all_campfire.sh +++ b/scripts/ios/build_all_campfire.sh @@ -2,9 +2,6 @@ set -x -e -source ../rust_version.sh -set_rust_to_181 - # ensure ios rust triples are there rustup target add aarch64-apple-ios rustup target add x86_64-apple-ios @@ -15,7 +12,6 @@ rustup target add x86_64-apple-ios (cd ../../crypto_plugins/flutter_liblelantus/scripts/ios && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/ios && ./build_all.sh ) -set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/ios && ./build_all.sh ) wait diff --git a/scripts/ios/build_all_duo.sh b/scripts/ios/build_all_duo.sh index 24236e8a7..4f5191bd2 100755 --- a/scripts/ios/build_all_duo.sh +++ b/scripts/ios/build_all_duo.sh @@ -4,9 +4,6 @@ set -x -e # todo: revisit following at some point -source ../rust_version.sh -set_rust_to_181 - # ensure ios rust triples are there rustup target add aarch64-apple-ios rustup target add x86_64-apple-ios @@ -17,7 +14,6 @@ rustup target add x86_64-apple-ios (cd ../../crypto_plugins/flutter_liblelantus/scripts/ios && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/ios && ./build_all.sh ) -set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/ios && ./build_all.sh ) wait diff --git a/scripts/linux/build_all.sh b/scripts/linux/build_all.sh index bdb3bd527..0562c2191 100755 --- a/scripts/linux/build_all.sh +++ b/scripts/linux/build_all.sh @@ -2,9 +2,6 @@ set -x -e -source ../rust_version.sh -set_rust_to_181 - # for arm # flutter-elinux clean # flutter-elinux pub get @@ -13,7 +10,6 @@ mkdir -p build ./build_secure_storage_deps.sh (cd ../../crypto_plugins/flutter_liblelantus/scripts/linux && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/linux && ./build_all.sh ) -set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/linux && ./build_all.sh ) ./build_secp256k1.sh diff --git a/scripts/linux/build_all_campfire.sh b/scripts/linux/build_all_campfire.sh index bdb3bd527..0562c2191 100755 --- a/scripts/linux/build_all_campfire.sh +++ b/scripts/linux/build_all_campfire.sh @@ -2,9 +2,6 @@ set -x -e -source ../rust_version.sh -set_rust_to_181 - # for arm # flutter-elinux clean # flutter-elinux pub get @@ -13,7 +10,6 @@ mkdir -p build ./build_secure_storage_deps.sh (cd ../../crypto_plugins/flutter_liblelantus/scripts/linux && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/linux && ./build_all.sh ) -set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/linux && ./build_all.sh ) ./build_secp256k1.sh diff --git a/scripts/linux/build_all_duo.sh b/scripts/linux/build_all_duo.sh index 91d2127cd..60557556d 100755 --- a/scripts/linux/build_all_duo.sh +++ b/scripts/linux/build_all_duo.sh @@ -4,8 +4,6 @@ set -x -e # todo: revisit following at some point -source ../rust_version.sh -set_rust_to_181 # for arm # flutter-elinux clean @@ -15,7 +13,6 @@ mkdir -p build ./build_secure_storage_deps.sh & (cd ../../crypto_plugins/flutter_liblelantus/scripts/linux && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/linux && ./build_all.sh ) -set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/linux && ./build_all.sh ) ./build_secp256k1.sh diff --git a/scripts/macos/build_all.sh b/scripts/macos/build_all.sh index 2212929e8..5fa49e6ff 100755 --- a/scripts/macos/build_all.sh +++ b/scripts/macos/build_all.sh @@ -2,16 +2,10 @@ set -x -e -source ../rust_version.sh -set_rust_to_181 - (cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh ) -set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/macos && ./build_all.sh ) wait echo "Done building" -# set rust (back) to a more recent stable release to allow stack wallet to build tor -set_rust_to_1720 diff --git a/scripts/macos/build_all_campfire.sh b/scripts/macos/build_all_campfire.sh index 2212929e8..8102b1d00 100755 --- a/scripts/macos/build_all_campfire.sh +++ b/scripts/macos/build_all_campfire.sh @@ -2,16 +2,9 @@ set -x -e -source ../rust_version.sh -set_rust_to_181 - (cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh ) -set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/macos && ./build_all.sh ) wait echo "Done building" - -# set rust (back) to a more recent stable release to allow stack wallet to build tor -set_rust_to_1720 diff --git a/scripts/macos/build_all_duo.sh b/scripts/macos/build_all_duo.sh index f4114c7ef..23c4e0be3 100755 --- a/scripts/macos/build_all_duo.sh +++ b/scripts/macos/build_all_duo.sh @@ -4,16 +4,10 @@ set -x -e # todo: revisit following at some point -source ../rust_version.sh -set_rust_to_181 - (cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh ) -set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/macos && ./build_all.sh ) wait echo "Done building" -# set rust (back) to a more recent stable release to allow stack wallet to build tor -set_rust_to_1720 diff --git a/scripts/rust_version.sh b/scripts/rust_version.sh deleted file mode 100755 index 8cfada233..000000000 --- a/scripts/rust_version.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set_rust_to_1671() { - if rustup toolchain list | grep -q "1.67.1"; then - rustup default 1.67.1 - else - echo "Rust version 1.67.1 is not installed. Please install it using 'rustup install 1.67.1'." >&2 - exit 1 - fi -} - -set_rust_to_1720() { - if rustup toolchain list | grep -q "1.72.0"; then - rustup default 1.72.0 - else - echo "Rust version 1.72.0 is not installed. Please install it using 'rustup install 1.72.0'." >&2 - exit 1 - fi -} - -set_rust_to_181() { - if rustup toolchain list | grep -q "1.81"; then - rustup default 1.81 - else - echo "Rust version 1.81 is not installed. Please install it using 'rustup install 1.81'." >&2 - exit 1 - fi -} diff --git a/scripts/windows/build_all.sh b/scripts/windows/build_all.sh index 6daedb861..0f4d61b19 100755 --- a/scripts/windows/build_all.sh +++ b/scripts/windows/build_all.sh @@ -2,13 +2,9 @@ set -x -e -source ../rust_version.sh -set_rust_to_181 - mkdir -p build (cd ../../crypto_plugins/flutter_libepiccash/scripts/windows && ./build_all.sh ) (cd ../../crypto_plugins/flutter_liblelantus/scripts/windows && ./build_all.sh ) -set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/windows && ./build_all.sh ) ./build_secp256k1_wsl.sh diff --git a/scripts/windows/build_all_campfire.sh b/scripts/windows/build_all_campfire.sh index 6daedb861..0f4d61b19 100755 --- a/scripts/windows/build_all_campfire.sh +++ b/scripts/windows/build_all_campfire.sh @@ -2,13 +2,9 @@ set -x -e -source ../rust_version.sh -set_rust_to_181 - mkdir -p build (cd ../../crypto_plugins/flutter_libepiccash/scripts/windows && ./build_all.sh ) (cd ../../crypto_plugins/flutter_liblelantus/scripts/windows && ./build_all.sh ) -set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/windows && ./build_all.sh ) ./build_secp256k1_wsl.sh diff --git a/scripts/windows/build_all_duo.sh b/scripts/windows/build_all_duo.sh index f6ce810ef..5ee690c05 100755 --- a/scripts/windows/build_all_duo.sh +++ b/scripts/windows/build_all_duo.sh @@ -4,13 +4,9 @@ set -x -e # todo: revisit following at some point -source ../rust_version.sh -set_rust_to_181 - mkdir -p build (cd ../../crypto_plugins/flutter_libepiccash/scripts/windows && ./build_all.sh ) (cd ../../crypto_plugins/flutter_liblelantus/scripts/windows && ./build_all.sh ) -set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/windows && ./build_all.sh ) ./build_secp256k1_wsl.sh