Merge pull request #3775 from input-output-hk/i+j/develop/CO-410/implement-networkmagic

[CO-410] Implement `NetworkMagic` logic

Author: intricate

auxx/src/Command/Proc.hs

@@ -28,7 +28,7 @@ import           Pos.Core (AddrStakeDistribution (..), StakeholderId,
                      addressHash, mkMultiKeyDistr, unsafeGetCoin)
 import           Pos.Core.Common (AddrAttributes (..), AddrSpendingData (..),
                      makeAddress)
-import           Pos.Core.NetworkMagic (NetworkMagic (..))
+import           Pos.Core.NetworkMagic (makeNetworkMagic)
 import           Pos.Crypto (PublicKey, emptyPassphrase, encToPublic,
                      fullPublicKeyF, hashHexF, noPassEncrypt, safeCreatePsk,
                      unsafeCheatingHashCoerce, withSafeSigner)
@@ -105,6 +105,7 @@ createCommandProcs mCoreConfig mTxpConfig hasAuxxMode printAction mDiffusion = r
     let name = "addr" in
     needsCoreConfig name >>= \genesisConfig ->
     needsAuxxMode name >>= \Dict ->
+    let nm = makeNetworkMagic (configProtocolMagic genesisConfig) in
     return CommandProc
     { cpName = name
     , cpArgumentPrepare = map
@@ -115,9 +116,9 @@ createCommandProcs mCoreConfig mTxpConfig hasAuxxMode printAction mDiffusion = r
     , cpExec = \(pk', mDistr) -> do
         pk <- toLeft pk'
         addr <- case mDistr of
-            Nothing -> makePubKeyAddressAuxx fixedNM (configEpochSlots genesisConfig) pk
+            Nothing -> makePubKeyAddressAuxx nm (configEpochSlots genesisConfig) pk
             Just distr -> return $
-                makeAddress (PubKeyASD pk) (AddrAttributes Nothing distr fixedNM)
+                makeAddress (PubKeyASD pk) (AddrAttributes Nothing distr nm)
         return $ ValueAddress addr
     , cpHelp = "address for the specified public key. a stake distribution \
              \ can be specified manually (by default it uses the current epoch \
@@ -136,7 +137,8 @@ createCommandProcs mCoreConfig mTxpConfig hasAuxxMode printAction mDiffusion = r
         sk <- evaluateWHNF (sks !! i) -- WHNF is sufficient to force possible errors
                                       -- from using (!!). I'd use NF but there's no
                                       -- NFData instance for secret keys.
-        addrHD <- deriveHDAddressAuxx fixedNM (configEpochSlots genesisConfig) sk
+        let nm = makeNetworkMagic (configProtocolMagic genesisConfig)
+        addrHD <- deriveHDAddressAuxx nm (configEpochSlots genesisConfig) sk
         return $ ValueAddress addrHD
     , cpHelp = "address of the HD wallet for the specified public key"
     },
@@ -195,13 +197,14 @@ createCommandProcs mCoreConfig mTxpConfig hasAuxxMode printAction mDiffusion = r
     let name = "balance" in
     needsCoreConfig name >>= \genesisConfig ->
     needsAuxxMode name >>= \Dict ->
+    let nm = makeNetworkMagic (configProtocolMagic genesisConfig) in
     return CommandProc
     { cpName = name
     , cpArgumentPrepare = identity
     , cpArgumentConsumer = getArg (tyAddress `tyEither` tyPublicKey `tyEither` tyInt) "addr"
     , cpExec = \addr' -> do
         addr <-
-          either return (makePubKeyAddressAuxx fixedNM $ configEpochSlots genesisConfig) <=<
+          either return (makePubKeyAddressAuxx nm $ configEpochSlots genesisConfig) <=<
           traverse (either return getPublicKeyFromIndex) $ addr'
         balance <- getBalance (configGenesisData genesisConfig) addr
         return $ ValueNumber (fromIntegral . unsafeGetCoin $ balance)
@@ -489,6 +492,7 @@ createCommandProcs mCoreConfig mTxpConfig hasAuxxMode printAction mDiffusion = r
     let name = "listaddr" in
     needsCoreConfig name >>= \genesisConfig ->
     needsAuxxMode name >>= \Dict ->
+    let nm = makeNetworkMagic (configProtocolMagic genesisConfig) in
     return CommandProc
     { cpName = name
     , cpArgumentPrepare = identity
@@ -499,8 +503,8 @@ createCommandProcs mCoreConfig mTxpConfig hasAuxxMode printAction mDiffusion = r
         printAction "Available addresses:"
         for_ (zip [0 :: Int ..] sks) $ \(i, sk) -> do
             let pk = encToPublic sk
-            addr <- makePubKeyAddressAuxx fixedNM epochSlots pk
-            addrHD <- deriveHDAddressAuxx fixedNM epochSlots sk
+            addr <- makePubKeyAddressAuxx nm epochSlots pk
+            addrHD <- deriveHDAddressAuxx nm epochSlots sk
             printAction $
                 sformat ("    #"%int%":   addr:      "%build%"\n"%
                          "          pk:        "%fullPublicKeyF%"\n"%
@@ -509,7 +513,7 @@ createCommandProcs mCoreConfig mTxpConfig hasAuxxMode printAction mDiffusion = r
                     i addr pk (addressHash pk) addrHD
         walletMB <- (^. usWallet) <$> (view userSecret >>= readTVarIO)
         whenJust walletMB $ \wallet -> do
-            addrHD <- deriveHDAddressAuxx fixedNM epochSlots (_wusRootKey wallet)
+            addrHD <- deriveHDAddressAuxx nm epochSlots (_wusRootKey wallet)
             printAction $
                 sformat ("    Wallet address:\n"%
                          "          HD addr:   "%build)
@@ -566,7 +570,3 @@ getPublicKeyFromIndex i = do
     let sk = sks !! i
         pk = encToPublic sk
     evaluateNF pk
-
-
-fixedNM :: NetworkMagic
-fixedNM = NetworkMainOrStage

auxx/src/Command/Tx.hs

@@ -46,7 +46,7 @@ import           Pos.Core (IsBootstrapEraAddr (..), Timestamp (..),
                      deriveFirstHDAddress, makePubKeyAddress, mkCoin)
 import           Pos.Core.Conc (concurrently, currentTime, delay,
                      forConcurrently, modifySharedAtomic, newSharedAtomic)
-import           Pos.Core.NetworkMagic (NetworkMagic (..))
+import           Pos.Core.NetworkMagic (makeNetworkMagic)
 import           Pos.Crypto (EncryptedSecretKey, SecretKey, emptyPassphrase,
                      encToPublic, fakeSigner, hash, safeToPublic, toPublic,
                      withSafeSigners)
@@ -111,13 +111,14 @@ sendToAllGenesis genesisConfig keysToSend diffusion (SendToAllGenesisParams gene
         logInfo $ sformat ("Found "%shown%" keys in the genesis block.") (length keysToSend)
         startAtTxt <- liftIO $ lookupEnv "AUXX_START_AT"
         let startAt = fromMaybe 0 . readMaybe . fromMaybe "" $ startAtTxt :: Int
+        let nm = makeNetworkMagic $ configProtocolMagic genesisConfig
         -- construct a transaction, and add it to the queue
         let addTx secretKey = do
                 let signer = fakeSigner secretKey
                     publicKey = toPublic secretKey
                 -- construct transaction output
                 outAddr <- makePubKeyAddressAuxx
-                    fixedNM
+                    nm
                     (configEpochSlots genesisConfig)
                     publicKey
                 let txOut1 = TxOut {
@@ -234,11 +235,12 @@ send
     -> m ()
 send genesisConfig diffusion idx outputs = do
     skey <- takeSecret
+    let nm = makeNetworkMagic $ configProtocolMagic genesisConfig
     let curPk = encToPublic skey
-    let plainAddresses = map (flip (makePubKeyAddress fixedNM) curPk . IsBootstrapEraAddr) [False, True]
+    let plainAddresses = map (flip (makePubKeyAddress nm) curPk . IsBootstrapEraAddr) [False, True]
     let (hdAddresses, hdSecrets) = unzip $ map
             (\ibea -> fromMaybe (error "send: pass mismatch") $
-                    deriveFirstHDAddress fixedNM (IsBootstrapEraAddr ibea) emptyPassphrase skey) [False, True]
+                    deriveFirstHDAddress nm (IsBootstrapEraAddr ibea) emptyPassphrase skey) [False, True]
     let allAddresses = hdAddresses ++ plainAddresses
     let allSecrets = hdSecrets ++ [skey, skey]
     etx <- withSafeSigners allSecrets (pure emptyPassphrase) $ \signers -> runExceptT @AuxxException $ do
@@ -286,6 +288,3 @@ sendTxsFromFile diffusion txsFile = do
                 (topsortTxAuxes txAuxes)
         let submitOne = submitTxRaw diffusion
         mapM_ submitOne sortedTxAuxes
-
-fixedNM :: NetworkMagic
-fixedNM = NetworkMainOrStage

chain/src/Pos/Chain/Txp/Toil/Logic.hs

@@ -145,8 +145,7 @@ verifyAndApplyTx ::
     -> ExceptT ToilVerFailure UtxoM TxUndo
 verifyAndApplyTx pm adoptedBVD lockedAssets curEpoch verifyVersions tx@(_, txAux) = do
     whenLeft (checkTxAux txAux) (throwError . ToilInconsistentTxAux)
-    let nm = makeNetworkMagic pm
-        ctx = Utxo.VTxContext verifyVersions nm
+    let ctx = Utxo.VTxContext verifyVersions (makeNetworkMagic pm)
     vtur@VerifyTxUtxoRes {..} <- Utxo.verifyTxUtxo pm ctx lockedAssets txAux
     liftEither $ verifyGState adoptedBVD curEpoch txAux vtur
     lift $ applyTxToUtxo' tx

chain/test/Test/Pos/Chain/Txp/Arbitrary.hs

@@ -43,7 +43,7 @@ import           Pos.Core.Attributes (mkAttributes)
 import           Pos.Core.Common (Coin, IsBootstrapEraAddr (..),
                      makePubKeyAddress)
 import           Pos.Core.Merkle (MerkleNode (..), MerkleRoot (..))
-import           Pos.Core.NetworkMagic (NetworkMagic (..))
+import           Pos.Core.NetworkMagic (makeNetworkMagic)
 import           Pos.Crypto (Hash, ProtocolMagic, SecretKey, SignTag (SignTx),
                      hash, sign, toPublic)
 
@@ -156,7 +156,7 @@ buildProperTx pm inputList (inCoin, outCoin) =
     mkWitness fromSk =
         PkWitness (toPublic fromSk) (sign pm SignTx fromSk $ TxSigData newTxHash)
     makeTxOutput s c =
-        TxOut (makePubKeyAddress fixedNM (IsBootstrapEraAddr True) $ toPublic s) c
+        TxOut (makePubKeyAddress (makeNetworkMagic pm) (IsBootstrapEraAddr True) $ toPublic s) c
 
 -- | Well-formed transaction 'Tx'.
 --
@@ -248,6 +248,3 @@ genTxPayload pm = mkTxPayload <$> genTxOutDist pm
 instance Arbitrary TxPayload where
     arbitrary = genTxPayload dummyProtocolMagic
     shrink = genericShrink
-
-fixedNM :: NetworkMagic
-fixedNM = NetworkMainOrStage

chain/test/Test/Pos/Chain/Txp/Example.hs

@@ -58,7 +58,7 @@ exampleTxInUtxo :: TxIn
 exampleTxInUtxo = TxInUtxo exampleHashTx 47 -- TODO: loop here
 
 exampleTxOut :: TxOut
-exampleTxOut = TxOut (makePubKeyAddress fixedNM (IsBootstrapEraAddr True) pkey) (Coin 47)
+exampleTxOut = TxOut (makePubKeyAddress NetworkMainOrStage (IsBootstrapEraAddr True) pkey) (Coin 47)
     where
         Right pkey = PublicKey <$> CC.xpub (getBytes 0 64)
 
@@ -93,6 +93,3 @@ exampleRedeemSignature = redeemSign exampleProtocolMagic SignForTestingOnly rsk
 
 exampleHashTx :: Hash Tx
 exampleHashTx = coerce (hash "golden" :: Hash Text)
-
-fixedNM :: NetworkMagic
-fixedNM = NetworkMainOrStage