Fix JVM synchronization issue (#4218)

* Fix Java JVM leak * clean * apply to jni * [Misc]: Upgrade Rust toolchain to `nightly-2025-01-16` * [Misc]: Fix Clippy warnings --------- Co-authored-by: Satoshi Otomakan <[email protected]>
trustwallet · Jan 16, 2025 · 8b2cdb7 · 8b2cdb7
1 parent dee25d4
commit 8b2cdb7
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/jni/java/wallet/core/java/GenericPhantomReference.java b/jni/java/wallet/core/java/GenericPhantomReference.java
@@ -4,12 +4,13 @@
 import java.lang.ref.ReferenceQueue;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.Collections;
 
 public class GenericPhantomReference extends PhantomReference<Object> {
     private final long nativeHandle;
     private final OnDeleteCallback onDeleteCallback;
 
-    private static final Set<GenericPhantomReference> references = new HashSet<>();
+    private static final Set<GenericPhantomReference> references = Collections.synchronizedSet(new HashSet<>());
     private static final ReferenceQueue<Object> queue = new ReferenceQueue<>();
 
     static {

diff --git a/...re-kotlin/src/commonAndroidJvmMain/kotlin/com/trustwallet/core/GenericPhantomReference.kt b/...re-kotlin/src/commonAndroidJvmMain/kotlin/com/trustwallet/core/GenericPhantomReference.kt
@@ -2,6 +2,7 @@ package com.trustwallet.core
 
 import java.lang.ref.PhantomReference
 import java.lang.ref.ReferenceQueue
+import java.util.Collections
 
 internal class GenericPhantomReference private constructor(
     referent: Any,
@@ -10,7 +11,7 @@ internal class GenericPhantomReference private constructor(
 ) : PhantomReference<Any>(referent, queue) {
 
     companion object {
-        private val references: MutableSet<GenericPhantomReference> = HashSet()
+        private val references: MutableSet<GenericPhantomReference> = Collections.synchronizedSet(HashSet())
         private val queue: ReferenceQueue<Any> = ReferenceQueue()
 
         init {

diff --git a/rust/chains/tw_solana/src/transaction/versioned.rs b/rust/chains/tw_solana/src/transaction/versioned.rs
@@ -189,7 +189,7 @@ impl<'de> Deserialize<'de> for MessagePrefix {
     {
         struct PrefixVisitor;
 
-        impl<'de> Visitor<'de> for PrefixVisitor {
+        impl Visitor<'_> for PrefixVisitor {
             type Value = MessagePrefix;
 
             fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

diff --git a/rust/frameworks/tw_ton_sdk/src/boc/binary_writer.rs b/rust/frameworks/tw_ton_sdk/src/boc/binary_writer.rs
@@ -54,7 +54,7 @@ impl BinaryWriter {
         } else {
             self.write_bytes(&data[..data_len - 1])?;
             let last_byte = data[data_len - 1];
-            let l = last_byte | 1 << (8 - rest_bits - 1);
+            let l = last_byte | (1 << (8 - rest_bits - 1));
             self.write(8, l)?;
         }
 

diff --git a/rust/frameworks/tw_ton_sdk/src/boc/raw.rs b/rust/frameworks/tw_ton_sdk/src/boc/raw.rs
@@ -263,7 +263,7 @@ fn write_raw_cell(
     if !full_bytes {
         writer.write_bytes(&data[..data_len_bytes - 1])?;
         let last_byte = data[data_len_bytes - 1];
-        let l = last_byte | 1 << (8 - padding_bits - 1);
+        let l = last_byte | (1 << (8 - padding_bits - 1));
         writer.write(8, l)?;
     } else {
         writer.write_bytes(data)?;

diff --git a/rust/tw_any_coin/src/wallet_connect_request.rs b/rust/tw_any_coin/src/wallet_connect_request.rs
@@ -16,8 +16,6 @@ impl WalletConnectRequest {
     #[inline]
     pub fn parse(coin: CoinType, input: &[u8]) -> SigningResult<Data> {
         let (ctx, entry) = coin_dispatcher(coin)?;
-        entry
-            .wallet_connect_parse_request(&ctx, input)
-            .map_err(SigningError::from)
+        entry.wallet_connect_parse_request(&ctx, input)
     }
 }
diff --git a/rust/tw_encoding/src/hex.rs b/rust/tw_encoding/src/hex.rs
@@ -30,7 +30,7 @@ pub trait DecodeHex {
     fn decode_hex(&self) -> FromHexResult<Data>;
 }
 
-impl<'a> DecodeHex for &'a str {
+impl DecodeHex for &str {
     fn decode_hex(&self) -> FromHexResult<Data> {
         decode(self)
     }

diff --git a/rust/tw_evm/src/message/eip712/message_types.rs b/rust/tw_evm/src/message/eip712/message_types.rs
@@ -38,7 +38,7 @@ pub struct CustomTypeBuilder<'a> {
     type_properties: &'a mut Vec<Property>,
 }
 
-impl<'a> CustomTypeBuilder<'a> {
+impl CustomTypeBuilder<'_> {
     pub fn add_property(&mut self, name: &str, property_type: PropertyType) -> &mut Self {
         self.type_properties.push(Property {
             name: name.to_string(),

diff --git a/rust/tw_misc/src/test_utils/json.rs b/rust/tw_misc/src/test_utils/json.rs
@@ -16,7 +16,7 @@ impl ToJson for Json {
     }
 }
 
-impl<'a> ToJson for Cow<'a, str> {
+impl ToJson for Cow<'_, str> {
     #[track_caller]
     fn to_json(&self) -> Json {
         self.as_ref().to_json()
@@ -30,7 +30,7 @@ impl ToJson for String {
     }
 }
 
-impl<'a> ToJson for &'a str {
+impl ToJson for &str {
     #[track_caller]
     fn to_json(&self) -> Json {
         serde_json::from_str(self).expect("Error on deserializing JSON from string")

diff --git a/tools/install-rust-dependencies b/tools/install-rust-dependencies
@@ -2,7 +2,7 @@
 
 set -e
 
-NIGHTLY="nightly-2024-06-13"
+NIGHTLY="nightly-2025-01-16"
 
 rustup toolchain install $NIGHTLY
 rustup default $NIGHTLY