integrate program version number to ts

crates/client/src/client.rs

@@ -196,6 +196,7 @@ pub async fn sign(
 }
 
 /// Store a program on chain and return it's hash
+#[allow(clippy::too_many_arguments)]
 #[tracing::instrument(
     skip_all,
     fields(
@@ -210,12 +211,14 @@ pub async fn store_program(
     configuration_interface: Vec<u8>,
     auxiliary_data_interface: Vec<u8>,
     oracle_data_pointer: Vec<u8>,
+    version_number: u8,
 ) -> Result<<EntropyConfig as Config>::Hash, ClientError> {
     let set_program_tx = entropy::tx().programs().set_program(
         program,
         configuration_interface,
         auxiliary_data_interface,
         oracle_data_pointer,
+        version_number,
     );
     let in_block =
         submit_transaction_with_pair(api, rpc, deployer_pair, &set_program_tx, None).await?;

crates/client/src/tests.rs

@@ -98,6 +98,7 @@ async fn test_store_and_remove_program() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();
@@ -142,6 +143,7 @@ async fn test_remove_program_reference_counter() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();

crates/test-cli/src/lib.rs

@@ -74,6 +74,8 @@ enum CliCommand {
         /// interface. If no such file exists, it is assumed the program has no configuration
         /// interface.
         programs: Vec<String>,
+        /// Option of version numbers to go with the programs, will default to 0 if None
+        version_numbers: Option<Vec<u8>>,
         /// A name or mnemonic from which to derive a program modification keypair.
         /// This is used to send the register extrinsic so it must be funded
         /// If giving a name it must be preceded with "//", eg: "--mnemonic-option //Alice"
@@ -109,6 +111,8 @@ enum CliCommand {
         /// interface. If no such file exists, it is assumed the program has no configuration
         /// interface.
         programs: Vec<String>,
+        /// Option of version numbers to go with the programs, will default to 0 if None
+        version_numbers: Option<Vec<u8>>,
         /// The mnemonic to use for the call
         #[arg(short, long)]
         mnemonic_option: Option<String>,
@@ -121,6 +125,8 @@ enum CliCommand {
         config_interface_file: Option<PathBuf>,
         /// The path to a file containing the program aux interface (defaults to empty)
         aux_data_interface_file: Option<PathBuf>,
+        /// The version number of the program you compiled with
+        version_number: u8,
         /// The mnemonic to use for the call
         #[arg(short, long)]
         mnemonic_option: Option<String>,
@@ -183,7 +189,7 @@ pub async fn run_command(
     let rpc = get_rpc(&endpoint_addr).await?;
 
     match cli.command {
-        CliCommand::Register { mnemonic_option, programs } => {
+        CliCommand::Register { mnemonic_option, programs, version_numbers } => {
             let mnemonic = if let Some(mnemonic_option) = mnemonic_option {
                 mnemonic_option
             } else {
@@ -196,9 +202,22 @@ pub async fn run_command(
 
             let mut programs_info = vec![];
 
-            for program in programs {
+            for (i, program) in programs.into_iter().enumerate() {
+                let version_number = if let Some(ref version_numbers) = version_numbers {
+                    version_numbers[i]
+                } else {
+                    0u8
+                };
                 programs_info.push(
-                    Program::from_hash_or_filename(&api, &rpc, &program_keypair, program).await?.0,
+                    Program::from_hash_or_filename(
+                        &api,
+                        &rpc,
+                        &program_keypair,
+                        program,
+                        version_number,
+                    )
+                    .await?
+                    .0,
                 );
             }
 
@@ -248,6 +267,7 @@ pub async fn run_command(
             program_file,
             config_interface_file,
             aux_data_interface_file,
+            version_number,
         } => {
             let mnemonic = if let Some(mnemonic_option) = mnemonic_option {
                 mnemonic_option
@@ -284,6 +304,7 @@ pub async fn run_command(
                 config_interface,
                 aux_data_interface,
                 vec![],
+                version_number,
             )
             .await?;
             Ok(format!("Program stored {hash}"))
@@ -305,7 +326,12 @@ pub async fn run_command(
 
             Ok("Program removed".to_string())
         },
-        CliCommand::UpdatePrograms { signature_verifying_key, mnemonic_option, programs } => {
+        CliCommand::UpdatePrograms {
+            signature_verifying_key,
+            mnemonic_option,
+            programs,
+            version_numbers,
+        } => {
             let mnemonic = if let Some(mnemonic_option) = mnemonic_option {
                 mnemonic_option
             } else {
@@ -315,9 +341,23 @@ pub async fn run_command(
             println!("Program account: {}", program_keypair.public());
 
             let mut programs_info = Vec::new();
-            for program in programs {
+
+            for (i, program) in programs.into_iter().enumerate() {
+                let version_number = if let Some(ref version_numbers) = version_numbers {
+                    version_numbers[i]
+                } else {
+                    0u8
+                };
                 programs_info.push(
-                    Program::from_hash_or_filename(&api, &rpc, &program_keypair, program).await?.0,
+                    Program::from_hash_or_filename(
+                        &api,
+                        &rpc,
+                        &program_keypair,
+                        program,
+                        version_number,
+                    )
+                    .await?
+                    .0,
                 );
             }
 
@@ -459,6 +499,7 @@ impl Program {
         rpc: &LegacyRpcMethods<EntropyConfig>,
         keypair: &sr25519::Pair,
         hash_or_filename: String,
+        version_number: u8,
     ) -> anyhow::Result<Self> {
         match hex::decode(hash_or_filename.clone()) {
             Ok(hash) => {
@@ -474,10 +515,12 @@ impl Program {
                         };
                         Ok(Self::new(H256(hash_32), configuration))
                     },
-                    Err(_) => Self::from_file(api, rpc, keypair, hash_or_filename).await,
+                    Err(_) => {
+                        Self::from_file(api, rpc, keypair, hash_or_filename, version_number).await
+                    },
                 }
             },
-            Err(_) => Self::from_file(api, rpc, keypair, hash_or_filename).await,
+            Err(_) => Self::from_file(api, rpc, keypair, hash_or_filename, version_number).await,
         }
     }
 
@@ -488,6 +531,7 @@ impl Program {
         rpc: &LegacyRpcMethods<EntropyConfig>,
         keypair: &sr25519::Pair,
         filename: String,
+        version_number: u8,
     ) -> anyhow::Result<Self> {
         let program_bytecode = fs::read(&filename)?;
 
@@ -526,6 +570,7 @@ impl Program {
             config_description,
             auxiliary_data_schema,
             vec![],
+            version_number,
         )
         .await
         {

crates/threshold-signature-server/src/user/tests.rs

@@ -192,6 +192,7 @@ async fn test_signature_requests_fail_on_different_conditions() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();
@@ -350,6 +351,7 @@ async fn signature_request_with_derived_account_works() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();
@@ -492,6 +494,7 @@ async fn test_request_limit_are_updated_during_signing() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();
@@ -615,6 +618,7 @@ async fn test_fails_to_sign_if_non_signing_group_participants_are_used() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();
@@ -727,6 +731,7 @@ async fn test_program_with_config() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();
@@ -936,6 +941,7 @@ async fn test_compute_hash() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();
@@ -1028,6 +1034,7 @@ async fn test_fail_infinite_program() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();
@@ -1116,6 +1123,7 @@ async fn test_device_key_proxy() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();
@@ -1270,6 +1278,7 @@ async fn test_faucet() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();
@@ -1434,6 +1443,7 @@ async fn test_new_registration_flow() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();

crates/threshold-signature-server/src/validator/tests.rs

@@ -198,6 +198,7 @@ async fn test_reshare() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();

crates/threshold-signature-server/tests/register_and_sign.rs

@@ -64,6 +64,7 @@ async fn integration_test_register_and_sign() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();

crates/threshold-signature-server/tests/sign_eth_tx.rs

@@ -74,6 +74,7 @@ async fn integration_test_sign_eth_tx() {
         vec![],
         vec![],
         vec![],
+        0u8,
     )
     .await
     .unwrap();

pallets/registry/src/benchmarking.rs

@@ -169,6 +169,7 @@ benchmarks! {
             oracle_data_pointer,
             deployer: program_modification_account.clone(),
             ref_counter: 0,
+            version_number: 0,
         },
     );
 
@@ -249,8 +250,8 @@ benchmarks! {
   };  n as usize])
   .unwrap();
   let sig_req_account: T::AccountId = whitelisted_caller();
-    Programs::<T>::insert(program_hash, ProgramInfo {bytecode: program, configuration_schema: configuration_schema.clone(), auxiliary_data_schema: auxiliary_data_schema.clone(), oracle_data_pointer: oracle_data_pointer.clone(), deployer: program_modification_account.clone(), ref_counter: 0});
-    Programs::<T>::insert(new_program_hash, ProgramInfo {bytecode: new_program, configuration_schema, auxiliary_data_schema, oracle_data_pointer, deployer: program_modification_account.clone(), ref_counter: o as u128});
+    Programs::<T>::insert(program_hash, ProgramInfo {bytecode: program, configuration_schema: configuration_schema.clone(), auxiliary_data_schema: auxiliary_data_schema.clone(), oracle_data_pointer: oracle_data_pointer.clone(), deployer: program_modification_account.clone(), ref_counter: 0, version_number: 0});
+    Programs::<T>::insert(new_program_hash, ProgramInfo {bytecode: new_program, configuration_schema, auxiliary_data_schema, oracle_data_pointer, deployer: program_modification_account.clone(), ref_counter: o as u128, version_number: 0});
     let balance = <T as pallet_staking_extension::Config>::Currency::minimum_balance() * 100u32.into();
     let _ = <T as pallet_staking_extension::Config>::Currency::make_free_balance_be(&sig_req_account, balance);
     <Registered<T>>::insert(

pallets/registry/src/tests.rs

@@ -47,6 +47,7 @@ fn setup_programs(
             oracle_data_pointer: empty_program.clone(),
             deployer: alice,
             ref_counter: 0,
+            version_number: 0,
         },
     );
 
@@ -433,6 +434,7 @@ fn it_changes_a_program_instance() {
                 oracle_data_pointer: empty_program.clone(),
                 deployer: 1,
                 ref_counter: 1,
+                version_number: 0,
             },
         );
 
@@ -453,6 +455,7 @@ fn it_changes_a_program_instance() {
                 oracle_data_pointer: empty_program.clone(),
                 deployer: 1,
                 ref_counter: 1,
+                version_number: 0,
             },
         );
 

pallets/transaction-pause/src/tests.rs

@@ -153,6 +153,7 @@ fn paused_transaction_filter_work() {
                 configuration_schema: vec![],
                 auxiliary_data_schema: vec![],
                 oracle_data_pointer: vec![],
+                version_number: 0u8,
             });
         assert!(!PausedTransactionFilter::<Runtime>::contains(BALANCE_TRANSFER));
         assert!(!PausedTransactionFilter::<Runtime>::contains(whitelist_address_call));