Merge pull request #1226 from dusk-network/new-genesis

dusk-network · Dec 30, 2023 · 9acc757 · 9acc757
2 parents cbd5c50 + 306b92e
commit 9acc757
Show file tree

Hide file tree

Showing 9 changed files with 146 additions and 142 deletions.
diff --git a/rusk-recovery/assets/dusk.address b/rusk-recovery/assets/dusk.address
@@ -0,0 +1 @@
+68UiBbsJ4PumJyVpS91VbffhKgq9p6QaLC8QCqzgLiKBX71mvCswmeViTHDsBJ3RMwsVcxBSkZ3HbjHAL9qCNxh
diff --git a/rusk-recovery/assets/dusk.cpk b/rusk-recovery/assets/dusk.cpk
diff --git a/rusk-recovery/assets/dusk.psk b/rusk-recovery/assets/dusk.psk
diff --git a/rusk-recovery/assets/faucet.address b/rusk-recovery/assets/faucet.address
@@ -0,0 +1 @@
+4LULsDGr3CkeZcVDSfM9UtNr1Xa9DF7HqCEnfnbsDH2HXkkoCfdQWKpEwKwPF6enrSVoTTfb2bGCB8v2VyHHFoUJ
diff --git a/rusk-recovery/assets/faucet.psk b/rusk-recovery/assets/faucet.psk
diff --git a/rusk-recovery/config/testnet.toml b/rusk-recovery/config/testnet.toml
diff --git a/rusk-recovery/src/state.rs b/rusk-recovery/src/state.rs
@@ -8,7 +8,7 @@ use crate::Theme;
 
 use dusk_bls12_381::BlsScalar;
 use dusk_bls12_381_sign::PublicKey as BlsPublicKey;
-use dusk_bytes::Serializable;
+use dusk_bytes::DeserializableSlice;
 use dusk_jubjub::JubJubScalar;
 use dusk_pki::PublicSpendKey;
 use ff::Field;
@@ -40,13 +40,15 @@ pub const DEFAULT_SNAPSHOT: &str =
 const GENESIS_BLOCK_HEIGHT: u64 = 0;
 
 pub static DUSK_KEY: Lazy<PublicSpendKey> = Lazy::new(|| {
-    let bytes = include_bytes!("../assets/dusk.psk");
-    PublicSpendKey::from_bytes(bytes).expect("faucet should have a valid key")
+    let addr = include_str!("../assets/dusk.address");
+    let bytes = bs58::decode(addr).into_vec().expect("valid hex");
+    PublicSpendKey::from_slice(&bytes).expect("dusk should have a valid key")
 });
 
 pub static FAUCET_KEY: Lazy<PublicSpendKey> = Lazy::new(|| {
-    let bytes = include_bytes!("../assets/faucet.psk");
-    PublicSpendKey::from_bytes(bytes).expect("faucet should have a valid key")
+    let addr = include_str!("../assets/faucet.address");
+    let bytes = bs58::decode(addr).into_vec().expect("valid hex");
+    PublicSpendKey::from_slice(&bytes).expect("faucet should have a valid key")
 });
 
 fn deploy_governance_contract(

diff --git a/rusk/Cargo.toml b/rusk/Cargo.toml
@@ -67,6 +67,9 @@ node = { version = "0.1", path = "../node" }
 dusk-consensus = { version = "0.1.1-rc.3", path = "../consensus" }
 node-data = { version = "0.1", path = "../node-data" }
 
+## Bump to 0.8.7 requires rust 1.71.0 due to `build_hasher_simple_hash_one` feature stabilization
+ahash = "=0.8.6"
+
 ## GraphQL deps
 async-graphql = "5.0"
 

diff --git a/rusk/src/assets/dusk.cpk b/rusk/src/assets/dusk.cpk
@@ -1 +1 @@
-��ND<ngxCq���S��H�c^!�&�^��v'��Ѕxb�^���t��Նm��-#�`�?�κ6����V� �|�P���E:�M�}��a=(v�
+�j�<$m��U]@����$s!ԕ��3ꠅ�EZH��	��Y�'먎�+i!�/6�Y�^�,�2^'�Gs{�x�Rh8�~hڀEY�^t�������
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		68UiBbsJ4PumJyVpS91VbffhKgq9p6QaLC8QCqzgLiKBX71mvCswmeViTHDsBJ3RMwsVcxBSkZ3HbjHAL9qCNxh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		4LULsDGr3CkeZcVDSfM9UtNr1Xa9DF7HqCEnfnbsDH2HXkkoCfdQWKpEwKwPF6enrSVoTTfb2bGCB8v2VyHHFoUJ
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		��ND<ngxCq��S��H�c^!�&�^��v'��Ѕxb�^��t��Նm��-#�`�?�κ6��V� �\|�P��E:�M�}��a=(v�
		�j�<$m��U]@��$s!ԕ��3ꠅ�EZH�� Y�'먎�+i!�/6�Y�^�,�2^'�Gs{�x�Rh8�~hڀEY�^t��