checkpoint

Emurgo · Aug 3, 2020 · b082d68 · b082d68
1 parent d93d472
commit b082d68
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 27 deletions.
diff --git a/app/api/ada/lib/state-fetch/remoteFetcher.js b/app/api/ada/lib/state-fetch/remoteFetcher.js
@@ -160,9 +160,6 @@ export class RemoteFetcher implements IFetcher {
               withdrawal.address = Buffer.from(payload).toString('hex');
             } catch (_e) { /* expected not to work for base58 addresses */ }
           }
-          // the format of this will probably change, so best not to parse it
-          // so that changing the backend doesn't break the frontend
-          resp.certificates = [];
         }
         for (const input of resp.inputs) {
           // backend stores inputs as numbers but outputs as strings

diff --git a/app/api/ada/lib/state-fetch/types.js b/app/api/ada/lib/state-fetch/types.js
@@ -65,7 +65,7 @@ export type RemoteTxState = 'Successful' | 'Failed' | 'Pending';
 export type RemoteTransactionShelley = {|
   +ttl?: string,
   +fee: string,
-  +certificates: Array<RemoteCertificate>,
+  +certificates: $ReadOnlyArray<RemoteCertificate>,
   +withdrawals: Array<RemoteWithdrawal>,
   +metadata: null | string,
 |};
@@ -190,24 +190,27 @@ export type RemoteMoveInstantaneousRewardsCert = {|
   +rewards: {| [stake_credential: string]: string /* coin */ |},
 |};
 export type RemoteCertificate = {|
-  +type: typeof ShelleyCertificateTypes.StakeRegistration,
-  ...RemoteStakeRegistrationCert,
-|} | {|
-  +type: typeof ShelleyCertificateTypes.StakeDeregistration,
-  ...RemoteStakeDeregistrationCert,
-|} | {|
-  +type: typeof ShelleyCertificateTypes.StakeDelegation,
-  ...RemoteStakeDelegationCert,
-|} | {|
-  +type: typeof ShelleyCertificateTypes.PoolRegistration,
-  ...RemotePoolRegistrationCert,
-|} | {|
-  +type: typeof ShelleyCertificateTypes.PoolRetirement,
-  ...RemotePoolRetirementCert,
-|} | {|
-  +type: typeof ShelleyCertificateTypes.GenesisKeyDelegation,
-  ...RemoteGenesisKeyDelegationCert,
-|} | {|
-  +type: typeof ShelleyCertificateTypes.MoveInstantaneousRewardsCert,
-  ...RemoteMoveInstantaneousRewardsCert,
+  cert_index: number,
+  ...({|
+    +type: typeof ShelleyCertificateTypes.StakeRegistration,
+    ...RemoteStakeRegistrationCert,
+  |} | {|
+    +type: typeof ShelleyCertificateTypes.StakeDeregistration,
+    ...RemoteStakeDeregistrationCert,
+  |} | {|
+    +type: typeof ShelleyCertificateTypes.StakeDelegation,
+    ...RemoteStakeDelegationCert,
+  |} | {|
+    +type: typeof ShelleyCertificateTypes.PoolRegistration,
+    ...RemotePoolRegistrationCert,
+  |} | {|
+    +type: typeof ShelleyCertificateTypes.PoolRetirement,
+    ...RemotePoolRetirementCert,
+  |} | {|
+    +type: typeof ShelleyCertificateTypes.GenesisKeyDelegation,
+    ...RemoteGenesisKeyDelegationCert,
+  |} | {|
+    +type: typeof ShelleyCertificateTypes.MoveInstantaneousRewardsCert,
+    ...RemoteMoveInstantaneousRewardsCert,
+  |})
 |};
diff --git a/app/api/ada/lib/storage/bridge/updateTransactions.js b/app/api/ada/lib/storage/bridge/updateTransactions.js
@@ -1748,7 +1748,7 @@ async function certificateToDb(
   dbTx: lf$Transaction,
   request: {|
     network: number,
-    certificates: Array<RemoteCertificate>,
+    certificates: $ReadOnlyArray<RemoteCertificate>,
     hashToIds: HashToIdsFunc,
     derivationTables: Map<number, string>,
   |},
@@ -1822,6 +1822,7 @@ async function certificateToDb(
         const addressId = await addressToId(addrBytes);
         result.push((txId: number) => ({
           certificate: {
+            Ordinal: cert.cert_index,
             Kind: RustModule.WalletV4.CertificateKind.StakeRegistration,
             Payload: Buffer.from(certificate.to_bytes()).toString('hex'),
             TransactionId: txId,
@@ -1849,6 +1850,7 @@ async function certificateToDb(
         const addressId = await addressToId(addrBytes);
         result.push((txId: number) => ({
           certificate: {
+            Ordinal: cert.cert_index,
             Kind: RustModule.WalletV4.CertificateKind.StakeDeregistration,
             Payload: Buffer.from(certificate.to_bytes()).toString('hex'),
             TransactionId: txId,
@@ -1906,6 +1908,7 @@ async function certificateToDb(
 
         result.push((txId: number) => ({
           certificate: {
+            Ordinal: cert.cert_index,
             Kind: RustModule.WalletV4.CertificateKind.StakeDelegation,
             Payload: Buffer.from(certificate.to_bytes()).toString('hex'),
             TransactionId: txId,
@@ -2006,6 +2009,7 @@ async function certificateToDb(
 
         result.push((txId: number) => ({
           certificate: {
+            Ordinal: cert.cert_index,
             Kind: RustModule.WalletV4.CertificateKind.PoolRegistration,
             Payload: Buffer.from(certificate.to_bytes()).toString('hex'),
             TransactionId: txId,
@@ -2043,6 +2047,7 @@ async function certificateToDb(
 
         result.push((txId: number) => ({
           certificate: {
+            Ordinal: cert.cert_index,
             Kind: RustModule.WalletV4.CertificateKind.PoolRetirement,
             Payload: Buffer.from(certificate.to_bytes()).toString('hex'),
             TransactionId: txId,
@@ -2070,6 +2075,7 @@ async function certificateToDb(
 
         result.push((txId: number) => ({
           certificate: {
+            Ordinal: cert.cert_index,
             Kind: RustModule.WalletV4.CertificateKind.GenesisKeyDelegation,
             Payload: Buffer.from(certificate.to_bytes()).toString('hex'),
             TransactionId: txId,
@@ -2113,6 +2119,7 @@ async function certificateToDb(
         const certificate = RustModule.WalletV4.MoveInstantaneousRewardsCert.new(certPot);
         result.push((txId: number) => ({
           certificate: {
+            Ordinal: cert.cert_index,
             Kind: RustModule.WalletV4.CertificateKind.MoveInstantaneousRewardsCert,
             Payload: Buffer.from(certificate.to_bytes()).toString('hex'),
             TransactionId: txId,

diff --git a/app/api/ada/lib/storage/database/index.js b/app/api/ada/lib/storage/database/index.js
@@ -135,7 +135,7 @@ const populateAndCreate = async (
   storeType: $Values<typeof schema.DataStoreType>
 ): Promise<lf$Database> => {
   const schemaName = 'yoroi-schema';
-  const schemaVersion = 13;
+  const schemaVersion = 14;
   const schemaBuilder = schema.create(schemaName, schemaVersion);
 
   populatePrimitivesDb(schemaBuilder);
@@ -285,4 +285,12 @@ async function onUpgrade(
       null
     );
   }
+  if (version >= 3 && version <= 13) {
+    await rawDb.addTableColumn(
+      'Certificate',
+      'Ordinal',
+      // recall: certificates weren't supported at this time
+      TransactionType.CardanoByron
+    );
+  }
 }
diff --git a/app/api/ada/lib/storage/database/primitives/api/read.js b/app/api/ada/lib/storage/database/primitives/api/read.js
@@ -969,7 +969,8 @@ export class GetCertificates {
         request.addressIds
       ))
       .orderBy(blockTable[Tables.BlockSchema.properties.SlotNum], lf.Order.DESC)
-      .orderBy(txTable[Tables.TransactionSchema.properties.Ordinal], lf.Order.DESC);
+      .orderBy(txTable[Tables.TransactionSchema.properties.Ordinal], lf.Order.DESC)
+      .orderBy(txTable[Tables.CertificateSchema.properties.Ordinal], lf.Order.DESC);
 
     const queryResult: $ReadOnlyArray<{|
       CertificateAddress: $ReadOnly<CertificateAddressRow>,

diff --git a/app/api/ada/lib/storage/database/primitives/tables.js b/app/api/ada/lib/storage/database/primitives/tables.js
@@ -354,6 +354,7 @@ export type CertificatePart = {|
 
 export type CertificateInsert = {|
   TransactionId: number,
+  Ordinal: number, // transactions can contain multiple certificates in some blockchains
   Kind: CertificateKindType | $Values<CertificateKind>,
   Payload: string,
 |};
@@ -369,6 +370,7 @@ export const CertificateSchema: {|
   properties: {
     CertificateId: 'CertificateId',
     TransactionId: 'TransactionId',
+    Ordinal: 'Ordinal',
     Kind: 'Kind',
     Payload: 'Payload',
   }
@@ -646,6 +648,7 @@ export const populatePrimitivesDb = (schemaBuilder: lf$schema$Builder) => {
   schemaBuilder.createTable(CertificateSchema.name)
     .addColumn(CertificateSchema.properties.CertificateId, Type.INTEGER)
     .addColumn(CertificateSchema.properties.TransactionId, Type.INTEGER)
+    .addColumn(CertificateSchema.properties.Ordinal, Type.INTEGER)
     .addColumn(CertificateSchema.properties.Kind, Type.INTEGER)
     .addColumn(CertificateSchema.properties.Payload, Type.STRING)
     .addPrimaryKey(

diff --git a/app/api/jormungandr/lib/storage/bridge/updateTransactions.js b/app/api/jormungandr/lib/storage/bridge/updateTransactions.js
@@ -1587,6 +1587,7 @@ async function certificateToDb(
 
       return (txId: number) => ({
         certificate: {
+          Ordinal: 0, // only one cert per tx in Jormungandr
           Kind: kind,
           Payload: request.certificate.payloadHex,
           TransactionId: txId,
@@ -1611,6 +1612,7 @@ async function certificateToDb(
       }
       return (txId: number) => ({
         certificate: {
+          Ordinal: 0, // only one cert per tx in Jormungandr
           Kind: kind,
           Payload: request.certificate.payloadHex,
           TransactionId: txId,
@@ -1633,6 +1635,7 @@ async function certificateToDb(
 
       return (txId: number) => ({
         certificate: {
+          Ordinal: 0, // only one cert per tx in Jormungandr
           Kind: kind,
           Payload: request.certificate.payloadHex,
           TransactionId: txId,
@@ -1652,6 +1655,7 @@ async function certificateToDb(
     case RustModule.WalletV3.CertificateKind.PoolRetirement: {
       return (txId: number) => ({
         certificate: {
+          Ordinal: 0, // only one cert per tx in Jormungandr
           Kind: kind,
           Payload: request.certificate.payloadHex,
           TransactionId: txId,
@@ -1663,6 +1667,7 @@ async function certificateToDb(
     case RustModule.WalletV3.CertificateKind.PoolUpdate: {
       return (txId: number) => ({
         certificate: {
+          Ordinal: 0, // only one cert per tx in Jormungandr
           Kind: kind,
           Payload: request.certificate.payloadHex,
           TransactionId: txId,

diff --git a/app/containers/wallet/staking/StakingDashboardPage.stories.js b/app/containers/wallet/staking/StakingDashboardPage.stories.js
@@ -266,6 +266,7 @@ const delegateCert1 = {
     Relation: 0,
   }],
   certificate: {
+    Ordinal: 0,
     CertificateId: 10,
     TransactionId: 14,
     Kind: 0,