Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit a78fcd7

Browse files
authored
Merge pull request #3412 from input-output-hk/ruhatch/CDEC-505
[CDEC-505] Move txp types from core to chain
2 parents 0d7a239 + a44c7b0 commit a78fcd7

File tree

185 files changed

+1125
-817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+1125
-817
lines changed

auxx/src/Command/Proc.hs

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import qualified Data.Map as Map
1515
import Formatting (build, int, sformat, stext, (%))
1616
import qualified Text.JSON.Canonical as CanonicalJSON
1717

18-
import Pos.Chain.Txp (TxpConfiguration)
18+
import Pos.Chain.Txp (TxOut (..), TxpConfiguration)
1919
import Pos.Chain.Update (BlockVersionModifier (..))
2020
import Pos.Client.KeyStorage (addSecretKey, getSecretKeysPlain)
2121
import Pos.Client.Txp.Balances (getBalance)
@@ -27,7 +27,6 @@ import Pos.Core.Common (AddrAttributes (..), AddrSpendingData (..),
2727
makeAddress)
2828
import Pos.Core.Delegation (HeavyDlgIndex (..))
2929
import Pos.Core.Genesis (gsSecretKeys)
30-
import Pos.Core.Txp (TxOut (..))
3130
import Pos.Core.Update (SoftwareVersion (..))
3231
import Pos.Crypto (PublicKey, emptyPassphrase, encToPublic,
3332
fullPublicKeyF, hashHexF, noPassEncrypt, safeCreatePsk,

auxx/src/Command/Rollback.hs

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ import Data.List (genericTake)
1313
import Formatting (build, int, sformat, string, (%))
1414

1515
import Pos.Chain.Block (Blund, mainBlockTxPayload)
16-
import Pos.Chain.Txp (flattenTxPayload)
16+
import Pos.Chain.Txp (TxAux, flattenTxPayload)
1717
import Pos.Core as Core (Config (..), difficultyL, epochIndexL)
1818
import Pos.Core.Chrono (NewestFirst, _NewestFirst)
19-
import Pos.Core.Txp (TxAux)
2019
import Pos.DB.Block (BypassSecurityCheck (..),
2120
ShouldCallBListener (..), rollbackBlocksUnsafe)
2221
import qualified Pos.DB.Block as DB

auxx/src/Command/Tx.hs

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ import System.Environment (lookupEnv)
3333
import System.IO (BufferMode (LineBuffering), hClose, hSetBuffering)
3434
import UnliftIO (MonadUnliftIO)
3535

36-
import Pos.Chain.Txp (topsortTxAuxes)
36+
import Pos.Chain.Txp (TxAux (..), TxIn (TxInUtxo), TxOut (..),
37+
TxOutAux (..), topsortTxAuxes, txaF)
3738
import Pos.Client.KeyStorage (getSecretKeysPlain)
3839
import Pos.Client.Txp.Balances (getOwnUtxoForPk)
3940
import Pos.Client.Txp.Network (prepareMTx, submitTxRaw)
@@ -43,8 +44,6 @@ import Pos.Core as Core (Config (..), IsBootstrapEraAddr (..),
4344
deriveFirstHDAddress, makePubKeyAddress, mkCoin)
4445
import Pos.Core.Conc (concurrently, currentTime, delay,
4546
forConcurrently, modifySharedAtomic, newSharedAtomic)
46-
import Pos.Core.Txp (TxAux (..), TxIn (TxInUtxo), TxOut (..),
47-
TxOutAux (..), txaF)
4847
import Pos.Core.Update (BlockVersionData (..))
4948
import Pos.Crypto (EncryptedSecretKey, SecretKey, emptyPassphrase,
5049
encToPublic, fakeSigner, hash, safeToPublic, toPublic,

auxx/src/Command/TyProjection.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ import Data.Time.Units (Microsecond, TimeUnit, convertUnit,
3636
fromMicroseconds)
3737
import Serokell.Data.Memory.Units (Byte, fromBytes)
3838

39+
import Pos.Chain.Txp (TxOut (..))
3940
import Pos.Chain.Update (ApplicationName (..),
4041
BlockVersionModifier (..), SystemTag (..))
4142
import Pos.Core (AddrStakeDistribution (..), Address, Coin,
4243
CoinPortion, EpochIndex, ScriptVersion, StakeholderId,
4344
mkCoin, unsafeCoinPortionFromDouble, unsafeGetCoin)
44-
import Pos.Core.Txp (TxOut (..))
4545
import Pos.Core.Update (BlockVersion, SoftwareVersion)
4646
import Pos.Crypto (AHash (..), Hash, PublicKey)
4747

auxx/src/Lang/Value.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ import Universum
3636
import Control.Lens (makePrisms)
3737
import Data.Scientific (Scientific)
3838

39+
import Pos.Chain.Txp (TxOut)
3940
import Pos.Chain.Update (BlockVersionData, BlockVersionModifier,
4041
SystemTag)
4142
import Pos.Core (AddrStakeDistribution, Address, CoinPortion,
4243
StakeholderId)
43-
import Pos.Core.Txp (TxOut)
4444
import Pos.Core.Update (BlockVersion, SoftwareVersion)
4545
import Pos.Crypto (AHash, PublicKey)
4646

chain/bench/block-bench.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import Pos.Chain.Block (Body, BodyProof, ConsensusData, ExtraBodyData,
1515
MainBlockchain, _gbBody, _gbExtra, _gbHeader,
1616
_gbhBodyProof, _gbhConsensus, _gbhExtra, _mbDlgPayload,
1717
_mbSscPayload, _mbTxPayload, _mbUpdatePayload)
18+
import Pos.Chain.Txp (TxPayload (..))
1819
import Pos.Core.Delegation (DlgPayload)
1920
import Pos.Core.Ssc (SscPayload)
20-
import Pos.Core.Txp (TxPayload (..))
2121
import Pos.Core.Update (UpdatePayload)
2222
import Pos.Crypto (ProtocolMagic (..))
2323

chain/cardano-sl-chain.cabal

+19-22
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@ library
7070
Pos.Chain.Txp.Toil.Utxo
7171
Pos.Chain.Txp.Toil.Utxo.Functions
7272
Pos.Chain.Txp.Toil.Utxo.Util
73+
Pos.Chain.Txp.Tx
74+
Pos.Chain.Txp.TxAux
75+
Pos.Chain.Txp.TxMsg
76+
Pos.Chain.Txp.TxOutAux
77+
Pos.Chain.Txp.TxPayload
78+
Pos.Chain.Txp.TxProof
79+
Pos.Chain.Txp.TxWitness
80+
Pos.Chain.Txp.Undo
7381

7482
Pos.Chain.Lrc.Fts
7583
Pos.Chain.Lrc.Types
@@ -205,14 +213,19 @@ test-suite test
205213
Test.Pos.Chain.Ssc.Gen
206214
Test.Pos.Chain.Ssc.Json
207215
Test.Pos.Chain.Ssc.Arbitrary
216+
Test.Pos.Chain.Txp.Arbitrary
217+
Test.Pos.Chain.Txp.Arbitrary.Unsafe
218+
Test.Pos.Chain.Txp.Bi
208219
Test.Pos.Chain.Txp.CoreSpec
209220
Test.Pos.Chain.Txp.Gen
210221
Test.Pos.Chain.Txp.Json
222+
Test.Pos.Chain.Txp.Example
211223
Test.Pos.Chain.Txp.Toil.UtxoSpec
212224
Test.Pos.Chain.Update.Arbitrary
213225
Test.Pos.Chain.Update.Arbitrary.Core
214226

215227
build-depends: base
228+
, base16-bytestring
216229
, bytestring
217230
, cardano-crypto
218231
, cardano-sl-binary
@@ -225,6 +238,7 @@ test-suite test
225238
, cardano-sl-util
226239
, cardano-sl-util-test
227240
, containers
241+
, data-default
228242
, fmt
229243
, formatting
230244
, generic-arbitrary
@@ -240,28 +254,8 @@ test-suite test
240254
, unordered-containers
241255
, vector
242256
default-language: Haskell2010
243-
default-extensions: DeriveDataTypeable
244-
DeriveGeneric
245-
GeneralizedNewtypeDeriving
246-
StandaloneDeriving
247-
FlexibleContexts
248-
FlexibleInstances
249-
MultiParamTypeClasses
250-
FunctionalDependencies
251-
DefaultSignatures
252-
NoImplicitPrelude
257+
default-extensions: NoImplicitPrelude
253258
OverloadedStrings
254-
TypeApplications
255-
TupleSections
256-
ViewPatterns
257-
LambdaCase
258-
MultiWayIf
259-
ConstraintKinds
260-
UndecidableInstances
261-
BangPatterns
262-
TemplateHaskell
263-
ScopedTypeVariables
264-
MonadFailDesugaring
265259

266260
ghc-options: -Wall
267261

@@ -276,6 +270,7 @@ benchmark block-bench
276270
Test.Pos.Chain.Block.Arbitrary.Generate
277271
Test.Pos.Chain.Delegation.Arbitrary
278272
Test.Pos.Chain.Ssc.Arbitrary
273+
Test.Pos.Chain.Txp.Arbitrary
279274
Test.Pos.Chain.Update.Arbitrary
280275
Test.Pos.Chain.Update.Arbitrary.Core
281276

@@ -291,12 +286,14 @@ benchmark block-bench
291286
, cardano-sl-core-test
292287
, cardano-sl-crypto-test
293288
, cardano-sl-util-test
289+
, data-default
294290
, deepseq
295291
, formatting
296292
, generic-arbitrary
297293
, random
298294
, text
299295
, universum
300296
, unordered-containers
301-
297+
, vector
302298
default-extensions: NoImplicitPrelude
299+
OverloadedStrings

chain/src/Pos/Chain/Block/BHelpers.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ import Pos.Chain.Block.Union (Block, BlockHeader (..),
3131
MainConsensusData (..), MainToSign (..),
3232
mainBlockEBDataProof)
3333
import Pos.Chain.Ssc (verifySscPayload)
34+
import Pos.Chain.Txp (checkTxPayload)
3435
import Pos.Core as Core (Config (..))
3536
import Pos.Core.Delegation (LightDlgIndices (..), checkDlgPayload)
3637
import Pos.Core.Slotting (SlotId (..))
3738
import Pos.Core.Ssc (checkSscPayload)
38-
import Pos.Core.Txp (checkTxPayload)
3939
import Pos.Core.Update (checkSoftwareVersion, checkUpdatePayload)
4040
import Pos.Crypto (ProtocolMagic, ProxySignature (..), SignTag (..),
4141
checkSig, hash, isSelfSignedPsk, proxyVerify)

chain/src/Pos/Chain/Block/JsonLog.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import Pos.Chain.Block.Blockchain (gbHeader, gbhPrevBlock)
1313
import Pos.Chain.Block.Genesis (genBlockEpoch)
1414
import Pos.Chain.Block.Union (Block, HeaderHash, headerHash,
1515
headerHashF, mainBlockSlot, mainBlockTxPayload)
16+
import Pos.Chain.Txp (txpTxs)
1617
import Pos.Core (SlotCount, SlotId (..), getEpochIndex, getSlotIndex,
1718
mkLocalSlotIndex)
1819
import Pos.Core.JsonLog.LogEvents (JLBlock (..), JLEvent (..))
19-
import Pos.Core.Txp (txpTxs)
2020
import Pos.Crypto (hash, hashHexF)
2121

2222
-- | Return event of created block.

chain/src/Pos/Chain/Block/Main/Types.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ import qualified Formatting.Buildable as Buildable
2222

2323
import Pos.Binary.Class (Bi (..), Cons (..), Field (..),
2424
deriveSimpleBi, encodeListLen, enforceSize)
25+
import Pos.Chain.Txp.TxPayload (TxPayload)
26+
import Pos.Chain.Txp.TxProof (TxProof)
2527
import Pos.Core.Attributes (Attributes, areAttributesKnown)
2628
import Pos.Core.Delegation (DlgPayload)
2729
import Pos.Core.Ssc (SscPayload, SscProof)
28-
import Pos.Core.Txp (TxPayload, TxProof)
2930
import Pos.Core.Update (BlockVersion, SoftwareVersion, UpdatePayload,
3031
UpdateProof)
3132
import Pos.Crypto (Hash)

chain/src/Pos/Chain/Block/Types.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import Pos.Binary.Class (Cons (..), Field (..), deriveSimpleBi)
2222
import Pos.Chain.Block.Slog.Types (SlogUndo (..), buildSlogUndo)
2323
import Pos.Chain.Block.Union (Block, BlockHeader, HasHeaderHash (..))
2424
import Pos.Chain.Delegation (DlgUndo)
25+
import Pos.Chain.Txp (TxpUndo)
2526
import Pos.Chain.Update (USUndo)
2627
import Pos.Core (HasDifficulty (..), SlotCount)
27-
import Pos.Core.Txp (TxpUndo)
2828
import Pos.Util.Util (HasLens (..))
2929

3030
-- | Structure for undo block during rollback

chain/src/Pos/Chain/Block/Union/Types.hs

+4-2
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,15 @@ import Pos.Chain.Block.Genesis.Types (GenesisBody (..),
128128
import Pos.Chain.Block.Main.Types (BlockBodyAttributes,
129129
BlockHeaderAttributes, MainBody (..), MainExtraBodyData,
130130
MainExtraHeaderData, MainProof (..))
131+
import Pos.Chain.Txp.Tx (Tx)
132+
import Pos.Chain.Txp.TxPayload (TxPayload, txpTxs, txpWitnesses)
133+
import Pos.Chain.Txp.TxProof (mkTxProof)
134+
import Pos.Chain.Txp.TxWitness (TxWitness)
131135
import Pos.Core.Common (ChainDifficulty, HasDifficulty (..))
132136
import Pos.Core.Delegation (DlgPayload, ProxySigHeavy, ProxySigLight)
133137
import Pos.Core.Slotting (EpochOrSlot (..), HasEpochIndex (..),
134138
HasEpochOrSlot (..), SlotId (..), slotIdF)
135139
import Pos.Core.Ssc (SscPayload, mkSscProof)
136-
import Pos.Core.Txp (Tx, TxPayload, TxWitness, mkTxProof, txpTxs,
137-
txpWitnesses)
138140
import Pos.Core.Update (BlockVersion, HasBlockVersion (..),
139141
HasSoftwareVersion (..), SoftwareVersion, UpdatePayload,
140142
mkUpdateProof)

chain/src/Pos/Chain/Script.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ import System.IO.Unsafe (unsafePerformIO)
3939
import qualified Utils.Names as PL
4040

4141
import qualified Pos.Binary.Class as Bi
42+
import Pos.Chain.Txp.TxWitness (TxSigData (..))
4243
import Pos.Core.Binary ()
4344
import Pos.Core.Common (Script (..), ScriptVersion)
4445
import Pos.Core.Script ()
45-
import Pos.Core.Txp (TxSigData (..))
4646

4747
{- NOTE
4848

chain/src/Pos/Chain/Script/Examples.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import Serokell.Util.Base16 (base16F)
3636
import Universum
3737

3838
import Pos.Chain.Script (Script, parseRedeemer, parseValidator)
39+
import Pos.Chain.Txp (TxSigData)
3940
import Pos.Core (StakeholderId)
40-
import Pos.Core.Txp (TxSigData)
4141
import Pos.Crypto (SafeSigner, SignTag (SignTx), deterministicKeyGen,
4242
fullPublicKeyHexF, fullSignatureHexF, hashHexF, safeSign,
4343
safeToPublic, signRaw, signTag)

chain/src/Pos/Chain/Txp.hs

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
-- | Txp system reexports.
22

33
module Pos.Chain.Txp
4-
( module Pos.Core.Txp
5-
, module Pos.Chain.Txp.Base
6-
, module Pos.Chain.Txp.Configuration
7-
, module Pos.Chain.Txp.Error
8-
, module Pos.Chain.Txp.Toil
9-
, module Pos.Chain.Txp.Topsort
10-
, module Pos.Chain.Txp.GenesisUtxo
4+
( module X
115
) where
126

13-
import Pos.Chain.Txp.Base
14-
import Pos.Chain.Txp.Configuration
15-
import Pos.Chain.Txp.Error
16-
import Pos.Chain.Txp.GenesisUtxo
17-
import Pos.Chain.Txp.Toil
18-
import Pos.Chain.Txp.Topsort
19-
import Pos.Core.Txp
7+
import Pos.Chain.Txp.Base as X
8+
import Pos.Chain.Txp.Configuration as X
9+
import Pos.Chain.Txp.Error as X
10+
import Pos.Chain.Txp.GenesisUtxo as X
11+
import Pos.Chain.Txp.Toil as X
12+
import Pos.Chain.Txp.Topsort as X
13+
import Pos.Chain.Txp.Tx as X
14+
import Pos.Chain.Txp.TxAux as X
15+
import Pos.Chain.Txp.TxMsg as X
16+
import Pos.Chain.Txp.TxOutAux as X
17+
import Pos.Chain.Txp.TxPayload as X
18+
import Pos.Chain.Txp.TxProof as X
19+
import Pos.Chain.Txp.TxWitness as X
20+
import Pos.Chain.Txp.Undo as X

chain/src/Pos/Chain/Txp/Base.hs

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ import qualified Data.HashSet as HS
1919
import Data.List (zipWith)
2020
import qualified Data.Map.Strict as M
2121

22+
import Pos.Chain.Txp.Tx (TxOut (..))
23+
import Pos.Chain.Txp.TxAux (TxAux (..))
24+
import Pos.Chain.Txp.TxOutAux (TxOutAux (..))
25+
import Pos.Chain.Txp.TxPayload (TxPayload (..), mkTxPayload)
2226
import Pos.Core (AddrStakeDistribution (..), Address (..), Coin,
2327
CoinPortion, StakeholderId, StakesList,
2428
aaStakeDistribution, addrAttributesUnwrapped,
2529
applyCoinPortionDown, coinToInteger, mkCoin, sumCoins,
2630
unsafeAddCoin, unsafeGetCoin, unsafeIntegerToCoin)
2731
import Pos.Core.Genesis (GenesisWStakeholders (..))
28-
import Pos.Core.Txp (TxAux (..), TxOut (..), TxOutAux (..),
29-
TxPayload (..), mkTxPayload)
3032
import Pos.Crypto (hash)
3133
import Pos.Crypto.Random (deterministic, randomNumber)
3234

chain/src/Pos/Chain/Txp/GenesisUtxo.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import qualified Data.HashMap.Strict as HM
1111
import qualified Data.Map.Strict as Map
1212

1313
import Pos.Chain.Txp.Toil (Utxo, utxoToStakes)
14+
import Pos.Chain.Txp.Tx (TxIn (..), TxOut (..))
15+
import Pos.Chain.Txp.TxOutAux (TxOutAux (..))
1416
import Pos.Core (Address, Coin, StakesMap, makeRedeemAddress)
1517
import Pos.Core.Genesis (GenesisData (..), getGenesisAvvmBalances,
1618
getGenesisNonAvvmBalances)
17-
import Pos.Core.Txp (TxIn (..), TxOut (..), TxOutAux (..))
1819
import Pos.Crypto (unsafeHash)
1920

2021

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ import Serokell.Util (listJson)
2121
import Pos.Chain.Block.Union (HeaderHash)
2222
import Pos.Chain.Script (PlutusError)
2323
import Pos.Chain.Txp.Toil.Types (TxFee)
24+
import Pos.Chain.Txp.Tx (TxIn, TxOut (..))
25+
import Pos.Chain.Txp.TxWitness (TxInWitness)
2426
import Pos.Core (Address, ScriptVersion, TxFeePolicy,
2527
addressDetailedF, addressF)
2628
import Pos.Core.Attributes (UnparsedFields)
27-
import Pos.Core.Txp (TxIn, TxInWitness, TxOut (..))
2829
import Pos.Util (DisallowException)
2930

3031
----------------------------------------------------------------------------

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,17 @@ import Pos.Chain.Txp.Toil.Types (TxFee (..))
3232
import Pos.Chain.Txp.Toil.Utxo (VerifyTxUtxoRes (..))
3333
import qualified Pos.Chain.Txp.Toil.Utxo as Utxo
3434
import Pos.Chain.Txp.Topsort (topsortTxs)
35+
import Pos.Chain.Txp.Tx (Tx (..), TxId, TxOut (..), txOutAddress)
36+
import Pos.Chain.Txp.TxAux (TxAux (..), checkTxAux)
37+
import Pos.Chain.Txp.TxOutAux (toaOut)
38+
import Pos.Chain.Txp.Undo (TxUndo, TxpUndo)
3539
import Pos.Core (AddrAttributes (..), AddrStakeDistribution (..),
3640
Address, EpochIndex, addrAttributesUnwrapped,
3741
isRedeemAddress)
3842
import Pos.Core.Common (integerToCoin)
3943
import qualified Pos.Core.Common as Fee (TxFeePolicy (..),
4044
calculateTxSizeLinear)
4145
import Pos.Core.Genesis (GenesisWStakeholders)
42-
import Pos.Core.Txp (Tx (..), TxAux (..), TxId, TxOut (..), TxUndo,
43-
TxpUndo, checkTxAux, toaOut, txOutAddress)
4446
import Pos.Core.Update (BlockVersionData (..), isBootstrapEraBVD)
4547
import Pos.Crypto (ProtocolMagic, WithHash (..), hash)
4648
import Pos.Util (liftEither)

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,11 @@ import Fmt ((+|), (|+))
6161
import Pos.Chain.Txp.Toil.Types (MemPool, StakesView, UndoMap,
6262
UtxoLookup, UtxoModifier, mpLocalTxs, mpSize, svStakes,
6363
svTotal)
64+
import Pos.Chain.Txp.Tx (TxId, TxIn)
65+
import Pos.Chain.Txp.TxAux (TxAux)
66+
import Pos.Chain.Txp.TxOutAux (TxOutAux)
67+
import Pos.Chain.Txp.Undo (TxUndo)
6468
import Pos.Core.Common (Coin, StakeholderId)
65-
import Pos.Core.Txp (TxAux, TxId, TxIn, TxOutAux, TxUndo)
6669
import Pos.Util (type (~>))
6770
import qualified Pos.Util.Modifier as MM
6871
import Pos.Util.Wlog (NamedPureLogger, WithLogger, launchNamedPureLog)

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@ import Serokell.Util.Text (listJson)
1919
import Pos.Chain.Txp.Base (txOutStake)
2020
import Pos.Chain.Txp.Toil.Monad (GlobalToilM, getStake, getTotalStake,
2121
setStake, setTotalStake)
22+
import Pos.Chain.Txp.Tx (Tx (..))
23+
import Pos.Chain.Txp.TxAux (TxAux (..))
24+
import Pos.Chain.Txp.TxOutAux (TxOutAux (..))
25+
import Pos.Chain.Txp.Undo (TxUndo)
2226
import Pos.Core (StakesList, coinToInteger, mkCoin, sumCoins,
2327
unsafeIntegerToCoin)
2428
import Pos.Core.Genesis (GenesisWStakeholders)
25-
import Pos.Core.Txp (Tx (..), TxAux (..), TxOutAux (..), TxUndo)
2629
import Pos.Util.Wlog (logDebug)
2730

2831
-- | Apply transactions to stakes.

0 commit comments

Comments
 (0)