added PoolID to poolList

Author: ehsan6sha

android/build.gradle

@@ -94,7 +94,7 @@ dependencies {
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
-  implementation 'com.github.functionland:fula-build-aar:v1.35.0' // From jitpack.io
+  implementation 'com.github.functionland:fula-build-aar:v1.36.0' // From jitpack.io
   implementation 'com.github.functionland:wnfs-android:v1.8.1' // From jitpack.io
   implementation 'commons-io:commons-io:20030203.000550'
   implementation 'commons-codec:commons-codec:1.15'

android/src/main/java/land/fx/fula/FulaModule.java

@@ -509,32 +509,68 @@ private byte[] createPeerIdentity(byte[] identity) throws GeneralSecurityExcepti
 
       if (encryptedLibp2pId == null || !encryptedLibp2pId.startsWith("FULA_" +
         "ENC_V4:")) {
-        Log.d("ReactNative", "encryptedLibp2pId is not correct. creating new one " + encryptedLibp2pId);
-
-        try {
-          libp2pId = Fulamobile.generateEd25519KeyFromString(toString(identity));
-        } catch (Exception e) {
-          Log.d("ReactNative", "Failed to generate libp2pId: " + e.getMessage());
-          throw new GeneralSecurityException("Failed to generate libp2pId", e);
-        }
-        encryptedLibp2pId = "FULA_ENC_V4:" + Cryptography.encryptMsg(StaticHelper.bytesToBase64(libp2pId), encryptionSecretKey, null);
-        sharedPref.add(PRIVATE_KEY_STORE_PEERID, encryptedLibp2pId);
+        Log.d("ReactNative", "encryptedLibp2pId is not correct or empty. creating new one " + encryptedLibp2pId);
+        encryptedLibp2pId = createEncryptedLibp2pId(identity, encryptionSecretKey);
       } else {
         Log.d("ReactNative", "encryptedLibp2pId is correct. decrypting " + encryptedLibp2pId);
       }
 
       try {
-        String decryptedLibp2pId = Cryptography.decryptMsg(encryptedLibp2pId.replace("FULA_ENC_V4:", ""), encryptionSecretKey);
-
+        String decryptedLibp2pId = decryptLibp2pIdentity(encryptedLibp2pId, encryptionSecretKey);
         return StaticHelper.base64ToBytes(decryptedLibp2pId);
       } catch (InvalidKeyException | NoSuchAlgorithmException | NoSuchPaddingException | IllegalBlockSizeException | BadPaddingException | InvalidAlgorithmParameterException e) {
         Log.d("ReactNative", "createPeerIdentity decryptMsg failed with Error: " + e.getMessage());
-        throw (e);
+        Log.d("ReactNative", "creating new encrpyted identity");
+        try {
+          encryptedLibp2pId = createEncryptedLibp2pId(identity, encryptionSecretKey);
+          String decryptedLibp2pId = decryptLibp2pIdentity(encryptedLibp2pId, encryptionSecretKey);
+          return StaticHelper.base64ToBytes(decryptedLibp2pId);
+        } catch (InvalidKeyException | NoSuchAlgorithmException | NoSuchPaddingException | IllegalBlockSizeException | BadPaddingException | InvalidAlgorithmParameterException e2) {
+          Log.d("ReactNative", "createPeerIdentity decryptMsg failed with Error: " + e2.getMessage());
+          Log.d("ReactNative", "creating new encrpyted identity");
+          throw(e2);
+        }
       }
 
     } catch (InvalidKeyException | NoSuchAlgorithmException | NoSuchPaddingException | IllegalBlockSizeException | BadPaddingException | InvalidAlgorithmParameterException e) {
       Log.d("ReactNative", "createPeerIdentity failed with Error: " + e.getMessage());
       throw (e);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private String decryptLibp2pIdentity(String encryptedLibp2pId, SecretKey encryptionSecretKey) throws Exception {
+    try {
+        String decryptedLibp2pId = Cryptography.decryptMsg(encryptedLibp2pId.replace("FULA_ENC_V4:", ""), encryptionSecretKey);
+
+        return decryptedLibp2pId;
+      } catch (InvalidKeyException | NoSuchAlgorithmException | NoSuchPaddingException | IllegalBlockSizeException | BadPaddingException | InvalidAlgorithmParameterException e) {
+        Log.d("ReactNative", "createPeerIdentity decryptMsg failed with Error: " + e.getMessage());
+        Log.d("ReactNative", "creating new encrpyted identity");
+        throw new GeneralSecurityException("decryptLibp2pIdentity Failed to decrypt libp2pId", e);
+      }
+  }
+
+  private String createEncryptedLibp2pId(byte[] identity, SecretKey encryptionSecretKey) throws Exception {
+    byte[] libp2pId;
+    String encryptedLibp2pId;
+    try {
+      Log.d("ReactNative", "createEncryptedLibp2pId started");
+
+        try {
+          libp2pId = Fulamobile.generateEd25519KeyFromString(toString(identity));
+        } catch (Exception e) {
+          Log.d("ReactNative", " createEncryptedLibp2pId Failed to generate libp2pId: " + e.getMessage());
+          throw new GeneralSecurityException("createEncryptedLibp2pId Failed to generate libp2pId", e);
+        }
+        encryptedLibp2pId = "FULA_ENC_V4:" + Cryptography.encryptMsg(StaticHelper.bytesToBase64(libp2pId), encryptionSecretKey, null);
+        sharedPref.add(PRIVATE_KEY_STORE_PEERID, encryptedLibp2pId);
+        return encryptedLibp2pId;
+    }
+    catch (Exception e) {
+      Log.d("ReactNative", "createEncryptedLibp2pId failed with Error: " + e.getMessage());
+      throw new GeneralSecurityException("createEncryptedLibp2pId Failed to generate libp2pId at hte first level", e);
     }
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@functionland/react-native-fula",
-  "version": "1.35.0",
+  "version": "1.36.0",
   "description": "This package is a bridge to use the Fula libp2p protocols in the react-native which is using wnfs",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

src/protocols/chain-api.ts

@@ -172,6 +172,7 @@ export const listPools = async (
         let formattedPoolInfo: BType.Pool = JSON.parse(
           JSON.stringify(poolInfo.toHuman())
         );
+        formattedPoolInfo.poolID = i;
         pools.pools.push(formattedPoolInfo);
       }
     }

src/types/blockchain.ts

@@ -78,10 +78,11 @@ export interface PoolUsers {
 
 export interface Pool {
   poolID: number;
-  owner: string;
+  creator: string;
   poolName: string;
   parent: string;
   participants: string[];
+  region: string;
 }
 
 export interface ManifestMetadata {