update genesis file

Author: 0xmovses

Cargo.toml

@@ -87,26 +87,26 @@ ethers-middleware = { version = "=2.0.10", default-features = false }
 # Aptos dependencies
 # We use a forked version so that we can override dependency versions. This is required
 # to be avoid depenedency conflicts with other Sovereign Labs crates.
-aptos-vm = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-sdk = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-consensus-types = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-crypto = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-db = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-api-types = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-types = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-api = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-storage-interface = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-block-executor = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-vm-types = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-vm-logging = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-language-e2e-tests = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-framework = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-config = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-vm-genesis = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-executor = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-executor-types = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-executor-test-helpers = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
-aptos-bitvec = { git = "https://github.com/0xmovses/aptos-core", rev = "bfa7d8f9a6467e4b5c84344c2024f60a306536d4" }
+aptos-vm = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-sdk = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-consensus-types = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-crypto = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-db = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-api-types = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-types = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-api = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-storage-interface = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-block-executor = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-vm-types = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-vm-logging = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-language-e2e-tests = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-framework = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-config = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-vm-genesis = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-executor = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-executor-types = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-executor-test-helpers = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
+aptos-bitvec = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
 
 move-binary-format = { git = "https://github.com/diem/move" }
 move-table-extension = { git = "https://github.com/diem/move" }

protocol-units/sov-modules/sov-aptos-vm/src/genesis.rs

@@ -29,10 +29,9 @@ impl<S: sov_modules_api::Spec> SovAptosVM<S> {
 			validators[0].data.owner_address,
 			validators[0].consensus_key.clone(),
 		);
-		let signer_wrapper = ValidatorSignerWrapper::new(signer);
-		self.validator_signer.set(&serde_json::to_vec(&signer_wrapper)?, working_set);
+		self.validator_signer.set(&serde_json::to_vec(&signer)?, working_set);
 
-		// issue the gnesis transaction
+		// issue the genesis transaction
 		let genesis_txn = Transaction::GenesisTransaction(WriteSetPayload::Direct(genesis));
 		// 1. create the db
 		let path = format!("{}/{}", dirs::home_dir().unwrap().to_str().unwrap(), MOVE_DB_DIR);
@@ -66,7 +65,6 @@ impl<S: sov_modules_api::Spec> SovAptosVM<S> {
 			vec![genesis_block_id],
 			executor.
 		)?;*/
-
 		Ok(())
 	}
 }

protocol-units/sov-modules/sov-aptos-vm/src/lib.rs

@@ -147,8 +147,8 @@ mod experimental {
 				.validator_signer
 				.get(working_set)
 				.ok_or(anyhow::Error::msg("Validator signer is not set."))?;
-
-			todo!()
+			Ok(serde_json::from_slice::<ValidatorSigner>(&serialized_validator_signer)
+				.expect("Failed to deserialize validator signer"))
 		}
 
 		pub(crate) fn get_known_version(