From c624a922708ce5a801ee056e16484b2dd80761b1 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Tue, 30 Jul 2024 15:04:17 +0000 Subject: [PATCH] fix build problems --- .github/workflows/checksum.yaml | 2 +- generate_checksum.sh | 4 +++- impls/monero.dart/lib/src/checksum_monero.dart | 5 ++--- impls/monero.dart/lib/src/checksum_wownero.dart | 5 ++--- wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h | 7 +++++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index 92482a57..81e5b47a 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -36,5 +36,5 @@ jobs: with: issue-number: ${{ github.event.pull_request.number }} body: | - Invalid bindings found in monero.dart, make sure to run `./impls/monero.dart/update_bindings.sh` + Invalid checksums, please run `./generate_checksum.sh` \ No newline at end of file diff --git a/generate_checksum.sh b/generate_checksum.sh index 13bcc9fe..f77c4182 100755 --- a/generate_checksum.sh +++ b/generate_checksum.sh @@ -11,15 +11,17 @@ do COIN_libwallet2_api_c_date=$(git log -1 --format=%ci -- ${coin}_libwallet2_api_c) cat > ${coin}_libwallet2_api_c/src/main/cpp/${coin}_checksum.h << EOF +#ifndef MONEROC_CHECKSUMS +#define MONEROC_CHECKSUMS const char * ${COIN}_wallet2_api_c_h_sha256 = "${COIN_wallet2_api_c_h_sha256}"; const char * ${COIN}_wallet2_api_c_cpp_sha256 = "${COIN_wallet2_api_c_cpp_sha256}"; const char * ${COIN}_wallet2_api_c_exp_sha256 = "${COIN_wallet2_api_c_exp_sha256}"; const int ${COIN}_libwallet2_api_c_version = ${COIN_libwallet2_api_c_version}; const char * ${COIN}_wallet2_api_c_date = "${COIN_libwallet2_api_c_date}"; +#endif EOF cat > impls/monero.dart/lib/src/checksum_${coin}.dart << EOF // ignore_for_file: constant_identifier_names - const String wallet2_api_c_h_sha256 = "${COIN_wallet2_api_c_h_sha256}"; const String wallet2_api_c_cpp_sha256 = "${COIN_wallet2_api_c_cpp_sha256}"; const String wallet2_api_c_exp_sha256 = "${COIN_wallet2_api_c_exp_sha256}"; diff --git a/impls/monero.dart/lib/src/checksum_monero.dart b/impls/monero.dart/lib/src/checksum_monero.dart index 9ba60c23..45fb3307 100644 --- a/impls/monero.dart/lib/src/checksum_monero.dart +++ b/impls/monero.dart/lib/src/checksum_monero.dart @@ -1,7 +1,6 @@ // ignore_for_file: constant_identifier_names - const String wallet2_api_c_h_sha256 = "b9c712f59873da33dfc4c9caa4850ee5cba4bf7310179dfc33af9d3029d9855a"; const String wallet2_api_c_cpp_sha256 = "7edf0905802faa48f66362a6d2ebf25f458107b67cd4abc6d01886c40f5634ef"; const String wallet2_api_c_exp_sha256 = "bfac0ee584f50bd9263ae453103530c2594b21aec8ae7622e8c192c027f5d6af"; -const int libwallet2_api_c_version = 46; -const String wallet2_api_c_date = "2024-07-16 13:17:16 +0200"; +const int libwallet2_api_c_version = 47; +const String wallet2_api_c_date = "2024-07-30 14:33:17 +0000"; diff --git a/impls/monero.dart/lib/src/checksum_wownero.dart b/impls/monero.dart/lib/src/checksum_wownero.dart index 7c8faa54..1ed9c9f4 100644 --- a/impls/monero.dart/lib/src/checksum_wownero.dart +++ b/impls/monero.dart/lib/src/checksum_wownero.dart @@ -1,7 +1,6 @@ // ignore_for_file: constant_identifier_names - const String wallet2_api_c_h_sha256 = "1f4688b9ddacbc33e82426c50480ab8e3727718f59e577080a7dc6dca48bcf9d"; const String wallet2_api_c_cpp_sha256 = "f5047661949961d19a1dfadec0fa24e83911b2f7c4b658717edb5b50ab2055a1"; const String wallet2_api_c_exp_sha256 = "dd9874cc43a6a74bbfa3e49c4ad3f835ff22efd3de8f679cc91c4af3d931aedb"; -const int libwallet2_api_c_version = 19; -const String wallet2_api_c_date = "2024-07-16 13:17:16 +0200"; +const int libwallet2_api_c_version = 20; +const String wallet2_api_c_date = "2024-07-30 14:33:17 +0000"; diff --git a/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h b/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h index b2979a55..7e31828c 100644 --- a/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h +++ b/wownero_libwallet2_api_c/src/main/cpp/wownero_checksum.h @@ -1,5 +1,8 @@ +#ifndef MONEROC_CHECKSUMS +#define MONEROC_CHECKSUMS const char * WOWNERO_wallet2_api_c_h_sha256 = "1f4688b9ddacbc33e82426c50480ab8e3727718f59e577080a7dc6dca48bcf9d"; const char * WOWNERO_wallet2_api_c_cpp_sha256 = "f5047661949961d19a1dfadec0fa24e83911b2f7c4b658717edb5b50ab2055a1"; const char * WOWNERO_wallet2_api_c_exp_sha256 = "dd9874cc43a6a74bbfa3e49c4ad3f835ff22efd3de8f679cc91c4af3d931aedb"; -const int WOWNERO_libwallet2_api_c_version = 19; -const char * WOWNERO_wallet2_api_c_date = "2024-07-16 13:17:16 +0200"; +const int WOWNERO_libwallet2_api_c_version = 20; +const char * WOWNERO_wallet2_api_c_date = "2024-07-30 14:33:17 +0000"; +#endif