Fixup devnet too

Author: xdustinface

dash/src/blockdata/constants.rs

@@ -158,9 +158,9 @@ pub fn genesis_block(network: Network) -> Block {
                     version: block::Version::ONE,
                     prev_blockhash: Hash::all_zeros(),
                     merkle_root,
-                    time: 1598918400,
+                    time: 1417713337,
                     bits: CompactTarget::from_consensus(0x1e0377ae),
-                    nonce: 52613770,
+                    nonce: 1096447,
                 },
                 txdata,
             }

key-wallet/src/account/account_type.rs

@@ -260,10 +260,7 @@ impl AccountType {
                     Network::Dash => {
                         Ok(DerivationPath::from(crate::dip9::IDENTITY_REGISTRATION_PATH_MAINNET))
                     }
-                    Network::Testnet | Network::Regtest => {
-                        Ok(DerivationPath::from(crate::dip9::IDENTITY_REGISTRATION_PATH_TESTNET))
-                    }
-                    _ => Err(crate::error::Error::InvalidNetwork),
+                    _ => Ok(DerivationPath::from(crate::dip9::IDENTITY_REGISTRATION_PATH_TESTNET))
                 }
             }
             Self::IdentityTopUp {
@@ -272,8 +269,7 @@ 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,
-                    _ => return Err(crate::error::Error::InvalidNetwork),
+                    _ => crate::dip9::IDENTITY_TOPUP_PATH_TESTNET,
                 };
                 let mut path = DerivationPath::from(base_path);
                 path.push(
@@ -288,10 +284,7 @@ impl AccountType {
                     Network::Dash => {
                         Ok(DerivationPath::from(crate::dip9::IDENTITY_TOPUP_PATH_MAINNET))
                     }
-                    Network::Testnet | Network::Regtest => {
-                        Ok(DerivationPath::from(crate::dip9::IDENTITY_TOPUP_PATH_TESTNET))
-                    }
-                    _ => Err(crate::error::Error::InvalidNetwork),
+                    _ => Ok(DerivationPath::from(crate::dip9::IDENTITY_TOPUP_PATH_TESTNET))
                 }
             }
             Self::IdentityInvitation => {
@@ -300,10 +293,7 @@ impl AccountType {
                     Network::Dash => {
                         Ok(DerivationPath::from(crate::dip9::IDENTITY_INVITATION_PATH_MAINNET))
                     }
-                    Network::Testnet | Network::Regtest => {
-                        Ok(DerivationPath::from(crate::dip9::IDENTITY_INVITATION_PATH_TESTNET))
-                    }
-                    _ => Err(crate::error::Error::InvalidNetwork),
+                    _ => Ok(DerivationPath::from(crate::dip9::IDENTITY_INVITATION_PATH_TESTNET))
                 }
             }
             Self::ProviderVotingKeys => {
@@ -354,10 +344,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 => {
-                        DerivationPath::from(crate::dip9::DASHPAY_ROOT_PATH_TESTNET)
-                    }
-                    _ => return Err(crate::error::Error::InvalidNetwork),
+                    _ => DerivationPath::from(crate::dip9::DASHPAY_ROOT_PATH_TESTNET)
                 };
                 path.push(ChildNumber::from_hardened_idx(0).map_err(crate::error::Error::Bip32)?);
                 path.push(ChildNumber::Normal256 {
@@ -376,10 +363,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 => {
-                        DerivationPath::from(crate::dip9::DASHPAY_ROOT_PATH_TESTNET)
-                    }
-                    _ => return Err(crate::error::Error::InvalidNetwork),
+                    _ => DerivationPath::from(crate::dip9::DASHPAY_ROOT_PATH_TESTNET)
                 };
                 path.push(ChildNumber::from_hardened_idx(0).map_err(crate::error::Error::Bip32)?);
                 path.push(ChildNumber::Normal256 {

key-wallet/src/derivation.rs

@@ -99,10 +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 => {
-                crate::dip9::DASH_BIP44_PATH_TESTNET
-            }
-            _ => return Err(Error::InvalidNetwork),
+            _ => crate::dip9::DASH_BIP44_PATH_TESTNET
         };
 
         // Convert to DerivationPath and append account index
@@ -118,8 +115,7 @@ 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,
-            _ => return Err(Error::InvalidNetwork),
+            _ => crate::dip9::COINJOIN_PATH_TESTNET,
         };
 
         // Convert to DerivationPath and append account index
@@ -139,10 +135,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 => {
-                crate::dip9::IDENTITY_AUTHENTICATION_PATH_TESTNET
-            }
-            _ => return Err(Error::InvalidNetwork),
+            _ => crate::dip9::IDENTITY_AUTHENTICATION_PATH_TESTNET
         };
 
         // Convert to DerivationPath and append indices