mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-17 05:41:29 +02:00
Delete cw_zano / cw_tron / cw_solana / cw_decred packages + all references
These chains were already disabled in availableWalletTypes (none of them
were getting created), but the source dirs and the codegen scaffolding
for them still lived in tree (~20K lines of dead Dart).
Surgery:
- Delete cw_decred/ cw_solana/ cw_tron/ cw_zano/ source trees
- Strip 5 generate*() function bodies from tool/configure.dart
(generateSolana, generateTron, generateZano, generateDecred,
generateZcash) plus their top-level imports, args, calls,
signatures, and conditional pubspec/walletTypes injection blocks.
configure.dart shrinks from 2134 to 1561 lines and dart analyze
is clean.
- Strip solana/tron secrets config + output paths from
tool/import_secrets_config.dart
- Delete scripts/{android,ios,macos}/build_decred.sh,
scripts/ios/build_zano{,_all}.sh
- Patch scripts/{android,ios,macos}/build_all.sh,
scripts/android/copy_monero_deps.sh, scripts/ios/setup.sh,
scripts/ios/gen_framework.sh to drop decred/zano steps
- Patch scripts/android/docker/build.sh + Dockerfile.final to drop the
decred Docker stage; delete scripts/android/docker/Dockerfile.decred
- Update .github/workflows/build-linux.yml comments to reflect the
remaining cw_* module list (evm, nano, bitcoin)
Note: WalletType.{solana,tron,zano,decred,zcash} enum values still live
in cw_core/lib/wallet_type.dart and there are dead switch cases in
lib/di.dart and lib/new-ui/pages/*.dart that reference them. Those
paths are unreachable (the enum values never get assigned to any wallet)
but cleaning them up is a separate hygiene pass.
This commit is contained in:
@@ -1,2 +1 @@
|
||||
mwebd
|
||||
decred
|
||||
mwebd
|
||||
@@ -12,6 +12,5 @@ $DIR/build_torch.sh
|
||||
case $APP_ANDROID_TYPE in
|
||||
"monero.com") $DIR/build_monero_all.sh ;;
|
||||
"cakewallet") $DIR/build_monero_all.sh
|
||||
$DIR/build_mwebd.sh
|
||||
$DIR/build_decred.sh ;;
|
||||
$DIR/build_mwebd.sh ;;
|
||||
esac
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e -x
|
||||
cd "$(dirname "$0")"
|
||||
# . ./config.sh
|
||||
|
||||
CW_DECRED_DIR=$(realpath ../..)/cw_decred
|
||||
LIBWALLET_PATH="${PWD}/decred/libwallet"
|
||||
LIBWALLET_URL="https://github.com/decred/libwallet.git"
|
||||
LIBWALLET_VERSION="05f8d7374999400fe4d525eb365c39b77d307b14"
|
||||
|
||||
if [[ -e $LIBWALLET_PATH ]]; then
|
||||
rm -fr $LIBWALLET_PATH || true
|
||||
fi
|
||||
mkdir -p $LIBWALLET_PATH || true
|
||||
|
||||
git clone $LIBWALLET_URL $LIBWALLET_PATH
|
||||
cd $LIBWALLET_PATH
|
||||
git checkout $LIBWALLET_VERSION
|
||||
|
||||
if [[ "x$ANDROID_HOME" == "x" ]];
|
||||
then
|
||||
echo "ANDROID_HOME is missing, please declare it before building (on macos it is usually $HOME/Library/Android/sdk)"
|
||||
echo "echo > ~/.zprofile"
|
||||
echo "echo 'export ANDROID_HOME=\"\$HOME/Library/Android/sdk\" > ~/.zprofile"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "x$ANDROID_NDK_VERSION" == "x" ]];
|
||||
then
|
||||
echo "ANDROID_NDK_VERSION is missing, please declare it before building"
|
||||
echo "You have these versions installed on your system currently:"
|
||||
ls ${ANDROID_HOME}/ndk/ | cat | awk '{ print "- " $1 }'
|
||||
echo "echo > ~/.zprofile"
|
||||
echo "echo 'export ANDROID_NDK_VERSION=..... > ~/.zprofile"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
export NDK_BIN_PATH="${ANDROID_HOME}/ndk/${ANDROID_NDK_VERSION}/toolchains/llvm/prebuilt/$(uname | tr '[:upper:]' '[:lower:]')-x86_64/bin"
|
||||
export ANDROID_API_VERSION=21
|
||||
# export CPATH="$(clang -v 2>&1 | grep "Selected GCC installation" | rev | cut -d' ' -f1 | rev)/include"
|
||||
|
||||
for arch in "aarch" "aarch64" "x86_64"
|
||||
do
|
||||
TRIPLET=""
|
||||
TARGET=""
|
||||
ARCH_ABI=""
|
||||
|
||||
case $arch in
|
||||
"aarch")
|
||||
TRIPLET="armv7a-linux-androideabi"
|
||||
TARGET="arm"
|
||||
ARCH_ABI="armeabi-v7a";;
|
||||
"aarch64")
|
||||
TRIPLET="aarch64-linux-android"
|
||||
TARGET="arm64"
|
||||
ARCH_ABI="arm64-v8a";;
|
||||
"x86_64")
|
||||
TRIPLET="x86_64-linux-android"
|
||||
TARGET="amd64"
|
||||
ARCH_ABI="x86_64";;
|
||||
*)
|
||||
echo "Unknown arch: $arch"
|
||||
exit 1;;
|
||||
esac
|
||||
|
||||
# PATH="${TOOLCHAIN_BASE_DIR}_${arch}/bin:${ORIGINAL_PATH}"
|
||||
if [[ -e ./build ]]; then
|
||||
rm -fr ./build
|
||||
fi
|
||||
|
||||
export CGO_LDFLAGS="-O2 -g -s -w -Wl,-z,max-page-size=16384"
|
||||
CLANG_PATH="${NDK_BIN_PATH}/${TRIPLET}${ANDROID_API_VERSION}-clang"
|
||||
CGO_ENABLED=1 GOOS=android GOARCH=${TARGET} CC=${CLANG_PATH} CXX=${CLANG_PATH}++ \
|
||||
go build -v -buildmode=c-shared -o ./build/${TRIPLET}-libdcrwallet.so ./cgo
|
||||
|
||||
DEST_LIB_DIR=${CW_DECRED_DIR}/android/libs/${ARCH_ABI}
|
||||
mkdir -p $DEST_LIB_DIR
|
||||
cp ${LIBWALLET_PATH}/build/${TRIPLET}-libdcrwallet.so $DEST_LIB_DIR/libdcrwallet.so
|
||||
done
|
||||
|
||||
HEADER_DIR=$CW_DECRED_DIR/lib/api
|
||||
cp ${LIBWALLET_PATH}/build/${TRIPLET}-libdcrwallet.h $HEADER_DIR/libdcrwallet.h
|
||||
cd $CW_DECRED_DIR
|
||||
dart run ffigen
|
||||
@@ -5,7 +5,6 @@ CW_DIR=${WORKDIR}/hash_wallet
|
||||
CW_EXRTERNAL_DIR=${CW_DIR}/cw_shared_external/ios/External/android
|
||||
CW_HAVEN_EXTERNAL_DIR=${CW_DIR}/cw_haven/ios/External/android
|
||||
CW_MONERO_EXTERNAL_DIR=${CW_DIR}/cw_monero/ios/External/android
|
||||
CW_ZANO_EXTERNAL_DIR=${CW_DIR}/cw_zano/ios/External/android
|
||||
for arch in "aarch" "aarch64" "i686" "x86_64"
|
||||
do
|
||||
|
||||
@@ -41,6 +40,5 @@ done
|
||||
|
||||
mkdir -p ${CW_HAVEN_EXTERNAL_DIR}/include
|
||||
mkdir -p ${CW_MONERO_EXTERNAL_DIR}/include
|
||||
mkdir -p ${CW_ZANO_EXTERNAL_DIR}/include
|
||||
|
||||
cp $CW_EXRTERNAL_DIR/x86/include/haven/wallet2_api.h ${CW_HAVEN_EXTERNAL_DIR}/include
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
ARG BASE_IMAGE
|
||||
ARG TORCH_IMAGE
|
||||
|
||||
FROM ${TORCH_IMAGE} AS torch_source
|
||||
|
||||
FROM --platform=linux/amd64 ${BASE_IMAGE} AS build
|
||||
|
||||
RUN mkdir -p /w/scripts/android
|
||||
RUN mkdir -p /w/cw_decred/lib/api
|
||||
COPY --from=torch_source /w/scripts/torch_dart /w/scripts/torch_dart
|
||||
COPY cw_core/pubspec.yaml /w/cw_core/pubspec.yaml
|
||||
COPY cw_decred/pubspec.yaml /w/cw_decred/pubspec.yaml
|
||||
COPY scripts/android/build_decred.sh /w/scripts/android/build_decred.sh
|
||||
RUN /w/scripts/android/build_decred.sh
|
||||
|
||||
FROM --platform=linux/amd64 alpine
|
||||
COPY --from=build /w /w
|
||||
@@ -3,14 +3,12 @@ ARG TORCH_IMAGE
|
||||
ARG REOWN_IMAGE
|
||||
ARG BITBOX_IMAGE
|
||||
ARG MONERO_IMAGE
|
||||
ARG DECRED_IMAGE
|
||||
ARG MWEBD_IMAGE
|
||||
|
||||
FROM ${TORCH_IMAGE} AS torch_src
|
||||
FROM ${REOWN_IMAGE} AS reown_src
|
||||
FROM ${BITBOX_IMAGE} AS bitbox_src
|
||||
FROM ${MONERO_IMAGE} AS monero_src
|
||||
FROM ${DECRED_IMAGE} AS decred_src
|
||||
FROM ${MWEBD_IMAGE} AS mwebd_src
|
||||
|
||||
FROM --platform=linux/amd64 alpine
|
||||
@@ -19,5 +17,4 @@ COPY --from=torch_src /w /w.top
|
||||
COPY --from=reown_src /w /w.top
|
||||
COPY --from=bitbox_src /w /w.top
|
||||
COPY --from=monero_src /w /w.top
|
||||
COPY --from=decred_src /w /w.top
|
||||
COPY --from=mwebd_src /w /w.top
|
||||
|
||||
@@ -56,8 +56,7 @@ reown_ver=$(tinysha $SCRIPT_DIR/Dockerfile.reown $REPO_ROOT/scripts/prepare_reow
|
||||
bitbox_ver=$(tinysha $SCRIPT_DIR/Dockerfile.bitbox $REPO_ROOT/scripts/build_bitbox_flutter.sh)
|
||||
monero_ver=$(tinysha $SCRIPT_DIR/Dockerfile.monero $REPO_ROOT/scripts/prepare_moneroc.sh $REPO_ROOT/scripts/android/build_monero_all.sh)
|
||||
mwebd_ver=$(tinysha $SCRIPT_DIR/Dockerfile.mwebd $(find $REPO_ROOT/cw_mweb/go -type f))
|
||||
decred_ver=$(tinysha $SCRIPT_DIR/Dockerfile.torch $SCRIPT_DIR/Dockerfile.decred $REPO_ROOT/scripts/android/build_decred.sh)
|
||||
echo $base_ver $torch_ver $reown_ver $bitbox_ver $monero_ver $mwebd_ver $decred_ver > /tmp/docker_build_versions
|
||||
echo $base_ver $torch_ver $reown_ver $bitbox_ver $monero_ver $mwebd_ver > /tmp/docker_build_versions
|
||||
final_ver=$(tinysha /tmp/docker_build_versions)
|
||||
|
||||
docker create --name temp_extract $(img final $final_ver) \
|
||||
@@ -85,17 +84,12 @@ build monero "$monero_ver" --build-arg BASE_IMAGE="$(img base "$base_ver")"
|
||||
build torch "$torch_ver" \
|
||||
--build-arg BASE_IMAGE="$(img base "$base_ver")"
|
||||
|
||||
build decred "$decred_ver" \
|
||||
--build-arg BASE_IMAGE="$(img base "$base_ver")" \
|
||||
--build-arg TORCH_IMAGE="$(img torch "$torch_ver")"
|
||||
|
||||
build final $final_ver \
|
||||
--build-arg BASE_IMAGE="$(img base $base_ver)" \
|
||||
--build-arg TORCH_IMAGE="$(img torch $torch_ver)" \
|
||||
--build-arg REOWN_IMAGE="$(img reown $reown_ver)" \
|
||||
--build-arg BITBOX_IMAGE="$(img bitbox $bitbox_ver)" \
|
||||
--build-arg MONERO_IMAGE="$(img monero $monero_ver)" \
|
||||
--build-arg DECRED_IMAGE="$(img decred $decred_ver)" \
|
||||
--build-arg MWEBD_IMAGE="$(img mwebd $mwebd_ver)"
|
||||
|
||||
echo "done: $(img final $final_ver)"
|
||||
|
||||
Reference in New Issue
Block a user