diff options
| author | cyan <cyjan@mrcyjanek.net> | 2024-11-13 18:12:53 +0000 |
|---|---|---|
| committer | cyan <cyjan@mrcyjanek.net> | 2024-11-13 18:12:53 +0000 |
| commit | 0a985ad7f8b7be12de9758246b3524969a8bb846 (patch) | |
| tree | 19d57956695905dcc04c09b1e7dbfe071cdcb2f2 | |
| parent | 7033e081d5168c44c42c6b3ca4c140c515c07a0d (diff) | |
| parent | d72c15f4339791a7bbdf17e9d827b7b56ca144e4 (diff) | |
Merge remote-tracking branch 'origin/master' into cyjan-cleanup-patches
5 files changed, 7 insertions, 6 deletions
diff --git a/impls/monero.dart/lib/src/checksum_monero.dart b/impls/monero.dart/lib/src/checksum_monero.dart index b94fb5a..1092533 100644 --- a/impls/monero.dart/lib/src/checksum_monero.dart +++ b/impls/monero.dart/lib/src/checksum_monero.dart @@ -1,4 +1,4 @@ // ignore_for_file: constant_identifier_names const String wallet2_api_c_h_sha256 = "198a27486ce4f014b737f52ec2879a90838c3b3ca088de8dc7d55b79a10f4a5b"; const String wallet2_api_c_cpp_sha256 = "22b0c9dd542fb55edfe9e17da67e97ddf5f80bcdd3e126e1bd64cce54234bde1-b089f9ee69924882c5d14dd1a6991deb05d9d1cd"; -const String wallet2_api_c_exp_sha256 = "c8913ac41068f67b57c9b0a3c7dd8973e3c1273b66c2ff0aadb0003931da748c"; +const String wallet2_api_c_exp_sha256 = "c1f785d62709fd8b849063ecf4fe8854d9e3b05b568b9716de98d33e7bdaf522"; diff --git a/impls/monero.ts/checksum_monero.ts b/impls/monero.ts/checksum_monero.ts index d421d01..b8e57cb 100644 --- a/impls/monero.ts/checksum_monero.ts +++ b/impls/monero.ts/checksum_monero.ts @@ -1,5 +1,5 @@ export const moneroChecksum = { wallet2_api_c_h_sha256: "198a27486ce4f014b737f52ec2879a90838c3b3ca088de8dc7d55b79a10f4a5b", wallet2_api_c_cpp_sha256: "22b0c9dd542fb55edfe9e17da67e97ddf5f80bcdd3e126e1bd64cce54234bde1-b089f9ee69924882c5d14dd1a6991deb05d9d1cd", - wallet2_api_c_exp_sha256: "c8913ac41068f67b57c9b0a3c7dd8973e3c1273b66c2ff0aadb0003931da748c", + wallet2_api_c_exp_sha256: "c1f785d62709fd8b849063ecf4fe8854d9e3b05b568b9716de98d33e7bdaf522", } diff --git a/monero_libwallet2_api_c/monero_libwallet2_api_c.exp b/monero_libwallet2_api_c/monero_libwallet2_api_c.exp index e468456..3b2931c 100644 --- a/monero_libwallet2_api_c/monero_libwallet2_api_c.exp +++ b/monero_libwallet2_api_c/monero_libwallet2_api_c.exp @@ -273,6 +273,7 @@ _MONERO_WalletManager_createWalletFromPolyseed _MONERO_WalletManager_closeWallet _MONERO_WalletManager_walletExists _MONERO_WalletManager_verifyWalletPassword +_MONERO_WalletManager_queryWalletDevice _MONERO_WalletManager_findWallets _MONERO_WalletManager_errorString _MONERO_WalletManager_setDaemonAddress @@ -306,4 +307,4 @@ _MONERO_cw_WalletListener_height _MONERO_free _MONERO_checksum_wallet2_api_c_h _MONERO_checksum_wallet2_api_c_cpp -_MONERO_checksum_wallet2_api_c_exp
\ No newline at end of file +_MONERO_checksum_wallet2_api_c_exp diff --git a/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h b/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h index 5a9d56e..4d3d39f 100644 --- a/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h +++ b/monero_libwallet2_api_c/src/main/cpp/monero_checksum.h @@ -2,5 +2,5 @@ #define MONEROC_CHECKSUMS const char * MONERO_wallet2_api_c_h_sha256 = "198a27486ce4f014b737f52ec2879a90838c3b3ca088de8dc7d55b79a10f4a5b"; const char * MONERO_wallet2_api_c_cpp_sha256 = "22b0c9dd542fb55edfe9e17da67e97ddf5f80bcdd3e126e1bd64cce54234bde1-b089f9ee69924882c5d14dd1a6991deb05d9d1cd"; -const char * MONERO_wallet2_api_c_exp_sha256 = "c8913ac41068f67b57c9b0a3c7dd8973e3c1273b66c2ff0aadb0003931da748c"; +const char * MONERO_wallet2_api_c_exp_sha256 = "c1f785d62709fd8b849063ecf4fe8854d9e3b05b568b9716de98d33e7bdaf522"; #endif diff --git a/patches/monero/0008-add-dummy-device-for-ledger.patch b/patches/monero/0008-add-dummy-device-for-ledger.patch index 4ee1409..edca077 100644 --- a/patches/monero/0008-add-dummy-device-for-ledger.patch +++ b/patches/monero/0008-add-dummy-device-for-ledger.patch @@ -234,13 +234,13 @@ index 000000000..fb082694e + MDEBUG("exchange(): waitsForDeviceSend"); + // NOTE: waitsForDeviceSend should be changed by external code + while (waitsForDeviceSend) { -+ sleep(1); ++ usleep(1000); + MDEBUG("exchange(): waitsForDeviceSend (still)"); + } + + MDEBUG("exchange(): waitsForDeviceReceive"); + while (waitsForDeviceReceive) { -+ sleep(1); ++ usleep(1000); + MDEBUG("exchange(): waitsForDeviceReceive (still)"); + } + |