mod - adding certIndex to certificates in txHistory.

Emurgo · Aug 3, 2020 · b71a959 · b71a959
1 parent 297a0e4
commit b71a959
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Transactions/types.ts b/src/Transactions/types.ts
@@ -38,29 +38,35 @@ export type Certificate = StakeRegistration | StakeDeregistration | StakeDelegat
 
 export interface StakeRegistration {
   kind: "StakeRegistration";
+  certIndex: number;
   stakeCredential: string;
 }
 export interface StakeDeregistration{
   kind: "StakeDeregistration";
+  certIndex: number;
   stakeCredential: string;
 }
 export interface StakeDelegation{
   kind: "StakeDelegation";
+  certIndex: number;
   stakeCredential: string;
   poolKeyHash: string;
 }
 export interface PoolRegistration{
   kind: "PoolRegistration";
+  certIndex: number;
   poolParams: PoolParams;
 }
 export interface PoolRetirement{
   kind: "PoolRetirement";
+  certIndex: number;
   poolKeyHash: string;
   epoch: number;
 
 }
 export interface MoveInstantaneousRewardsCert{
   kind: "MoveInstantaneousRewardsCert";
+  certIndex: number;
   pot: "Reserve" | "Treasury";
   rewards: string[];
 }

diff --git a/src/services/transactionHistory.ts b/src/services/transactionHistory.ts
@@ -145,7 +145,11 @@ export const askTransactionHistory = async (
       , txHash: obj.f3}));
     const outputs = row.outAddrValPairs.map( ( obj:any ): TransOutputFrag => ({ address: obj.f1, amount: obj.f2.toString() }));
     const withdrawals : TransOutputFrag[] = row.withdrawals ? row.withdrawals.map( ( obj:any ): TransOutputFrag => ({ address: obj.f1, amount: obj.f2.toString() })) : [];
-    const certificates = row.certificates ? row.certificates.map(rowToCertificate) : [];
+    const certificates = row.certificates !== null
+                        ? row.certificates
+                             .map(rowToCertificate) 
+                             .filter( (i:Certificate|null) => i !== null)
+                        : [];
     const blockFrag : BlockFrag = { number: row.blockNumber
       , hash: row.blockHash.toString("hex")
       , epochNo: row.blockEpochNo
@@ -175,16 +179,19 @@ export const askTransactionHistory = async (
 
 };
 
-const rowToCertificate = (row:any):Certificate => {
+const rowToCertificate = (row:any):Certificate|null => {
   switch(row.jsType){
   case "StakeRegistration":
     return { kind: row.jsType
+      , certIndex: row.certIndex
       , stakeCredential: row.stakeCred };
   case "StakeDeregistration":
     return { kind: row.jsType
+      , certIndex: row.certIndex
       , stakeCredential: row.stakeCred };
   case "StakeDelegation":
     return { kind: row.jsType
+      , certIndex: row.certIndex
       , poolKeyHash: row.poolHashKey
       , stakeCredential: row.stakeCred };
   case "PoolRegistration": {
@@ -213,20 +220,24 @@ const rowToCertificate = (row:any):Certificate => {
           , metadataHash: row.poolParamsMetaDataHash }
     };
     return { kind: row.jsType
+      , certIndex: row.certIndex
       , poolParams: params};
   }
   case "PoolRetirement":
     return { kind: row.jsType
+      , certIndex: row.certIndex
       , poolKeyHash: row.poolHashKey
       , epoch: row.epoch };
   case "MoveInstantaneousRewardsCert":
     return { kind: row.jsType
+      , certIndex: row.certIndex
       , pot: row.mirPot
       , rewards: row.rewards === null
         ? []
         : row.rewards.map( (o:any)=> o.f1) };
   default:
-    throw Error(`Certificate from DB doesn't match any known type: ${row}`);
+    console.log(`Certificate from DB doesn't match any known type: ${row}`); // the app only logs errors.
+    return null
   }
 };