Problem: missing support for defi-wallet (fix #469)

extra-cpp-bindings/src/wallectconnectregistry.rs

@@ -198,26 +198,6 @@ mod test {
         assert_eq!(wallets.len(), 20);
     }
 
-    #[test]
-    fn test_fetch_new_no_cache() {
-        let reg = Registry::fetch_new(None);
-        assert!(reg.is_ok());
-    }
-
-    #[test]
-    fn test_fetch_new_with_cache() {
-        let mut dir = std::env::temp_dir();
-        let tmpfile = format!("{}.json", uuid::Uuid::new_v4());
-        dir.push(tmpfile);
-        println!("{:?}", dir);
-
-        let reg = Registry::fetch_new(Some(dir.clone()));
-        assert!(reg.is_ok());
-
-        let reg = Registry::load_cached(Some(dir));
-        assert!(reg.is_ok());
-    }
-
     #[test]
     fn test_load_cached() {
         let reg = Registry::load_cached(Some(PathBuf::from("./not_exists.json")));

integration_test.sh

@@ -39,7 +39,5 @@ $PWD/demo/build/examples/get_tokens_blocking
 $PWD/demo/build/examples/get_token_transfers_blocking
 $PWD/demo/build/examples/create_payment
 $PWD/demo/build/examples/wallet_connect
-$PWD/demo/build/examples/get_token_holders
 $PWD/demo/build/examples/new_wallet
 $PWD/demo/build/examples/restore_wallet
-$PWD/demo/build/examples/get_wallet

wallet-connect/examples/web3_v2.rs

@@ -304,7 +304,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
                 chainid: CHAIN_ID.parse::<u64>()?,
                 gas_limit: "21000".into(),
                 gas_price: "1000000000".into(),
-                nonce: "0".into(),
+                nonce: "".into(),
                 web3api_url: "".into(),
             },
             to: TO_ADDRESS.into(),

wallet-connect/src/crypto.rs

@@ -3,5 +3,4 @@ mod aead;
 /// wrapper around the symmetric key
 mod key;
 
-pub use aead::*;
 pub use key::*;

wallet-connect/src/v2/client.rs

@@ -2,6 +2,7 @@ use async_trait::async_trait;
 use ethers::prelude::PendingTransaction;
 use ethers::types::transaction::eip2718::TypedTransaction;
 use ethers::types::BlockId;
+use ethers::types::U256;
 use ethers::{
     prelude::{
         Address, Bytes, JsonRpcClient, Middleware, MiddlewareError, NameOrAddress, Provider,
@@ -242,6 +243,21 @@ fn append_hex(s: String) -> String {
     }
 }
 
+// tx_bytes is 32 bytes, for defi-wallet , it's txhash
+fn make_defiwallet_signature(tx_bytes: &[u8]) -> Option<Signature> {
+    // print hex of tx_bytes
+    if tx_bytes.len() == 32 {
+        let r = U256::from_big_endian(tx_bytes);
+        let s = U256::zero();
+        let v = 0;
+        // r: 32 bytes, s: 32bytes, v: 1 bytes
+        let sig = Signature { r, s, v };
+        Some(sig)
+    } else {
+        None
+    }
+}
+
 #[async_trait]
 impl Middleware for WCMiddleware<Provider<Client>> {
     type Error = WCError<Provider<Client>>;
@@ -268,6 +284,9 @@ impl Middleware for WCMiddleware<Provider<Client>> {
         }
         if let Some(data) = tx.data() {
             tx_obj.insert("data", format!("0x{}", hex::encode(data)));
+        } else {
+            // need for defi wallet, otherwise user rejection error
+            tx_obj.insert("data", "0x".to_string());
         }
         if let Some(gas) = tx.gas() {
             // gas not working for webwallet
@@ -299,6 +318,14 @@ impl Middleware for WCMiddleware<Provider<Client>> {
             ))));
         }
 
+        if tx_rlp.as_raw().len() == 32 {
+            // It's not RLP-encoded
+            return make_defiwallet_signature(tx_rlp.as_raw()).ok_or_else(|| {
+                WCError::ClientError(ClientError::Eyre(eyre!(
+                    "failed to decode defiwallet tx-hash signature"
+                )))
+            });
+        }
         let first_byte = tx_rlp.as_raw()[0];
         // TODO: check that the decoded request matches the typed transaction content here? or a new `sign_transaction` function that returns both request+signature?
         if first_byte <= 0x7f {

wallet-connect/src/v2/core.rs

@@ -619,7 +619,7 @@ impl JsonRpcClient for Connector {
             .required_namespaces
             .eip155
             .chains
-            .get(0)
+            .first()
             .map(ToOwned::to_owned)
             .unwrap_or_else(|| "eip155:25".to_owned());
         // release the lock

wallet-connect/src/v2/protocol.rs

@@ -92,7 +92,7 @@ pub struct WcSessionProposeResponse {
 pub struct WcSessionSettle {
     relay: Relay,
     pub namespaces: Namespaces,
-    #[serde(rename = "requiredNamespaces")]
+    #[serde(rename = "requiredNamespaces", default)]
     required_namespaces: RequiredNamespaces,
     pub controller: Peer,
     expiry: i64,