@functionland/react-native-fula 1.46.0 → 1.53.0

package/src/protocols/chain-api.ts

@@ -10,7 +10,7 @@ const types = {
 };
 
 export const init = async (
-  wsAddress: string = 'wss://node3.functionyard.fula.network'
+  wsAddress: string = 'wss://node3.test.fula.network'
 ): Promise<ApiPromise> => {
   const provider = new WsProvider(wsAddress);
   const api = await ApiPromise.create({ types, provider }).catch((err) => {
@@ -57,7 +57,7 @@ function createManifest(
   const serializedManifest = manifest_metadata.map((item) => serialize(item)); // Implement `serialize` accordingly
 
   // Serialize cids to Uint8Array or string
-  const serializedCids = cids.map((cid) => serialize(cid)); // Implement `serialize` accordingly
+  //const serializedCids = cids.map((cid) => serialize(cid)); // Implement `serialize` accordingly
 
   // Create arrays for `poolId` and `replicationFactor`
   const poolIds = new Array(cids.length).fill(poolId);
@@ -65,7 +65,7 @@ function createManifest(
 
   const batchUploadManifest = {
     manifest: serializedManifest,
-    cids: serializedCids,
+    cids: cids,
     poolId: poolIds,
     replicationFactor: replicationFactors,
   };
@@ -111,11 +111,11 @@ export const batchUploadManifest = async (
         return new Promise<{ hash: string }>((resolve, reject) => {
           submitExtrinsic
             .signAndSend(userKey, { nonce: -1 }, ({ status }) => {
-              if (status.isInBlock || status.isFinalized) {
+              if (status.isFinalized) {
                 if (unsub) {
                   unsub(); // Call unsub before resolving the promise
                 }
-                resolve({ hash: status.asInBlock.toString() });
+                resolve({ hash: status.asFinalized.toString() });
               }
             })
             .then((unsubFn) => {

package/src/protocols/fula.ts

@@ -1,10 +1,11 @@
 import Fula from '../interfaces/fulaNativeModule';
 import {
   init as chainApiInit,
-  batchUploadManifest,
   checkAccountBalance,
   getAccountIdFromSeed,
+  batchUploadManifest,
 } from './chain-api';
+import { batchUploadManifest as batchUploadManifestBlox } from './blockchain';
 import { ApiPromise } from '@polkadot/api';
 
 /**
@@ -126,6 +127,10 @@ export const listRecentCidsAsString = (): Promise<string[]> => {
   return Fula.listRecentCidsAsString();
 };
 
+export const listRecentCidsAsStringWithChildren = (): Promise<string[]> => {
+  return Fula.listRecentCidsAsStringWithChildren();
+};
+
 /**
  * Clears the cids that ar recent
  */
@@ -350,9 +355,10 @@ export const replicateRecentCids = async (
   seed: string,
   poolId: number,
   replicationNo: number = 4
-): Promise<{ status: boolean; msg: string }> => {
+): Promise<{ status: boolean; msg: string; cids: string[] }> => {
   let status = true;
   let msg = '';
+  let recentCids: string[] = [];
   if (!api) {
     api = await chainApiInit();
   }
@@ -364,7 +370,7 @@ export const replicateRecentCids = async (
       const accountBal = await checkAccountBalance(api, account);
       console.log('account balance: ' + accountBal);
       if (accountBal !== '0') {
-        const recentCids = await listRecentCidsAsString();
+        recentCids = await listRecentCidsAsStringWithChildren();
         console.log(recentCids);
         if (recentCids) {
           console.log({
@@ -383,7 +389,7 @@ export const replicateRecentCids = async (
           );
           console.log('batchUploadManifest res received');
           console.log(res);
-          if (res && res.hash) {
+          if (res?.hash) {
             const signedBlock = await api.rpc.chain.getBlock(res.hash);
             if (signedBlock?.block?.extrinsics?.length) {
               await clearCidsFromRecent(recentCids);
@@ -421,6 +427,80 @@ export const replicateRecentCids = async (
     }
   }
 
+  // Return a value (true/false) depending on the outcome of the function
+  // For example:
+  return { status: status, msg: msg, cids: recentCids }; // or false, depending on your logic
+};
+
+/**
+ * replicate replicates data on the nework
+ */
+export const replicateRecentCidsBlox = async (
+  api: ApiPromise | undefined,
+  seed: string,
+  poolId: number,
+  replicationNo: number = 6
+): Promise<{ status: boolean; msg: string }> => {
+  let status = true;
+  let msg = '';
+  console.log('uploading manifests');
+  try {
+    //TODO: Implement getting SUGAR balance of blox
+    //const accountBal = await getAccountBalanceBlox();
+    const accountBal = '1';
+    console.log('account balance: ' + accountBal);
+      const recentCids = await listRecentCidsAsStringWithChildren();
+      console.log(recentCids);
+      if (recentCids) {
+        console.log({
+          api,
+          seed,
+          recentCids,
+          poolId,
+          replicationNo,
+        });
+        const res = await batchUploadManifestBlox(
+          api,
+          seed,
+          recentCids,
+          poolId,
+          replicationNo
+        );
+        console.log('batchUploadManifest res received');
+        console.log(res);
+        if (res) {
+          if (typeof res === 'object' && 'pool_id' in res) {
+            msg = res.storer;
+          } else {
+            status = false;
+            msg =
+              'Unexpected response from batchUploadManifestBlox: ' +
+              JSON.stringify(res);
+          }
+        } else {
+          status = false;
+          msg = 'hash is not returned';
+        }
+      } else {
+        status = false;
+        msg = 'No recent Cids found';
+      }
+  } catch (e: any) {
+    console.log('res failed');
+    console.log(e);
+    let errorMessage = '';
+
+    if (e instanceof Error) {
+      // If it's an Error instance, use the message property
+      errorMessage = e.message;
+    } else {
+      // If it's not an Error instance, convert it to string
+      errorMessage = e.toString();
+    }
+    status = false;
+    msg = errorMessage;
+  }
+
   // Return a value (true/false) depending on the outcome of the function
   // For example:
   return { status: status, msg: msg }; // or false, depending on your logic

package/src/protocols/fxblox.ts

@@ -144,3 +144,28 @@ export const getFolderSize = (
     });
   return res;
 };
+
+export const getDatastoreSize = (): Promise<BType.GetDatastoreSizeResponse> => {
+  console.log('getDatastoreSize in react-native started');
+  let res = Fula.getDatastoreSize()
+    .then((res1) => {
+      try {
+        console.log('res1 received');
+        console.log(res1);
+        let jsonRes: BType.GetDatastoreSizeResponse = JSON.parse(res1);
+        return jsonRes;
+      } catch (e) {
+        try {
+          return JSON.parse(res1);
+        } catch (e1) {
+          console.error('Error parsing res in getDatastoreSize:', e1);
+          throw e1; // Rethrow the error to maintain the rejection state
+        }
+      }
+    })
+    .catch((err) => {
+      console.error('Error getDatastoreSize:', err);
+      throw err; // Rethrow the error to maintain the rejection state
+    });
+  return res;
+};

package/src/types/blockchain.ts

@@ -9,9 +9,9 @@ export interface AccountExistsResponse {
 }
 
 export interface AccountFundResponse {
-  from:   string;
-	to:     string;
-	amount: string;
+  from: string;
+  to: string;
+  amount: string;
 }
 
 export interface PoolCreateResponse {
@@ -67,6 +67,12 @@ export interface ManifestUploadResponse {
   poolID: number;
 }
 
+export interface ManifestBatchUploadResponse {
+  storer: string;
+  cid: string[];
+  pool_id: number;
+}
+
 export interface PoolRequest {
   poolID: number;
   account: string;

package/src/types/fxblox.ts

@@ -25,3 +25,11 @@ export interface GetFolderPathResponse {
   folder_path: string;
   size: string;
 }
+
+export interface GetDatastoreSizeResponse {
+  size: string;
+  storage_max: string;
+  count: string;
+  folder_path: string;
+  version: string;
+}