feat: add recurrent fees on LOC creation.

logion-network/logion-internal#1053
logion-network · Nov 7, 2023 · f445ffe · f445ffe
1 parent bf42d08
commit f445ffe
Show file tree

Hide file tree

Showing 11 changed files with 206 additions and 14 deletions.
diff --git a/src/__mocks__/LogionMock.ts b/src/__mocks__/LogionMock.ts
@@ -68,6 +68,8 @@ export const CLOSED_IDENTITY_LOC: LegalOfficerCase = {
     links: [],
     collectionCanUpload: false,
     valueFee: 0n,
+    collectionItemFee: 0n,
+    tokensRecordFee: 0n,
 }
 
 export const OPEN_IDENTITY_LOC_ID = "195914524858768213081425411950368569411";
@@ -82,6 +84,8 @@ export const OPEN_IDENTITY_LOC: LegalOfficerCase = {
     links: [],
     collectionCanUpload: false,
     valueFee: 0n,
+    collectionItemFee: 0n,
+    tokensRecordFee: 0n,
 }
 
 export const CLOSED_COLLECTION_LOC_ID = "195914524858768213081425411950368569411";
@@ -96,4 +100,6 @@ export const CLOSED_COLLECTION_LOC: LegalOfficerCase = {
     links: [],
     collectionCanUpload: false,
     valueFee: 100n,
+    collectionItemFee: 50n,
+    tokensRecordFee: 40n,
 }
diff --git a/src/components/identity/CollectionInfo.tsx b/src/components/identity/CollectionInfo.tsx
@@ -21,7 +21,15 @@ export function CollectionInfo(props: Props) {
                 <Col>
                     <Detail label="Value fee" value={ <span>
                         <AmountFormat amount={
-                            props.collection.valueFee ? toPrefixedLgnt(props.collection.valueFee.toString()) : Currency.nLgnt(0n)
+                            props.collection.fees.valueFee ? toPrefixedLgnt(props.collection.fees.valueFee.toString()) : Currency.nLgnt(0n)
+                        }/> { Currency.SYMBOL }</span> } />
+                    <Detail label="Collection item fee" value={ <span>
+                        <AmountFormat amount={
+                            props.collection.fees.collectionItemFee ? toPrefixedLgnt(props.collection.fees.collectionItemFee.toString()) : Currency.nLgnt(0n)
+                        }/> { Currency.SYMBOL }</span> } />
+                    <Detail label="Tokens record fee" value={ <span>
+                        <AmountFormat amount={
+                            props.collection.fees.tokensRecordFee ? toPrefixedLgnt(props.collection.fees.tokensRecordFee.toString()) : Currency.nLgnt(0n)
                         }/> { Currency.SYMBOL }</span> } />
                 </Col>
                 <Col>

diff --git a/src/legal-officer/transaction-protection/LocRequestAcceptanceAndCreation.test.tsx b/src/legal-officer/transaction-protection/LocRequestAcceptanceAndCreation.test.tsx
@@ -70,7 +70,7 @@ describe("LocRequestAcceptance", () => {
 
         setupApiMock(api => {
             const submittable = mockSubmittable();
-            api.setup(instance => instance.polkadot.tx.logionLoc.createCollectionLoc(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), null, It.IsAny())).returns(submittable.object());
+            api.setup(instance => instance.polkadot.tx.logionLoc.createCollectionLoc(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), null, It.IsAny(), It.IsAny(), It.IsAny())).returns(submittable.object());
             const fees = new Mock<Fees>();
             api.setup(instance => instance.fees.estimateCreateLoc(It.IsAny())).returnsAsync(fees.object());
         });

diff --git a/src/loc/LegalFeeAmount.tsx b/src/loc/LegalFeeAmount.tsx
@@ -18,8 +18,8 @@ export default function LegalFeeAmount(props: Props) {
         if(props.loc.requesterLocId) {
             return { value: 0n, custom: true };
         } else {
-            if(props.loc.legalFee !== undefined) {
-                return { value: props.loc.legalFee, custom: true };
+            if(props.loc.fees.legalFee !== undefined) {
+                return { value: props.loc.fees.legalFee, custom: true };
             } else {
                 return { value: Currency.toCanonicalAmount(Currency.nLgnt(DEFAULT_LEGAL_FEE)), custom: false };
             }

diff --git a/src/loc/OpenLoc.tsx b/src/loc/OpenLoc.tsx
@@ -45,10 +45,17 @@ export default function OpenLoc(props: Props) {
             (async function () {
                 if (locState instanceof AcceptedRequest) {
                     if (locState.data().locType === "Collection") {
-                        const apiLimits = await limits.toApiLimits(client.logionApi)
+                        const apiLimits = await limits.toApiLimits(client.logionApi);
+                        const fees = locState.data().fees;
+                        if(fees.valueFee === undefined || fees.collectionItemFee === undefined || fees.tokensRecordFee === undefined) {
+                            throw new Error("Value or recurrent fees missing");
+                        }
                         setFees(await locState.estimateFeesOpenCollection({
                             ...apiLimits,
                             autoPublish,
+                            valueFee: fees.valueFee,
+                            collectionItemFee: fees.collectionItemFee,
+                            tokensRecordFee: fees.tokensRecordFee,
                         }));
                     } else {
                         setFees(await locState.estimateFeesOpen({ autoPublish }));

diff --git a/src/loc/TestData.ts b/src/loc/TestData.ts
@@ -42,5 +42,11 @@ export function buildLocRequest(locId: UUID, loc: LegalOfficerCase): LocData {
         })),
         verifiedIssuer: false,
         issuers: [],
+        fees: {
+            valueFee: loc.valueFee,
+            legalFee: loc.legalFee,
+            collectionItemFee: loc.collectionItemFee,
+            tokensRecordFee: loc.tokensRecordFee,
+        }
     };
 }
diff --git a/src/loc/__snapshots__/ContextualizedLocDetails.test.tsx.snap b/src/loc/__snapshots__/ContextualizedLocDetails.test.tsx.snap
@@ -7,6 +7,12 @@ exports[`ContextualizedLocDetails renders 1`] = `
       "createdOn": "2023-10-10T08:25:18.546Z",
       "decisionOn": "2023-10-10T08:25:18.546Z",
       "description": "Description",
+      "fees": Object {
+        "collectionItemFee": 0n,
+        "legalFee": undefined,
+        "tokensRecordFee": 0n,
+        "valueFee": 0n,
+      },
       "files": Array [],
       "id": UUID {
         "bytes": Array [
@@ -51,6 +57,12 @@ exports[`ContextualizedLocDetails renders 1`] = `
         "createdOn": "2023-10-10T08:25:18.546Z",
         "decisionOn": "2023-10-10T08:25:18.546Z",
         "description": "Description",
+        "fees": Object {
+          "collectionItemFee": 0n,
+          "legalFee": undefined,
+          "tokensRecordFee": 0n,
+          "valueFee": 0n,
+        },
         "files": Array [],
         "id": UUID {
           "bytes": Array [
@@ -107,6 +119,12 @@ exports[`ContextualizedLocDetails renders 1`] = `
         "createdOn": "2023-10-10T08:25:18.546Z",
         "decisionOn": "2023-10-10T08:25:18.546Z",
         "description": "Description",
+        "fees": Object {
+          "collectionItemFee": 0n,
+          "legalFee": undefined,
+          "tokensRecordFee": 0n,
+          "valueFee": 0n,
+        },
         "files": Array [],
         "id": UUID {
           "bytes": Array [
@@ -159,6 +177,12 @@ exports[`ContextualizedLocDetails renders 1`] = `
         "createdOn": "2023-10-10T08:25:18.546Z",
         "decisionOn": "2023-10-10T08:25:18.546Z",
         "description": "Description",
+        "fees": Object {
+          "collectionItemFee": 0n,
+          "legalFee": undefined,
+          "tokensRecordFee": 0n,
+          "valueFee": 0n,
+        },
         "files": Array [],
         "id": UUID {
           "bytes": Array [
@@ -204,6 +228,12 @@ exports[`ContextualizedLocDetails renders 1`] = `
         "createdOn": "2023-10-10T08:25:18.546Z",
         "decisionOn": "2023-10-10T08:25:18.546Z",
         "description": "Description",
+        "fees": Object {
+          "collectionItemFee": 0n,
+          "legalFee": undefined,
+          "tokensRecordFee": 0n,
+          "valueFee": 0n,
+        },
         "files": Array [],
         "id": UUID {
           "bytes": Array [
@@ -249,6 +279,12 @@ exports[`ContextualizedLocDetails renders 1`] = `
         "createdOn": "2023-10-10T08:25:18.546Z",
         "decisionOn": "2023-10-10T08:25:18.546Z",
         "description": "Description",
+        "fees": Object {
+          "collectionItemFee": 0n,
+          "legalFee": undefined,
+          "tokensRecordFee": 0n,
+          "valueFee": 0n,
+        },
         "files": Array [],
         "id": UUID {
           "bytes": Array [
@@ -298,6 +334,12 @@ exports[`ContextualizedLocDetails renders 1`] = `
         "createdOn": "2023-10-10T08:25:18.546Z",
         "decisionOn": "2023-10-10T08:25:18.546Z",
         "description": "Description",
+        "fees": Object {
+          "collectionItemFee": 0n,
+          "legalFee": undefined,
+          "tokensRecordFee": 0n,
+          "valueFee": 0n,
+        },
         "files": Array [],
         "id": UUID {
           "bytes": Array [

diff --git a/src/loc/__snapshots__/UserContextualizedLocDetails.test.tsx.snap b/src/loc/__snapshots__/UserContextualizedLocDetails.test.tsx.snap
@@ -8,6 +8,12 @@ exports[`UserContextualizedLocDetails renders for requester 1`] = `
       "createdOn": "2023-10-10T08:25:18.546Z",
       "decisionOn": "2023-10-10T08:25:18.546Z",
       "description": "Description",
+      "fees": Object {
+        "collectionItemFee": 0n,
+        "legalFee": undefined,
+        "tokensRecordFee": 0n,
+        "valueFee": 0n,
+      },
       "files": Array [],
       "id": UUID {
         "bytes": Array [
@@ -82,6 +88,12 @@ exports[`UserContextualizedLocDetails renders for requester 1`] = `
         "createdOn": "2023-10-10T08:25:18.546Z",
         "decisionOn": "2023-10-10T08:25:18.546Z",
         "description": "Description",
+        "fees": Object {
+          "collectionItemFee": 0n,
+          "legalFee": undefined,
+          "tokensRecordFee": 0n,
+          "valueFee": 0n,
+        },
         "files": Array [],
         "id": UUID {
           "bytes": Array [
@@ -129,6 +141,12 @@ exports[`UserContextualizedLocDetails renders for requester 1`] = `
           "createdOn": "2023-10-10T08:25:18.546Z",
           "decisionOn": "2023-10-10T08:25:18.546Z",
           "description": "Description",
+          "fees": Object {
+            "collectionItemFee": 0n,
+            "legalFee": undefined,
+            "tokensRecordFee": 0n,
+            "valueFee": 0n,
+          },
           "files": Array [],
           "id": UUID {
             "bytes": Array [
@@ -175,6 +193,12 @@ exports[`UserContextualizedLocDetails renders for requester 1`] = `
           "createdOn": "2023-10-10T08:25:18.546Z",
           "decisionOn": "2023-10-10T08:25:18.546Z",
           "description": "Description",
+          "fees": Object {
+            "collectionItemFee": 0n,
+            "legalFee": undefined,
+            "tokensRecordFee": 0n,
+            "valueFee": 0n,
+          },
           "files": Array [],
           "id": UUID {
             "bytes": Array [
@@ -220,6 +244,12 @@ exports[`UserContextualizedLocDetails renders for requester 1`] = `
           "createdOn": "2023-10-10T08:25:18.546Z",
           "decisionOn": "2023-10-10T08:25:18.546Z",
           "description": "Description",
+          "fees": Object {
+            "collectionItemFee": 0n,
+            "legalFee": undefined,
+            "tokensRecordFee": 0n,
+            "valueFee": 0n,
+          },
           "files": Array [],
           "id": UUID {
             "bytes": Array [
@@ -275,6 +305,12 @@ exports[`UserContextualizedLocDetails renders for verified issuer 1`] = `
       "createdOn": "2023-10-10T08:25:18.546Z",
       "decisionOn": "2023-10-10T08:25:18.546Z",
       "description": "Description",
+      "fees": Object {
+        "collectionItemFee": 0n,
+        "legalFee": undefined,
+        "tokensRecordFee": 0n,
+        "valueFee": 0n,
+      },
       "files": Array [],
       "id": UUID {
         "bytes": Array [
@@ -350,6 +386,12 @@ exports[`UserContextualizedLocDetails renders for verified issuer 1`] = `
         "createdOn": "2023-10-10T08:25:18.546Z",
         "decisionOn": "2023-10-10T08:25:18.546Z",
         "description": "Description",
+        "fees": Object {
+          "collectionItemFee": 0n,
+          "legalFee": undefined,
+          "tokensRecordFee": 0n,
+          "valueFee": 0n,
+        },
         "files": Array [],
         "id": UUID {
           "bytes": Array [
@@ -397,6 +439,12 @@ exports[`UserContextualizedLocDetails renders for verified issuer 1`] = `
           "createdOn": "2023-10-10T08:25:18.546Z",
           "decisionOn": "2023-10-10T08:25:18.546Z",
           "description": "Description",
+          "fees": Object {
+            "collectionItemFee": 0n,
+            "legalFee": undefined,
+            "tokensRecordFee": 0n,
+            "valueFee": 0n,
+          },
           "files": Array [],
           "id": UUID {
             "bytes": Array [
@@ -443,6 +491,12 @@ exports[`UserContextualizedLocDetails renders for verified issuer 1`] = `
           "createdOn": "2023-10-10T08:25:18.546Z",
           "decisionOn": "2023-10-10T08:25:18.546Z",
           "description": "Description",
+          "fees": Object {
+            "collectionItemFee": 0n,
+            "legalFee": undefined,
+            "tokensRecordFee": 0n,
+            "valueFee": 0n,
+          },
           "files": Array [],
           "id": UUID {
             "bytes": Array [
@@ -488,6 +542,12 @@ exports[`UserContextualizedLocDetails renders for verified issuer 1`] = `
           "createdOn": "2023-10-10T08:25:18.546Z",
           "decisionOn": "2023-10-10T08:25:18.546Z",
           "description": "Description",
+          "fees": Object {
+            "collectionItemFee": 0n,
+            "legalFee": undefined,
+            "tokensRecordFee": 0n,
+            "valueFee": 0n,
+          },
           "files": Array [],
           "id": UUID {
             "bytes": Array [

diff --git a/src/wallet-user/transaction-protection/LocCreation.tsx b/src/wallet-user/transaction-protection/LocCreation.tsx
@@ -40,6 +40,14 @@ export default function LocCreation(props: Props) {
                 unit: Numbers.NONE,
                 value: "0",
             },
+            collectionItemFee: {
+                unit: Numbers.NONE,
+                value: "0",
+            },
+            tokensRecordFee: {
+                unit: Numbers.NONE,
+                value: "0",
+            },
             legalFee: undefined,
         }
     });
@@ -103,6 +111,8 @@ export default function LocCreation(props: Props) {
                     draft: true,
                     template: backendTemplate(selectedTemplateId),
                     valueFee: Currency.toCanonicalAmount(new Numbers.PrefixedNumber(formValues.valueFee.value, formValues.valueFee.unit)),
+                    collectionItemFee: Currency.toCanonicalAmount(new Numbers.PrefixedNumber(formValues.collectionItemFee.value, formValues.collectionItemFee.unit)),
+                    tokensRecordFee: Currency.toCanonicalAmount(new Numbers.PrefixedNumber(formValues.tokensRecordFee.value, formValues.tokensRecordFee.unit)),
                     legalFee: formValues.legalFee ? Currency.toCanonicalAmount(new Numbers.PrefixedNumber(formValues.legalFee.value, formValues.legalFee.unit)) : undefined,
                 }) as DraftRequest;
             } else {