added new field on ValidatoConfig in stake.move to have bls key

Entropy-Foundation · Jan 7, 2025 · 3bf72f9 · 3bf72f9
1 parent 1fb062c
commit 3bf72f9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/aptos-move/framework/supra-framework/sources/stake.move b/aptos-move/framework/supra-framework/sources/stake.move
@@ -153,6 +153,7 @@ module supra_framework::stake {
     /// Validator info stored in validator address.
     struct ValidatorConfig has key, copy, store, drop {
         consensus_pubkey: vector<u8>,
+        consensus_bls_pubkey: vector<u8>,
         network_addresses: vector<u8>,
         // to make it compatible with previous definition, remove later
         fullnode_addresses: vector<u8>,
@@ -561,6 +562,7 @@ module supra_framework::stake {
         initialize_owner(owner);
         move_to(owner, ValidatorConfig {
             consensus_pubkey: vector::empty(),
+            consensus_bls_pubkey: vector::empty(),
             network_addresses: vector::empty(),
             fullnode_addresses: vector::empty(),
             validator_index: 0,
@@ -583,16 +585,18 @@ module supra_framework::stake {
     public entry fun initialize_validator(
         account: &signer,
         consensus_pubkey: vector<u8>,
+        consensus_bls_pubkey: vector<u8>,
         network_addresses: vector<u8>,
         fullnode_addresses: vector<u8>,
     ) acquires AllowedValidators {
         // Checks the public key is valid to prevent rogue-key attacks.
         let valid_public_key = ed25519::new_validated_public_key_from_bytes(consensus_pubkey);
         assert!(option::is_some(&valid_public_key), error::invalid_argument(EINVALID_PUBLIC_KEY));
-
+        //DO WE HAVE TO ADD CHECK FOR BLS KEY TOO? I AM NOT SURE.
         initialize_owner(account);
         move_to(account, ValidatorConfig {
             consensus_pubkey,
+            consensus_bls_pubkey,
             network_addresses,
             fullnode_addresses,
             validator_index: 0,
@@ -1900,8 +1904,10 @@ module supra_framework::stake {
             account::create_account_for_test(validator_address);
         };
 
+        let bls_pk_bytes = vector[];
+
         let pk_bytes = ed25519::unvalidated_public_key_to_bytes(public_key);
-        initialize_validator(validator, pk_bytes, vector::empty(), vector::empty());
+        initialize_validator(validator, pk_bytes, bls_pk_bytes,vector::empty(), vector::empty());
 
         if (amount > 0) {
             mint_and_add_stake(validator, amount);
@@ -1931,6 +1937,7 @@ module supra_framework::stake {
                 voting_power: 0,
                 config: ValidatorConfig {
                     consensus_pubkey: ed25519::unvalidated_public_key_to_bytes(pk),
+                    consensus_bls_pubkey: vector[],
                     network_addresses: b"",
                     fullnode_addresses: b"",
                     validator_index: 0,

diff --git a/aptos-move/framework/supra-framework/sources/stake.spec.move b/aptos-move/framework/supra-framework/sources/stake.spec.move
@@ -128,6 +128,7 @@ spec supra_framework::stake {
     spec initialize_validator(
         account: &signer,
         consensus_pubkey: vector<u8>,
+        consensus_bls_pubkey: vector<u8>,
         network_addresses: vector<u8>,
         fullnode_addresses: vector<u8>,
     ){
@@ -149,6 +150,7 @@ spec supra_framework::stake {
         ensures global<OwnerCapability>(post_addr) == OwnerCapability { pool_address: post_addr };
         ensures global<ValidatorConfig>(post_addr) == ValidatorConfig {
             consensus_pubkey,
+            consensus_bls_pubkey,
             network_addresses,
             fullnode_addresses,
             validator_index: 0,
@@ -717,6 +719,7 @@ spec supra_framework::stake {
         let addr = signer::address_of(owner);
         ensures global<ValidatorConfig>(addr) == ValidatorConfig {
             consensus_pubkey: vector::empty(),
+            consensus_bls_pubkey: vector::empty(),
             network_addresses: vector::empty(),
             fullnode_addresses: vector::empty(),
             validator_index: 0,

diff --git a/crates/aptos/src/node/mod.rs b/crates/aptos/src/node/mod.rs
@@ -617,6 +617,7 @@ impl CliCommand<TransactionSummary> for InitializeValidator {
         self.txn_options
             .submit_transaction(aptos_stdlib::stake_initialize_validator(
                 consensus_public_key.to_bytes().to_vec(),
+                vec![],
                 // BCS encode, so that we can hide the original type
                 bcs::to_bytes(&validator_network_addresses)?,
                 bcs::to_bytes(&full_node_network_addresses)?,