Draft: Added support for the different SecretFormat within the Vault

• Adapted vault items filename to "{address}-{secret_format}" for new entries
• Kept backward compatibility to still read "substrate" vault items from disk (without the SecretFormat in the filename)
• Refactored methods in keys.rs and vault.rs to accommodate for the changes without duplicating code (i.e. for the secret prompts)
• for "vault import" command, kept SecretFormat.Substrate as default so it's not mandatory to give the "-S" parameter

---

Performed manual tests using accounts:

• 5Funkng8dL397H9ZEJ9sXDjFhStCqRYUj1a62ngcrEMy7ivn
  • Identity: Nicolas80
  • Kept as "old" vault entry ~/.local/share/gcli/5Funkng8dL397H9ZEJ9sXDjFhStCqRYUj1a62ngcrEMy7ivn
• 5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6-substrate
  • Identity: Nicolas80-GDev
• 5GhAZBagx87sTGfMppfPPcWhxCKGWE8zDi1oHp7YiKosD9KZ-cesium
  • (old G1v1 for which I moved identity to 5Funkng8dL397H9ZEJ9sXDjFhStCqRYUj1a62ngcrEMy7ivn)
• 5GNadia4kktgt3Zg3QgTKL8Lse78XXMcisnRhkPKA4ombYDm-seed
  • New test account without Identity and created from seed only
• 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY
  • predefined Alice key

Saving the different key types in the vault

gcli vault list
available keys:
5Funkng8dL397H9ZEJ9sXDjFhStCqRYUj1a62ngcrEMy7ivn


gcli vault import --help
Import key from (substrate)mnemonic or other format with interactive prompt

Usage: gcli vault import [OPTIONS]

Options:
  -S, --secret-format <SECRET_FORMAT>  Secret key format (substrate, seed, cesium) [default: substrate]
  -h, --help                           Print help

# Using default "substrate" secret format
gcli vault import
Mnemonic: 
Enter password to protect the key
Password: 
Stored secret for 5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6

gcli vault import -S cesium
Cesium id: 
Cesium password: 
Enter password to protect the key
Password: 
Stored secret for 5GhAZBagx87sTGfMppfPPcWhxCKGWE8zDi1oHp7YiKosD9KZ

gcli vault import -S seed  
Seed: 
Enter password to protect the key
Password: 
Stored secret for 5GNadia4kktgt3Zg3QgTKL8Lse78XXMcisnRhkPKA4ombYDm

# Just for reference, also work for predefined key - but probably not useful
# Using "Alice" as derivation here
gcli vault import -S predefined
Enter derivation path: 
Enter password to protect the key
Password: 
Stored secret for 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY

gcli vault list
available keys:
5Funkng8dL397H9ZEJ9sXDjFhStCqRYUj1a62ngcrEMy7ivn
5GNadia4kktgt3Zg3QgTKL8Lse78XXMcisnRhkPKA4ombYDm-seed
5GhAZBagx87sTGfMppfPPcWhxCKGWE8zDi1oHp7YiKosD9KZ-cesium
5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6-substrate
5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY-predefined

Using the different vaults for transfers

# Using -a to select the source address for all commands
gcli -a 5Funkng8dL397H9ZEJ9sXDjFhStCqRYUj1a62ngcrEMy7ivn account transfer 101 5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6
Enter password to unlock account 5Funkng8dL397H9ZEJ9sXDjFhStCqRYUj1a62ngcrEMy7ivn
Password: 
transaction submitted to the network, waiting 6 seconds...
transfered 1.01 ĞD (5Funkng8dL397H9ZEJ9sXDjFhStCqRYUj1a62ngcrEMy7ivn → 5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6)

gcli -a 5GNadia4kktgt3Zg3QgTKL8Lse78XXMcisnRhkPKA4ombYDm account transfer 101 5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6
Enter password to unlock account 5GNadia4kktgt3Zg3QgTKL8Lse78XXMcisnRhkPKA4ombYDm
Password: 
transaction submitted to the network, waiting 6 seconds...
transfered 1.01 ĞD (5GNadia4kktgt3Zg3QgTKL8Lse78XXMcisnRhkPKA4ombYDm → 5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6)

gcli -a 5GhAZBagx87sTGfMppfPPcWhxCKGWE8zDi1oHp7YiKosD9KZ account transfer 101 5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6
Enter password to unlock account 5GhAZBagx87sTGfMppfPPcWhxCKGWE8zDi1oHp7YiKosD9KZ
Password: 
transaction submitted to the network, waiting 6 seconds...
transfered 1.01 ĞD (5GhAZBagx87sTGfMppfPPcWhxCKGWE8zDi1oHp7YiKosD9KZ → 5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6)

gcli -a 5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6 account transfer 101 5GNadia4kktgt3Zg3QgTKL8Lse78XXMcisnRhkPKA4ombYDm
Enter password to unlock account 5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6
Password: 
transaction submitted to the network, waiting 6 seconds...
transfered 1.01 ĞD (5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6 → 5GNadia4kktgt3Zg3QgTKL8Lse78XXMcisnRhkPKA4ombYDm)

# Using the address of the predefined key actually doesn't request the password (it's not even searching in the vault)
gcli -a 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY account transfer 101 5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6
transaction submitted to the network, waiting 6 seconds...
transfered 1.01 ĞD (5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY → 5HE6gH87fVuGj6akXneNceBtgEiaUZua43TJbVBRQTT77gp6)

---

I'm still new to rust, so don't hesitate to give suggestions

src/commands/cesium.rs

@@ -82,3 +82,96 @@ where
 		.into()
 	}
 }
+
+// Unit tests
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	/// Test which verifies that it's possible to derive a key coming from a cesium v1 id & password
+	///
+	/// Using subkey command with **ed25519** scheme to show we can derive a key from a seed
+	/// and to retrieve expected values.
+	///
+	/// ##### Without derivation (using seed from the test)
+	/// ```
+	/// subkey inspect --scheme ed25519
+	/// URI:
+	/// Secret Key URI `0x2101d2bc68de9ad149c06293bfe489c8608de576c88927aa5439a81be17aae84` is account:
+	///   Network ID:        substrate
+	///   Secret seed:       0x2101d2bc68de9ad149c06293bfe489c8608de576c88927aa5439a81be17aae84
+	///   Public key (hex):  0x697f6bd16ddebf142384e503fd3f3efc39fe5c7be7c693bd98d982403bb6eb74
+	///   Account ID:        0x697f6bd16ddebf142384e503fd3f3efc39fe5c7be7c693bd98d982403bb6eb74
+	///   Public key (SS58): 5ET2jhgJFoNQUpgfdSkdwftK8DKWdqZ1FKm5GKWdPfMWhPr4
+	///   SS58 Address:      5ET2jhgJFoNQUpgfdSkdwftK8DKWdqZ1FKm5GKWdPfMWhPr4
+	/// ```
+	///
+	/// ##### With derivation '//0' (using seed from the test)
+	/// ```
+	/// subkey inspect --scheme ed25519
+	/// URI:
+	/// Secret Key URI `0x2101d2bc68de9ad149c06293bfe489c8608de576c88927aa5439a81be17aae84//0` is account:
+	///   Network ID:        substrate
+	///   Secret seed:       0x916e95359a49c82e3d84269b90551433352c433eb9bb270fb8cb86e8a6c9ec85
+	///   Public key (hex):  0x1658ce32f039dff26d83b5282f611cfed8c71296a311417ef737db4e016194de
+	///   Account ID:        0x1658ce32f039dff26d83b5282f611cfed8c71296a311417ef737db4e016194de
+	///   Public key (SS58): 5Ca1HrNxQ4hiekd92Z99fzhfdSAqPy2rUkLBmwLsgLCjeSQf
+	///   SS58 Address:      5Ca1HrNxQ4hiekd92Z99fzhfdSAqPy2rUkLBmwLsgLCjeSQf
+	/// ```
+	#[test]
+	fn test_cesium_v1_key_derivation() {
+		let cesium_id = "test_cesium_id".to_string();
+		let cesium_pwd = "test_cesium_pwd".to_string();
+
+		let cesium_keypair = pair_from_cesium(cesium_id, cesium_pwd);
+
+		println!(
+			"Nacl keypair: pkey:'0x{}' skey:'0x{}'",
+			hex::encode(cesium_keypair.pkey),
+			hex::encode(cesium_keypair.skey)
+		);
+
+		let cesium_v1_pubkey = bs58::encode(cesium_keypair.pkey).into_string();
+		println!("Cesium v1 Pubkey: '{}'", cesium_v1_pubkey);
+		let cesium_v1_address: AccountId = cesium_keypair.pkey.into();
+		println!("SS58 Address: '{}'", cesium_v1_address);
+
+		//ed25519 seed **seems** to be the first 32 bytes of the secret key from nacl keypair
+		let mut seed: [u8; 32] = [0; 32];
+		seed.copy_from_slice(&cesium_keypair.skey[0..32]);
+		println!();
+		println!("ed25519 seed: '0x{}'", hex::encode(seed));
+
+		let ed25519_pair = sp_core::ed25519::Pair::from_seed(&seed);
+
+		println!();
+		println!(
+			"ed25519 keypair: public:'0x{}' raw_vec:'0x{}'",
+			hex::encode(ed25519_pair.public().0),
+			hex::encode(ed25519_pair.to_raw_vec().as_slice())
+		);
+		let ed25519_address: AccountId = ed25519_pair.public().into();
+		println!("ed25519 keypair: public SS58 Address:'{}'", ed25519_address);
+		assert_eq!(cesium_v1_address, ed25519_address);
+
+		// Tested derivation manually with `subkey` command using adapted suri: `0x2101d2bc68de9ad149c06293bfe489c8608de576c88927aa5439a81be17aae84//0`
+		let expected_ss58_address_derivation_0 =
+			"5Ca1HrNxQ4hiekd92Z99fzhfdSAqPy2rUkLBmwLsgLCjeSQf".to_string();
+
+		let (derived_ed25519_pair, _seed) = ed25519_pair
+			.derive(Some(sp_core::DeriveJunction::hard(0)).into_iter(), None)
+			.unwrap();
+		println!();
+		println!(
+			"ed25519 derived keypair: public:'0x{}' raw_vec:'0x{}'",
+			hex::encode(derived_ed25519_pair.public().0),
+			hex::encode(derived_ed25519_pair.to_raw_vec().as_slice())
+		);
+		let account_id32 = subxt::utils::AccountId32::from(derived_ed25519_pair.public());
+		println!(
+			"ed25519 derived keypair: public SS58 Address:'{}'",
+			account_id32
+		);
+		assert_eq!(expected_ss58_address_derivation_0, account_id32.to_string());
+	}
+}