fix(dpp): default constructor returns old version

dashpay · Oct 3, 2024 · 04424bd · 04424bd
1 parent f1eaa15
commit 04424bd
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 14 deletions.
diff --git a/.../state_transition/state_transitions/identity/identity_credit_withdrawal_transition/mod.rs b/.../state_transition/state_transitions/identity/identity_credit_withdrawal_transition/mod.rs
@@ -73,8 +73,10 @@ impl IdentityCreditWithdrawalTransition {
     pub fn default_versioned(platform_version: &PlatformVersion) -> Result<Self, ProtocolError> {
         match platform_version
             .dpp
-            .identity_versions
-            .identity_structure_version
+            .state_transitions
+            .identities
+            .credit_withdrawal
+            .default_constructor
         {
             0 => Ok(IdentityCreditWithdrawalTransition::V0(
                 IdentityCreditWithdrawalTransitionV0::default(),

diff --git a/packages/rs-platform-version/src/version/dpp_versions.rs b/packages/rs-platform-version/src/version/dpp_versions.rs
@@ -27,6 +27,12 @@ pub struct StateTransitionVersions {
 pub struct IdentityTransitionVersions {
     pub max_public_keys_in_creation: u16,
     pub asset_locks: IdentityTransitionAssetLockVersions,
+    pub credit_withdrawal: IdentityCreditWithdrawalTransitionVersions,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct IdentityCreditWithdrawalTransitionVersions {
+    pub default_constructor: FeatureVersion,
 }
 
 #[derive(Clone, Debug, Default)]

diff --git a/packages/rs-platform-version/src/version/v1.rs b/packages/rs-platform-version/src/version/v1.rs
@@ -7,8 +7,9 @@ use crate::version::dpp_versions::{
     DocumentTypeClassMethodVersions, DocumentTypeIndexVersions, DocumentTypeMethodVersions,
     DocumentTypeSchemaVersions, DocumentTypeValidationVersions, DocumentTypeVersions,
     DocumentVersions, DocumentsBatchTransitionValidationVersions, DocumentsBatchTransitionVersions,
-    IdentityKeyTypeMethodVersions, IdentityTransitionAssetLockVersions, IdentityTransitionVersions,
-    IdentityVersions, JsonSchemaValidatorVersions, PublicKeyInCreationMethodVersions,
+    IdentityCreditWithdrawalTransitionVersions, IdentityKeyTypeMethodVersions,
+    IdentityTransitionAssetLockVersions, IdentityTransitionVersions, IdentityVersions,
+    JsonSchemaValidatorVersions, PublicKeyInCreationMethodVersions,
     RecursiveSchemaValidatorVersions, StateTransitionConversionVersions,
     StateTransitionMethodVersions, StateTransitionSerializationVersions, StateTransitionVersions,
     VotingValidationVersions, VotingVersions,
@@ -1182,6 +1183,9 @@ pub const PLATFORM_V1: PlatformVersion = PlatformVersion {
                     validate_asset_lock_transaction_structure: 0,
                     validate_instant_asset_lock_proof_structure: 0,
                 },
+                credit_withdrawal: IdentityCreditWithdrawalTransitionVersions {
+                    default_constructor: 0,
+                },
             },
         },
         contract_versions: ContractVersions {

diff --git a/packages/rs-platform-version/src/version/v2.rs b/packages/rs-platform-version/src/version/v2.rs
@@ -7,8 +7,9 @@ use crate::version::dpp_versions::{
     DocumentTypeClassMethodVersions, DocumentTypeIndexVersions, DocumentTypeMethodVersions,
     DocumentTypeSchemaVersions, DocumentTypeValidationVersions, DocumentTypeVersions,
     DocumentVersions, DocumentsBatchTransitionValidationVersions, DocumentsBatchTransitionVersions,
-    IdentityKeyTypeMethodVersions, IdentityTransitionAssetLockVersions, IdentityTransitionVersions,
-    IdentityVersions, JsonSchemaValidatorVersions, PublicKeyInCreationMethodVersions,
+    IdentityCreditWithdrawalTransitionVersions, IdentityKeyTypeMethodVersions,
+    IdentityTransitionAssetLockVersions, IdentityTransitionVersions, IdentityVersions,
+    JsonSchemaValidatorVersions, PublicKeyInCreationMethodVersions,
     RecursiveSchemaValidatorVersions, StateTransitionConversionVersions,
     StateTransitionMethodVersions, StateTransitionSerializationVersions, StateTransitionVersions,
     VotingValidationVersions, VotingVersions,
@@ -1182,6 +1183,9 @@ pub const PLATFORM_V2: PlatformVersion = PlatformVersion {
                     validate_asset_lock_transaction_structure: 0,
                     validate_instant_asset_lock_proof_structure: 0,
                 },
+                credit_withdrawal: IdentityCreditWithdrawalTransitionVersions {
+                    default_constructor: 0,
+                },
             },
         },
         contract_versions: ContractVersions {

diff --git a/packages/rs-platform-version/src/version/v3.rs b/packages/rs-platform-version/src/version/v3.rs
@@ -7,8 +7,9 @@ use crate::version::dpp_versions::{
     DocumentTypeClassMethodVersions, DocumentTypeIndexVersions, DocumentTypeMethodVersions,
     DocumentTypeSchemaVersions, DocumentTypeValidationVersions, DocumentTypeVersions,
     DocumentVersions, DocumentsBatchTransitionValidationVersions, DocumentsBatchTransitionVersions,
-    IdentityKeyTypeMethodVersions, IdentityTransitionAssetLockVersions, IdentityTransitionVersions,
-    IdentityVersions, JsonSchemaValidatorVersions, PublicKeyInCreationMethodVersions,
+    IdentityCreditWithdrawalTransitionVersions, IdentityKeyTypeMethodVersions,
+    IdentityTransitionAssetLockVersions, IdentityTransitionVersions, IdentityVersions,
+    JsonSchemaValidatorVersions, PublicKeyInCreationMethodVersions,
     RecursiveSchemaValidatorVersions, StateTransitionConversionVersions,
     StateTransitionMethodVersions, StateTransitionSerializationVersions, StateTransitionVersions,
     VotingValidationVersions, VotingVersions,
@@ -1189,6 +1190,9 @@ pub const PLATFORM_V3: PlatformVersion = PlatformVersion {
                     validate_asset_lock_transaction_structure: 0,
                     validate_instant_asset_lock_proof_structure: 0,
                 },
+                credit_withdrawal: IdentityCreditWithdrawalTransitionVersions {
+                    default_constructor: 1,
+                },
             },
         },
         contract_versions: ContractVersions {

diff --git a/packages/rs-platform-version/src/version/v4.rs b/packages/rs-platform-version/src/version/v4.rs
@@ -7,8 +7,9 @@ use crate::version::dpp_versions::{
     DocumentTypeClassMethodVersions, DocumentTypeIndexVersions, DocumentTypeMethodVersions,
     DocumentTypeSchemaVersions, DocumentTypeValidationVersions, DocumentTypeVersions,
     DocumentVersions, DocumentsBatchTransitionValidationVersions, DocumentsBatchTransitionVersions,
-    IdentityKeyTypeMethodVersions, IdentityTransitionAssetLockVersions, IdentityTransitionVersions,
-    IdentityVersions, JsonSchemaValidatorVersions, PublicKeyInCreationMethodVersions,
+    IdentityCreditWithdrawalTransitionVersions, IdentityKeyTypeMethodVersions,
+    IdentityTransitionAssetLockVersions, IdentityTransitionVersions, IdentityVersions,
+    JsonSchemaValidatorVersions, PublicKeyInCreationMethodVersions,
     RecursiveSchemaValidatorVersions, StateTransitionConversionVersions,
     StateTransitionMethodVersions, StateTransitionSerializationVersions, StateTransitionVersions,
     VotingValidationVersions, VotingVersions,
@@ -1184,6 +1185,9 @@ pub const PLATFORM_V4: PlatformVersion = PlatformVersion {
                     validate_asset_lock_transaction_structure: 0,
                     validate_instant_asset_lock_proof_structure: 0,
                 },
+                credit_withdrawal: IdentityCreditWithdrawalTransitionVersions {
+                    default_constructor: 1,
+                },
             },
         },
         contract_versions: ContractVersions {

diff --git a/packages/wasm-dpp/lib/test/fixtures/getIdentityCreditWithdrawalTransitionFixture.js b/packages/wasm-dpp/lib/test/fixtures/getIdentityCreditWithdrawalTransitionFixture.js
@@ -6,7 +6,7 @@ module.exports = function getIdentityCreditWithdrawalTransitionFixture() {
   const privateKey = new PrivateKey('cSBnVM4xvxarwGQuAfQFwqDg9k5tErHUHzgWsEfD4zdwUasvqRVY');
   const address = privateKey.toAddress();
 
-  const stateTransition = new IdentityCreditWithdrawalTransition(1);
+  const stateTransition = new IdentityCreditWithdrawalTransition(3);
   stateTransition.setIdentityId(generateRandomIdentifier());
   // eslint-disable-next-line
   stateTransition.setAmount(BigInt(1000));

diff --git a/...eTransition/IdentityCreditWithdrawalTransition/IdentityCreditWithdrawalTransition.spec.js b/...eTransition/IdentityCreditWithdrawalTransition/IdentityCreditWithdrawalTransition.spec.js
@@ -75,7 +75,7 @@ describe('IdentityCreditWithdrawalTransition', () => {
       rawStateTransition = stateTransition.toObject();
 
       expect(rawStateTransition).to.deep.equal({
-        $version: '0',
+        $version: '1',
         type: StateTransitionTypes.IdentityCreditWithdrawal,
         identityId: stateTransition.getIdentityId().toBuffer(),
         amount: stateTransition.getAmount(),
@@ -92,7 +92,7 @@ describe('IdentityCreditWithdrawalTransition', () => {
       rawStateTransition = stateTransition.toObject({ skipSignature: true });
 
       expect(rawStateTransition).to.deep.equal({
-        $version: '0',
+        $version: '1',
         type: StateTransitionTypes.IdentityCreditWithdrawal,
         identityId: stateTransition.getIdentityId().toBuffer(),
         amount: stateTransition.getAmount(),
@@ -109,7 +109,7 @@ describe('IdentityCreditWithdrawalTransition', () => {
       const jsonStateTransition = stateTransition.toJSON();
 
       expect(jsonStateTransition).to.deep.equal({
-        $version: '0',
+        $version: '1',
         type: StateTransitionTypes.IdentityCreditWithdrawal,
         identityId: stateTransition.getIdentityId().toString(),
         amount: stateTransition.getAmount().toString(),