@onekeyfe/hd-core 1.0.20-alpha.2 → 1.0.20

package/src/api/cardano/helper/certificate.ts

@@ -9,7 +9,6 @@ import type {
   CardanoPoolMetadata,
   CardanoPoolRelay,
   CardanoPoolOwner,
-  CardanoDRep,
 } from '../../../types/api/cardano';
 import { PROTO } from '../../../constants';
 
@@ -157,37 +156,6 @@ const transformPoolParameters = (
   };
 };
 
-const transformDRep = (dRep: CardanoDRep | undefined): PROTO.CardanoDRep | undefined => {
-  if (!dRep) {
-    return undefined;
-  }
-
-  validateParams(dRep, [
-    { name: 'type', type: 'number', required: true },
-    { name: 'keyHash', type: 'string' },
-    { name: 'scriptHash', type: 'string' },
-  ]);
-
-  if (dRep.type === PROTO.CardanoDRepType.KEY_HASH && !dRep.keyHash) {
-    throw ERRORS.TypedError(
-      HardwareErrorCode.CallMethodInvalidParameter,
-      'key_hash must be supplied for key_hash type'
-    );
-  }
-
-  if (dRep.type === PROTO.CardanoDRepType.SCRIPT_HASH && !dRep.scriptHash) {
-    throw ERRORS.TypedError(
-      HardwareErrorCode.CallMethodInvalidParameter,
-      'script_hash must be supplied for script_hash type'
-    );
-  }
-  return {
-    type: dRep.type,
-    key_hash: dRep.keyHash,
-    script_hash: dRep.scriptHash,
-  };
-};
-
 export const transformCertificate = (
   certificate: CardanoCertificate
 ): CertificateWithPoolOwnersAndRelays => {
@@ -208,25 +176,12 @@ export const transformCertificate = (
     paramsToValidate.push({ name: 'poolParameters', type: 'object', required: true });
   }
 
-  if (
-    certificate.type === PROTO.CardanoCertificateType.STAKE_REGISTRATION_CONWAY ||
-    certificate.type === PROTO.CardanoCertificateType.STAKE_DEREGISTRATION_CONWAY
-  ) {
-    paramsToValidate.push({ name: 'deposit', required: true });
-  }
-
-  if (certificate.type === PROTO.CardanoCertificateType.VOTE_DELEGATION) {
-    paramsToValidate.push({ name: 'dRep', type: 'object', required: true });
-  }
-
   validateParams(certificate, paramsToValidate);
 
   const { poolParameters, poolOwners, poolRelays } = transformPoolParameters(
     certificate.poolParameters
   );
 
-  const dRep = transformDRep(certificate.dRep);
-
   return {
     certificate: {
       type: certificate.type,
@@ -235,8 +190,6 @@ export const transformCertificate = (
       key_hash: certificate.keyHash,
       pool: certificate.pool,
       pool_parameters: poolParameters,
-      deposit: certificate.deposit,
-      drep: dRep,
     },
     poolOwners,
     poolRelays,

package/src/data/messages/messages.json

@@ -345,6 +345,7 @@
     "BenfenAddress": {
       "fields": {
         "address": {
+          "rule": "required",
           "type": "string",
           "id": 1
         }
@@ -2015,18 +2016,7 @@
         "STAKE_REGISTRATION": 0,
         "STAKE_DEREGISTRATION": 1,
         "STAKE_DELEGATION": 2,
-        "STAKE_POOL_REGISTRATION": 3,
-        "STAKE_REGISTRATION_CONWAY": 7,
-        "STAKE_DEREGISTRATION_CONWAY": 8,
-        "VOTE_DELEGATION": 9
-      }
-    },
-    "CardanoDRepType": {
-      "values": {
-        "KEY_HASH": 0,
-        "SCRIPT_HASH": 1,
-        "ABSTAIN": 2,
-        "NO_CONFIDENCE": 3
+        "STAKE_POOL_REGISTRATION": 3
       }
     },
     "CardanoPoolRelayType": {
@@ -2039,10 +2029,10 @@
     "CardanoTxAuxiliaryDataSupplementType": {
       "values": {
         "NONE": 0,
-        "CVOTE_REGISTRATION_SIGNATURE": 1
+        "GOVERNANCE_REGISTRATION_SIGNATURE": 1
       }
     },
-    "CardanoCVoteRegistrationFormat": {
+    "CardanoGovernanceRegistrationFormat": {
       "values": {
         "CIP15": 0,
         "CIP36": 1
@@ -2216,10 +2206,6 @@
           "rule": "required",
           "type": "CardanoDerivationType",
           "id": 6
-        },
-        "chunkify": {
-          "type": "bool",
-          "id": 7
         }
       }
     },
@@ -2375,17 +2361,6 @@
           "options": {
             "default": 0
           }
-        },
-        "chunkify": {
-          "type": "bool",
-          "id": 22
-        },
-        "tag_cbor_sets": {
-          "type": "bool",
-          "id": 23,
-          "options": {
-            "default": false
-          }
         }
       }
     },
@@ -2607,23 +2582,6 @@
         }
       }
     },
-    "CardanoDRep": {
-      "fields": {
-        "type": {
-          "rule": "required",
-          "type": "CardanoDRepType",
-          "id": 1
-        },
-        "key_hash": {
-          "type": "bytes",
-          "id": 2
-        },
-        "script_hash": {
-          "type": "bytes",
-          "id": 3
-        }
-      }
-    },
     "CardanoTxCertificate": {
       "fields": {
         "type": {
@@ -2654,14 +2612,6 @@
         "key_hash": {
           "type": "bytes",
           "id": 6
-        },
-        "deposit": {
-          "type": "uint64",
-          "id": 7
-        },
-        "drep": {
-          "type": "CardanoDRep",
-          "id": 8
         }
       }
     },
@@ -2690,9 +2640,9 @@
         }
       }
     },
-    "CardanoCVoteRegistrationDelegation": {
+    "CardanoGovernanceRegistrationDelegation": {
       "fields": {
-        "vote_public_key": {
+        "voting_public_key": {
           "rule": "required",
           "type": "bytes",
           "id": 1
@@ -2704,9 +2654,9 @@
         }
       }
     },
-    "CardanoCVoteRegistrationParametersType": {
+    "CardanoGovernanceRegistrationParametersType": {
       "fields": {
-        "vote_public_key": {
+        "voting_public_key": {
           "type": "bytes",
           "id": 1
         },
@@ -2718,7 +2668,8 @@
             "packed": false
           }
         },
-        "payment_address_parameters": {
+        "reward_address_parameters": {
+          "rule": "required",
           "type": "CardanoAddressParametersType",
           "id": 3
         },
@@ -2728,7 +2679,7 @@
           "id": 4
         },
         "format": {
-          "type": "CardanoCVoteRegistrationFormat",
+          "type": "CardanoGovernanceRegistrationFormat",
           "id": 5,
           "options": {
             "default": "CIP15"
@@ -2736,23 +2687,19 @@
         },
         "delegations": {
           "rule": "repeated",
-          "type": "CardanoCVoteRegistrationDelegation",
+          "type": "CardanoGovernanceRegistrationDelegation",
           "id": 6
         },
         "voting_purpose": {
           "type": "uint64",
           "id": 7
-        },
-        "payment_address": {
-          "type": "string",
-          "id": 8
         }
       }
     },
     "CardanoTxAuxiliaryData": {
       "fields": {
-        "cvote_registration_parameters": {
-          "type": "CardanoCVoteRegistrationParametersType",
+        "governance_registration_parameters": {
+          "type": "CardanoGovernanceRegistrationParametersType",
           "id": 1
         },
         "hash": {
@@ -2828,7 +2775,7 @@
           "type": "bytes",
           "id": 2
         },
-        "cvote_registration_signature": {
+        "governance_signature": {
           "type": "bytes",
           "id": 3
         }

package/src/types/api/cardano.ts

@@ -1,4 +1,3 @@
-import type { UintType } from '@onekeyfe/hd-transport';
 import type { PROTO } from '../../constants';
 
 export interface CardanoAddressParameters {
@@ -33,12 +32,6 @@ export type AssetGroupWithTokens = {
   tokens: PROTO.CardanoToken[];
 };
 
-export interface CardanoDRep {
-  type: PROTO.CardanoDRepType;
-  keyHash?: string;
-  scriptHash?: string;
-}
-
 export interface CardanoCertificate {
   type: PROTO.CardanoCertificateType;
   path?: string | number[];
@@ -46,8 +39,6 @@ export interface CardanoCertificate {
   poolParameters?: CardanoPoolParameters;
   scriptHash?: string;
   keyHash?: string;
-  deposit?: UintType;
-  dRep?: CardanoDRep;
 }
 
 export type CertificateWithPoolOwnersAndRelays = {
@@ -138,8 +129,8 @@ export interface CardanoReferenceInput {
   prev_index: number;
 }
 
-export interface CardanoCVoteRegistrationDelegation {
-  votePublicKey: string;
+export interface CardanoGovernanceRegistrationDelegation {
+  votingPublicKey: string;
   weight: number;
 }
 
@@ -150,20 +141,19 @@ export interface CardanoCatalystRegistrationParameters {
   nonce: string;
 }
 
-export interface CardanoCVoteRegistrationParameters {
-  votePublicKey?: string;
+export interface CardanoGovernanceRegistrationParameters {
+  votingPublicKey?: string;
   stakingPath: string | number[];
-  paymentAddressParameters: CardanoAddressParameters;
+  rewardAddressParameters: CardanoAddressParameters;
   nonce: string;
-  format?: PROTO.CardanoCVoteRegistrationFormat;
-  delegations?: CardanoCVoteRegistrationDelegation[];
+  format?: PROTO.CardanoGovernanceRegistrationFormat;
+  delegations?: CardanoGovernanceRegistrationDelegation[];
   votingPurpose?: number;
-  paymentAddress?: string;
 }
 
 export interface CardanoAuxiliaryData {
   hash?: string;
-  cVoteRegistrationParameters?: CardanoCVoteRegistrationParameters;
+  governanceRegistrationParameters?: CardanoGovernanceRegistrationParameters;
 }
 
 export interface CardanoSignTransaction {
@@ -188,8 +178,6 @@ export interface CardanoSignTransaction {
   signingMode: PROTO.CardanoTxSigningMode;
   derivationType?: PROTO.CardanoDerivationType;
   includeNetworkId?: boolean;
-  chunkify?: boolean;
-  tagCborSets?: boolean;
 }
 
 export interface CardanoSignedTxWitness {
@@ -202,7 +190,7 @@ export interface CardanoSignedTxWitness {
 export interface CardanoAuxiliaryDataSupplement {
   type: PROTO.CardanoTxAuxiliaryDataSupplementType;
   auxiliaryDataHash: string;
-  cVoteRegistrationSignature?: string;
+  catalystSignature?: string;
 }
 
 export interface CardanoSignedTxData {