Skip to content

Commit a798881

Browse files
tochicoolProofOfKeags
tochicool
authored and
ProofOfKeags
committed
Format with fourmolu
1 parent 32c2fc7 commit a798881

Some content is hidden

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

50 files changed

+205
-197
lines changed

‎scripts/PsbtSignTest.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module Main (main) where
22

3+
import Bitcoin (PartiallySignedTransaction, SecKey)
4+
import qualified Bitcoin as H
35
import qualified Data.ByteString as BS
46
import Data.Maybe (fromMaybe)
57
import qualified Data.Serialize as S
68
import Data.Text (pack)
7-
import Bitcoin (PartiallySignedTransaction, SecKey)
8-
import qualified Bitcoin as H
99
import System.Environment (getArgs)
1010

1111

‎src/Bitcoin.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ import Bitcoin.Network as Network
2727
import Bitcoin.Script as Script
2828
import Bitcoin.Transaction as Transaction
2929
import Bitcoin.Util as Util
30+

‎src/Bitcoin/Address.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ module Bitcoin.Address (
4646
module Bitcoin.Address.Bech32,
4747
) where
4848

49+
import Bitcoin.Address.Base58
50+
import Bitcoin.Address.Bech32
51+
import Bitcoin.Crypto
52+
import Bitcoin.Data
53+
import Bitcoin.Keys.Common
54+
import Bitcoin.Script
55+
import Bitcoin.Util
4956
import Control.Applicative
5057
import Control.Arrow (second)
5158
import Control.DeepSeq
@@ -66,13 +73,6 @@ import Data.Text (Text)
6673
import qualified Data.Text as T
6774
import Data.Word (Word8)
6875
import GHC.Generics (Generic)
69-
import Bitcoin.Address.Base58
70-
import Bitcoin.Address.Bech32
71-
import Bitcoin.Crypto
72-
import Bitcoin.Data
73-
import Bitcoin.Keys.Common
74-
import Bitcoin.Script
75-
import Bitcoin.Util
7676

7777

7878
-- | Address format for Bitcoin

‎src/Bitcoin/Address/Base58.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ module Bitcoin.Address.Base58 (
1414
decodeBase58Check,
1515
) where
1616

17+
import Bitcoin.Crypto.Hash
18+
import Bitcoin.Util
1719
import Control.Monad
1820
import Data.Array
1921
import Data.ByteString (ByteString)
@@ -28,8 +30,6 @@ import Data.String.Conversions (cs)
2830
import Data.Text (Text)
2931
import qualified Data.Text as T
3032
import Data.Word
31-
import Bitcoin.Crypto.Hash
32-
import Bitcoin.Util
3333
import Numeric (readInt, showIntAtBase)
3434

3535

‎src/Bitcoin/Block.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ module Bitcoin.Block (
1212
import Bitcoin.Block.Common
1313
import Bitcoin.Block.Headers
1414
import Bitcoin.Block.Merkle
15+

‎src/Bitcoin/Block/Common.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ module Bitcoin.Block.Common (
2626
encodeCompact,
2727
) where
2828

29+
import Bitcoin.Crypto.Hash
30+
import Bitcoin.Network.Common
31+
import Bitcoin.Transaction.Common
32+
import Bitcoin.Util
2933
import Control.DeepSeq
3034
import Control.Monad (forM_, liftM2, mzero, replicateM, (<=<))
3135
import Data.Aeson (
@@ -66,10 +70,6 @@ import Data.String.Conversions (cs)
6670
import Data.Text (Text)
6771
import Data.Word (Word32)
6872
import GHC.Generics (Generic)
69-
import Bitcoin.Crypto.Hash
70-
import Bitcoin.Network.Common
71-
import Bitcoin.Transaction.Common
72-
import Bitcoin.Util
7373
import qualified Text.Read as R
7474

7575

‎src/Bitcoin/Block/Headers.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ module Bitcoin.Block.Headers (
6060
lastSmallerOrEqual,
6161
) where
6262

63+
import Bitcoin.Block.Common
64+
import Bitcoin.Crypto
65+
import Bitcoin.Data
66+
import Bitcoin.Transaction.Genesis
67+
import Bitcoin.Util
6368
import Control.Applicative ((<|>))
6469
import Control.DeepSeq
6570
import Control.Monad (guard, mzero, unless, when)
@@ -97,11 +102,6 @@ import Data.Serialize (Serialize (..))
97102
import Data.Typeable (Typeable)
98103
import Data.Word (Word32, Word64)
99104
import GHC.Generics (Generic)
100-
import Bitcoin.Block.Common
101-
import Bitcoin.Crypto
102-
import Bitcoin.Data
103-
import Bitcoin.Transaction.Genesis
104-
import Bitcoin.Util
105105

106106

107107
-- | Short version of the block hash. Uses the good end of the hash (the part

‎src/Bitcoin/Block/Merkle.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ module Bitcoin.Block.Merkle (
2929
boolsToWord8,
3030
) where
3131

32+
import Bitcoin.Block.Common
33+
import Bitcoin.Crypto.Hash
34+
import Bitcoin.Data
35+
import Bitcoin.Network.Common
36+
import Bitcoin.Transaction.Common
3237
import Control.DeepSeq
3338
import Control.Monad (forM_, replicateM, when)
3439
import Data.Binary (Binary (..))
@@ -43,11 +48,6 @@ import Data.Maybe
4348
import Data.Serialize (Serialize (..))
4449
import Data.Word (Word32, Word8)
4550
import GHC.Generics
46-
import Bitcoin.Block.Common
47-
import Bitcoin.Crypto.Hash
48-
import Bitcoin.Data
49-
import Bitcoin.Network.Common
50-
import Bitcoin.Transaction.Common
5151

5252

5353
-- | Hash of the block's Merkle root.

‎src/Bitcoin/Constants.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ module Bitcoin.Constants (
1717
netByName,
1818
) where
1919

20+
import Bitcoin.Block
21+
import Bitcoin.Data
22+
import Bitcoin.Network.Common
23+
import Bitcoin.Transaction
2024
import Control.DeepSeq
2125
import Data.Binary (Binary (..))
2226
import Data.ByteString (ByteString)
@@ -30,10 +34,6 @@ import Data.String
3034
import Data.Text (Text)
3135
import Data.Word (Word32, Word64, Word8)
3236
import GHC.Generics (Generic)
33-
import Bitcoin.Block
34-
import Bitcoin.Data
35-
import Bitcoin.Network.Common
36-
import Bitcoin.Transaction
3737
import Text.Read
3838

3939

‎src/Bitcoin/Crypto.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ module Bitcoin.Crypto (
99
module Secp256k1,
1010
) where
1111

12-
import Crypto.Secp256k1 as Secp256k1
1312
import Bitcoin.Crypto.Hash as Hash
1413
import Bitcoin.Crypto.Signature as Signature
14+
import Crypto.Secp256k1 as Secp256k1
15+

‎src/Bitcoin/Crypto/Signature.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ module Bitcoin.Crypto.Signature (
1717
exportSig,
1818
) where
1919

20+
import Bitcoin.Crypto.Hash
2021
import Control.Monad (guard, unless, when)
2122
import Crypto.Secp256k1
2223
import Data.Binary (Binary (..))
@@ -27,7 +28,6 @@ import Data.Bytes.Put
2728
import Data.Bytes.Serial
2829
import Data.Maybe (fromMaybe, isNothing)
2930
import Data.Serialize (Serialize (..))
30-
import Bitcoin.Crypto.Hash
3131
import Numeric (showHex)
3232

3333

‎src/Bitcoin/Data.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module Bitcoin.Data (
55
Network (..),
66
) where
77

8+
import Bitcoin.Block.Common
89
import Control.DeepSeq
910
import Data.Binary (Binary (..))
1011
import Data.ByteString (ByteString)
@@ -17,7 +18,6 @@ import Data.String
1718
import Data.Text (Text)
1819
import Data.Word (Word32, Word64, Word8)
1920
import GHC.Generics (Generic)
20-
import Bitcoin.Block.Common
2121
import Text.Read
2222

2323

‎src/Bitcoin/Keys.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ module Bitcoin.Keys (
1313
import Bitcoin.Keys.Common
1414
import Bitcoin.Keys.Extended
1515
import Bitcoin.Keys.Mnemonic
16+

‎src/Bitcoin/Keys/Common.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ module Bitcoin.Keys.Common (
3131
toWif,
3232
) where
3333

34+
import Bitcoin.Address.Base58
35+
import Bitcoin.Crypto.Hash
36+
import Bitcoin.Data
37+
import Bitcoin.Util
3438
import Control.DeepSeq
3539
import Control.Monad (guard, mzero, (<=<))
3640
import Crypto.Secp256k1
@@ -55,10 +59,6 @@ import Data.Serialize (Serialize (..))
5559
import Data.String (IsString, fromString)
5660
import Data.String.Conversions (cs)
5761
import GHC.Generics (Generic)
58-
import Bitcoin.Address.Base58
59-
import Bitcoin.Crypto.Hash
60-
import Bitcoin.Data
61-
import Bitcoin.Util
6262

6363

6464
-- | Elliptic curve public key type with expected serialized compression flag.

‎src/Bitcoin/Keys/Extended.hs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,17 @@ module Bitcoin.Keys.Extended (
100100
concatBip32Segments,
101101
) where
102102

103+
import Bitcoin.Address
104+
import Bitcoin.Crypto.Hash
105+
import Bitcoin.Data
106+
import Bitcoin.Keys.Common
107+
import Bitcoin.Keys.Extended.Internal (
108+
Fingerprint (..),
109+
fingerprintToText,
110+
textToFingerprint,
111+
)
112+
import Bitcoin.Script
113+
import Bitcoin.Util
103114
import Control.Applicative
104115
import Control.DeepSeq
105116
import Control.Exception (Exception, throw)
@@ -135,17 +146,6 @@ import qualified Data.Text as Text
135146
import Data.Typeable (Typeable)
136147
import Data.Word (Word32, Word8)
137148
import GHC.Generics (Generic)
138-
import Bitcoin.Address
139-
import Bitcoin.Crypto.Hash
140-
import Bitcoin.Data
141-
import Bitcoin.Keys.Common
142-
import Bitcoin.Keys.Extended.Internal (
143-
Fingerprint (..),
144-
fingerprintToText,
145-
textToFingerprint,
146-
)
147-
import Bitcoin.Script
148-
import Bitcoin.Util
149149
import Text.Read as R
150150
import Text.Read.Lex
151151

‎src/Bitcoin/Keys/Extended/Internal.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module Bitcoin.Keys.Extended.Internal (
77
textToFingerprint,
88
) where
99

10+
import Bitcoin.Util (decodeHex, encodeHex)
1011
import Control.DeepSeq (NFData)
1112
import Control.Monad ((>=>))
1213
import Data.Aeson (
@@ -31,7 +32,6 @@ import qualified Data.Text as Text
3132
import Data.Typeable (Typeable)
3233
import Data.Word (Word32)
3334
import GHC.Generics (Generic)
34-
import Bitcoin.Util (decodeHex, encodeHex)
3535
import Text.Read (readEither, readPrec)
3636

3737

‎src/Bitcoin/Keys/Mnemonic.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ module Bitcoin.Keys.Mnemonic (
1616
mnemonicToSeed,
1717
) where
1818

19+
import Bitcoin.Util
1920
import Control.Monad (when)
2021
import Crypto.Hash (SHA256 (..), hashWith)
2122
import Crypto.KDF.PBKDF2 (Parameters (..), fastPBKDF2_SHA512)
@@ -32,7 +33,6 @@ import qualified Data.Text as T
3233
import qualified Data.Text.Encoding as E
3334
import Data.Vector (Vector, (!))
3435
import qualified Data.Vector as V
35-
import Bitcoin.Util
3636

3737

3838
-- | Random data used to create a mnemonic sentence. Use a good entropy source.

‎src/Bitcoin/Network.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ module Bitcoin.Network (
1414
import Bitcoin.Network.Bloom as Bloom
1515
import Bitcoin.Network.Common as Common
1616
import Bitcoin.Network.Message as Message
17+

‎src/Bitcoin/Network/Bloom.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ module Bitcoin.Network.Bloom (
2525
bloomRelevantUpdate,
2626
) where
2727

28+
import Bitcoin.Network.Common
29+
import Bitcoin.Script.Standard
30+
import Bitcoin.Transaction.Common
2831
import Control.DeepSeq
2932
import Control.Monad (forM_, replicateM)
3033
import Data.Binary (Binary (..))
@@ -41,9 +44,6 @@ import qualified Data.Sequence as S
4144
import Data.Serialize (Serialize (..))
4245
import Data.Word
4346
import GHC.Generics (Generic)
44-
import Bitcoin.Network.Common
45-
import Bitcoin.Script.Standard
46-
import Bitcoin.Transaction.Common
4747

4848

4949
-- | 20,000 items with fp rate < 0.1% or 10,000 items and <0.0001%

‎src/Bitcoin/Network/Common.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ module Bitcoin.Network.Common (
4141
putVarInt,
4242
) where
4343

44+
import Bitcoin.Crypto.Hash
4445
import Control.DeepSeq
4546
import Control.Monad (forM_, liftM2, replicateM, unless)
4647
import Data.Binary (Binary (..))
@@ -56,7 +57,6 @@ import Data.String
5657
import Data.String.Conversions (cs)
5758
import Data.Word (Word32, Word64)
5859
import GHC.Generics (Generic)
59-
import Bitcoin.Crypto.Hash
6060
import Network.Socket (SockAddr (..))
6161
import Text.Read as R
6262

‎src/Bitcoin/Network/Message.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ module Bitcoin.Network.Message (
1515
getMessage,
1616
) where
1717

18+
import Bitcoin.Block.Common
19+
import Bitcoin.Block.Merkle
20+
import Bitcoin.Crypto.Hash
21+
import Bitcoin.Data
22+
import Bitcoin.Network.Bloom
23+
import Bitcoin.Network.Common
24+
import Bitcoin.Transaction.Common
1825
import Control.DeepSeq
1926
import Control.Monad (unless)
2027
import Data.Binary (Binary (..))
@@ -26,13 +33,6 @@ import Data.Bytes.Serial
2633
import Data.Serialize (Serialize (..))
2734
import Data.Word (Word32)
2835
import GHC.Generics (Generic)
29-
import Bitcoin.Block.Common
30-
import Bitcoin.Block.Merkle
31-
import Bitcoin.Crypto.Hash
32-
import Bitcoin.Data
33-
import Bitcoin.Network.Bloom
34-
import Bitcoin.Network.Common
35-
import Bitcoin.Transaction.Common
3636

3737

3838
-- | Data type representing the header of a 'Message'. All messages sent between

‎src/Bitcoin/Script.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ module Bitcoin.Script (
1414
import Bitcoin.Script.Common as Common
1515
import Bitcoin.Script.SigHash as SigHash
1616
import Bitcoin.Script.Standard as Standard
17+

‎src/Bitcoin/Script/Common.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ data ScriptOp
207207
| OP_NOP8
208208
| OP_NOP9
209209
| OP_NOP10
210-
-- BIP 342 (Tapscript)
211-
| OP_CHECKSIGADD
210+
| -- BIP 342 (Tapscript)
211+
OP_CHECKSIGADD
212212
| -- Other
213213
OP_PUBKEYHASH
214214
| OP_PUBKEY

0 commit comments

Comments
 (0)