Fixup devnet too

Author: xdustinface

dash/src/blockdata/constants.rs

@@ -156,9 +156,9 @@ pub fn genesis_block(network: Network) -> Block {
                     version: block::Version::ONE,
                     prev_blockhash: Hash::all_zeros(),
                     merkle_root,
-                    time: 1598918400,
-                    bits: CompactTarget::from_consensus(0x1e0377ae),
-                    nonce: 52613770,
+                    time: 1417713337,
+                    bits: CompactTarget::from_consensus(0x207fffff),
+                    nonce: 1096447,
                 },
                 txdata,
             }
@@ -268,12 +268,12 @@ mod test {
             genesis_block.header.merkle_root.to_string(),
             "e0028eb9648db56b1ac77cf090b99048a8007e2bb64b68f092c03c7f56a662c7"
         );
-        assert_eq!(genesis_block.header.time, 1598918400);
-        assert_eq!(genesis_block.header.bits, CompactTarget::from_consensus(0x1e0377ae));
-        assert_eq!(genesis_block.header.nonce, 52613770);
+        assert_eq!(genesis_block.header.time, 1417713337);
+        assert_eq!(genesis_block.header.bits, CompactTarget::from_consensus(0x207fffff));
+        assert_eq!(genesis_block.header.nonce, 1096447);
         assert_eq!(
             genesis_block.header.block_hash().to_string(),
-            "4e5f930c5d73a8792fa681ba8c5eaf74aa63974a5b1f598dd508029aee70167b"
+            "000008ca1832a4baf228eb1553c03d3a2c8e02399550dd6ea8d65cec3ef23d2e"
         );
     }
 

key-wallet/src/account/account_type.rs

@@ -260,7 +260,7 @@ impl AccountType {
                     Network::Dash => {
                         Ok(DerivationPath::from(crate::dip9::IDENTITY_REGISTRATION_PATH_MAINNET))
                     }
-                    Network::Testnet | Network::Regtest => {
+                    Network::Testnet | Network::Devnet | Network::Regtest => {
                         Ok(DerivationPath::from(crate::dip9::IDENTITY_REGISTRATION_PATH_TESTNET))
                     }
                     _ => Err(crate::error::Error::InvalidNetwork),
@@ -272,7 +272,9 @@ impl AccountType {
                 // Base path with registration index - actual key index added when deriving
                 let base_path = match network {
                     Network::Dash => crate::dip9::IDENTITY_TOPUP_PATH_MAINNET,
-                    Network::Testnet | Network::Regtest => crate::dip9::IDENTITY_TOPUP_PATH_TESTNET,
+                    Network::Testnet | Network::Devnet | Network::Regtest => {
+                        crate::dip9::IDENTITY_TOPUP_PATH_TESTNET
+                    }
                     _ => return Err(crate::error::Error::InvalidNetwork),
                 };
                 let mut path = DerivationPath::from(base_path);
@@ -288,7 +290,7 @@ impl AccountType {
                     Network::Dash => {
                         Ok(DerivationPath::from(crate::dip9::IDENTITY_TOPUP_PATH_MAINNET))
                     }
-                    Network::Testnet | Network::Regtest => {
+                    Network::Testnet | Network::Devnet | Network::Regtest => {
                         Ok(DerivationPath::from(crate::dip9::IDENTITY_TOPUP_PATH_TESTNET))
                     }
                     _ => Err(crate::error::Error::InvalidNetwork),
@@ -300,7 +302,7 @@ impl AccountType {
                     Network::Dash => {
                         Ok(DerivationPath::from(crate::dip9::IDENTITY_INVITATION_PATH_MAINNET))
                     }
-                    Network::Testnet | Network::Regtest => {
+                    Network::Testnet | Network::Devnet | Network::Regtest => {
                         Ok(DerivationPath::from(crate::dip9::IDENTITY_INVITATION_PATH_TESTNET))
                     }
                     _ => Err(crate::error::Error::InvalidNetwork),
@@ -354,7 +356,7 @@ impl AccountType {
                 // Base DashPay root + account 0' + user_id/friend_id (non-hardened per DIP-14/DIP-15)
                 let mut path = match network {
                     Network::Dash => DerivationPath::from(crate::dip9::DASHPAY_ROOT_PATH_MAINNET),
-                    Network::Testnet | Network::Regtest => {
+                    Network::Testnet | Network::Devnet | Network::Regtest => {
                         DerivationPath::from(crate::dip9::DASHPAY_ROOT_PATH_TESTNET)
                     }
                     _ => return Err(crate::error::Error::InvalidNetwork),
@@ -376,7 +378,7 @@ impl AccountType {
                 // Base DashPay root + account 0' + friend_id/user_id (non-hardened per DIP-14/DIP-15)
                 let mut path = match network {
                     Network::Dash => DerivationPath::from(crate::dip9::DASHPAY_ROOT_PATH_MAINNET),
-                    Network::Testnet | Network::Regtest => {
+                    Network::Testnet | Network::Devnet | Network::Regtest => {
                         DerivationPath::from(crate::dip9::DASHPAY_ROOT_PATH_TESTNET)
                     }
                     _ => return Err(crate::error::Error::InvalidNetwork),

key-wallet/src/derivation.rs

@@ -99,7 +99,7 @@ impl HDWallet {
     pub fn bip44_account(&self, account: u32) -> Result<ExtendedPrivKey> {
         let path = match self.master_key.network {
             crate::Network::Dash => crate::dip9::DASH_BIP44_PATH_MAINNET,
-            crate::Network::Testnet | crate::Network::Regtest => {
+            Network::Testnet | Network::Devnet | Network::Regtest => {
                 crate::dip9::DASH_BIP44_PATH_TESTNET
             }
             _ => return Err(Error::InvalidNetwork),
@@ -118,7 +118,9 @@ impl HDWallet {
     pub fn coinjoin_account(&self, account: u32) -> Result<ExtendedPrivKey> {
         let path = match self.master_key.network {
             crate::Network::Dash => crate::dip9::COINJOIN_PATH_MAINNET,
-            crate::Network::Testnet | crate::Network::Regtest => crate::dip9::COINJOIN_PATH_TESTNET,
+            Network::Testnet | Network::Devnet | Network::Regtest => {
+                crate::dip9::COINJOIN_PATH_TESTNET
+            }
             _ => return Err(Error::InvalidNetwork),
         };
 
@@ -139,7 +141,7 @@ impl HDWallet {
     ) -> Result<ExtendedPrivKey> {
         let path = match self.master_key.network {
             crate::Network::Dash => crate::dip9::IDENTITY_AUTHENTICATION_PATH_MAINNET,
-            crate::Network::Testnet | crate::Network::Regtest => {
+            Network::Testnet | Network::Devnet | Network::Regtest => {
                 crate::dip9::IDENTITY_AUTHENTICATION_PATH_TESTNET
             }
             _ => return Err(Error::InvalidNetwork),