#67 - Makes IPFS persistence optional (#68)

* makes IPFS persistence optional * moves fee inside condition
safient · Apr 27, 2022 · 623aa50 · 623aa50
1 parent 762c3cb
commit 623aa50
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 51 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@safient/core",
-  "version": "0.1.17-alpha",
+  "version": "0.1.18-alpha",
   "description": "JavaScript SDK to manage safes and interact with Safient protocol.",
   "keywords": [
     "Web3",
@@ -37,7 +37,7 @@
     "@ceramicstudio/idx": "^0.12.0",
     "@ceramicstudio/idx-tools": "^0.10.0",
     "@ethersproject/providers": "^5.4.4",
-    "@safient/contracts": "^0.1.15-alpha",
+    "@safient/contracts": "^0.1.16-alpha",
     "@stablelib/random": "^1.0.1",
     "@textile/hub": "^6.3.1",
     "bcryptjs": "^2.4.3",

diff --git a/src/SafientCore.ts b/src/SafientCore.ts
@@ -280,7 +280,8 @@ export class SafientCore {
     claimType: number,
     signalingPeriod: number,
     dDay: number,
-    beneficiary: { email?: string, did?: string}
+    beneficiary: { email?: string, did?: string},
+    persist: boolean = false,
   ): Promise<SafientResponse<EventResponse>> => {
     try {
 
@@ -326,7 +327,8 @@ export class SafientCore {
             timeStamp: Date.now()
           }
 
-          const safeLink = await createIpfsSafeLink(safeLinkData);
+          const safeLink = persist ? await createIpfsSafeLink(safeLinkData) : null;
+
 
           const data: SafeCreation = {
             safeName: safeName,
@@ -351,15 +353,13 @@ export class SafientCore {
           const safe: string[] = await createSafe(data);
 
           if (onChain === true) {
-            const metaDataEvidenceUri: string = await createMetaData(
-              '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512',
-              creatorUser[0].userAddress
-            );
-
-            const arbitrationFee: number = await this.arbitrator.getArbitrationFee();
-
-
+
             if (claimType === Types.ClaimType.ArbitrationBased) {
+              const arbitrationFee: number = await this.arbitrator.getArbitrationFee();
+              const metaDataEvidenceUri: string = await createMetaData(
+                '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512',
+                creatorUser[0].userAddress
+              );
               const totalFee: string = String(ethers.utils.parseEther(String(arbitrationFee + this.guardianFee)));
               const tx: TransactionResponse = await this.contract.createSafe(
                 beneficiaryUser!.userAddress,
@@ -554,12 +554,13 @@ export class SafientCore {
         }
 
         if (safe.onChain === false) {
-          const metaDataEvidenceUri: string = await createMetaData(
-            '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512',
-            creatorUser[0].userAddress
-          );
+
 
           if (safe.claimType === Types.ClaimType.ArbitrationBased) {
+            const metaDataEvidenceUri: string = await createMetaData(
+              '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512',
+              creatorUser[0].userAddress
+            );
             if (safe.stage === SafeStages.ACTIVE) {
               const arbitrationFee: number = await this.arbitrator.getArbitrationFee();
               const totalFee: string = String(ethers.utils.parseEther(String(arbitrationFee + this.guardianFee)));

diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -93,7 +93,7 @@ export type SafeCreation = {
   dDay: number,
   timeStamp: number,
   proofSubmission: boolean,
-  cid: string
+  cid: string | null
 };