Skip to content

Commit b23eb8c

Browse files
tochicoolProofOfKeags
authored andcommitted
Rename modules to Bitcoin.*
This also removes other references to Haskoin from the library.
1 parent 77fc6ae commit b23eb8c

Some content is hidden

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

68 files changed

+482
-489
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Haskoin Core
1+
# Bitcoin
22

3-
Haskoin Core is a library of Bitcoin functions written in Haskell featuring:
3+
Bitcoin is a library of Bitcoin functions written in Haskell featuring:
44

55
- Hashing functions (SHA-256, RIPEMD-160)
66
- Base58 support

bitcoin.cabal

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -43,52 +43,52 @@ source-repository head
4343

4444
library
4545
exposed-modules:
46-
Haskoin
47-
Haskoin.Address
48-
Haskoin.Address.Base58
49-
Haskoin.Address.Bech32
50-
Haskoin.Block
51-
Haskoin.Block.Common
52-
Haskoin.Block.Headers
53-
Haskoin.Block.Merkle
54-
Haskoin.Constants
55-
Haskoin.Crypto
56-
Haskoin.Crypto.Hash
57-
Haskoin.Crypto.Signature
58-
Haskoin.Data
59-
Haskoin.Keys
60-
Haskoin.Keys.Common
61-
Haskoin.Keys.Extended
62-
Haskoin.Keys.Mnemonic
63-
Haskoin.Network
64-
Haskoin.Network.Bloom
65-
Haskoin.Network.Common
66-
Haskoin.Network.Message
67-
Haskoin.Script
68-
Haskoin.Script.Common
69-
Haskoin.Script.SigHash
70-
Haskoin.Script.Standard
71-
Haskoin.Transaction
72-
Haskoin.Transaction.Builder
73-
Haskoin.Transaction.Builder.Sign
74-
Haskoin.Transaction.Common
75-
Haskoin.Transaction.Genesis
76-
Haskoin.Transaction.Partial
77-
Haskoin.Transaction.Segwit
78-
Haskoin.Transaction.Taproot
79-
Haskoin.Util
80-
Haskoin.Util.Arbitrary
81-
Haskoin.Util.Arbitrary.Address
82-
Haskoin.Util.Arbitrary.Block
83-
Haskoin.Util.Arbitrary.Crypto
84-
Haskoin.Util.Arbitrary.Keys
85-
Haskoin.Util.Arbitrary.Message
86-
Haskoin.Util.Arbitrary.Network
87-
Haskoin.Util.Arbitrary.Script
88-
Haskoin.Util.Arbitrary.Transaction
89-
Haskoin.Util.Arbitrary.Util
46+
Bitcoin
47+
Bitcoin.Address
48+
Bitcoin.Address.Base58
49+
Bitcoin.Address.Bech32
50+
Bitcoin.Block
51+
Bitcoin.Block.Common
52+
Bitcoin.Block.Headers
53+
Bitcoin.Block.Merkle
54+
Bitcoin.Constants
55+
Bitcoin.Crypto
56+
Bitcoin.Crypto.Hash
57+
Bitcoin.Crypto.Signature
58+
Bitcoin.Data
59+
Bitcoin.Keys
60+
Bitcoin.Keys.Common
61+
Bitcoin.Keys.Extended
62+
Bitcoin.Keys.Mnemonic
63+
Bitcoin.Network
64+
Bitcoin.Network.Bloom
65+
Bitcoin.Network.Common
66+
Bitcoin.Network.Message
67+
Bitcoin.Script
68+
Bitcoin.Script.Common
69+
Bitcoin.Script.SigHash
70+
Bitcoin.Script.Standard
71+
Bitcoin.Transaction
72+
Bitcoin.Transaction.Builder
73+
Bitcoin.Transaction.Builder.Sign
74+
Bitcoin.Transaction.Common
75+
Bitcoin.Transaction.Genesis
76+
Bitcoin.Transaction.Partial
77+
Bitcoin.Transaction.Segwit
78+
Bitcoin.Transaction.Taproot
79+
Bitcoin.Util
80+
Bitcoin.Util.Arbitrary
81+
Bitcoin.Util.Arbitrary.Address
82+
Bitcoin.Util.Arbitrary.Block
83+
Bitcoin.Util.Arbitrary.Crypto
84+
Bitcoin.Util.Arbitrary.Keys
85+
Bitcoin.Util.Arbitrary.Message
86+
Bitcoin.Util.Arbitrary.Network
87+
Bitcoin.Util.Arbitrary.Script
88+
Bitcoin.Util.Arbitrary.Transaction
89+
Bitcoin.Util.Arbitrary.Util
9090
other-modules:
91-
Haskoin.Keys.Extended.Internal
91+
Bitcoin.Keys.Extended.Internal
9292
hs-source-dirs:
9393
src
9494
build-depends:
@@ -128,20 +128,20 @@ test-suite spec
128128
type: exitcode-stdio-1.0
129129
main-is: Spec.hs
130130
other-modules:
131-
Haskoin.Address.Bech32Spec
132-
Haskoin.AddressSpec
133-
Haskoin.BlockSpec
134-
Haskoin.Crypto.HashSpec
135-
Haskoin.Crypto.SignatureSpec
136-
Haskoin.Keys.ExtendedSpec
137-
Haskoin.Keys.MnemonicSpec
138-
Haskoin.KeysSpec
139-
Haskoin.NetworkSpec
140-
Haskoin.ScriptSpec
141-
Haskoin.Transaction.PartialSpec
142-
Haskoin.Transaction.TaprootSpec
143-
Haskoin.TransactionSpec
144-
Haskoin.UtilSpec
131+
Bitcoin.Address.Bech32Spec
132+
Bitcoin.AddressSpec
133+
Bitcoin.BlockSpec
134+
Bitcoin.Crypto.HashSpec
135+
Bitcoin.Crypto.SignatureSpec
136+
Bitcoin.Keys.ExtendedSpec
137+
Bitcoin.Keys.MnemonicSpec
138+
Bitcoin.KeysSpec
139+
Bitcoin.NetworkSpec
140+
Bitcoin.ScriptSpec
141+
Bitcoin.Transaction.PartialSpec
142+
Bitcoin.Transaction.TaprootSpec
143+
Bitcoin.TransactionSpec
144+
Bitcoin.UtilSpec
145145
Paths_bitcoin
146146
hs-source-dirs:
147147
test

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies:
5151
- vector >= 0.12.1.2
5252
library:
5353
source-dirs: src
54-
other-modules: Haskoin.Keys.Extended.Internal
54+
other-modules: Bitcoin.Keys.Extended.Internal
5555
when:
5656
- condition: false
5757
other-modules: Paths_bitcoin

scripts/PsbtSignTest.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import qualified Data.ByteString as BS
44
import Data.Maybe (fromMaybe)
55
import qualified Data.Serialize as S
66
import Data.Text (pack)
7-
import Haskoin (PartiallySignedTransaction, SecKey)
8-
import qualified Haskoin as H
7+
import Bitcoin (PartiallySignedTransaction, SecKey)
8+
import qualified Bitcoin as H
99
import System.Environment (getArgs)
1010

1111

src/Bitcoin.hs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
-- |
2+
-- Stability : experimental
3+
-- Portability : POSIX
4+
--
5+
-- This module exports almost all of Bitcoin Core, excluding only a few highly
6+
-- specialized address and block-related functions.
7+
module Bitcoin (
8+
module Data,
9+
module Constants,
10+
module Address,
11+
module Block,
12+
module Transaction,
13+
module Script,
14+
module Keys,
15+
module Crypto,
16+
module Network,
17+
module Util,
18+
) where
19+
20+
import Bitcoin.Address as Address
21+
import Bitcoin.Block as Block
22+
import Bitcoin.Constants as Constants
23+
import Bitcoin.Crypto as Crypto
24+
import Bitcoin.Data as Data
25+
import Bitcoin.Keys as Keys
26+
import Bitcoin.Network as Network
27+
import Bitcoin.Script as Script
28+
import Bitcoin.Transaction as Transaction
29+
import Bitcoin.Util as Util

src/Haskoin/Address.hs renamed to src/Bitcoin/Address.hs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
-- Portability : POSIX
1111
--
1212
-- Base58, Bech32 address and WIF private key serialization support.
13-
module Haskoin.Address (
13+
module Bitcoin.Address (
1414
-- * Addresses
1515
Address (..),
1616
isPubKeyAddress,
@@ -42,8 +42,8 @@ module Haskoin.Address (
4242
payToNestedScriptAddress,
4343
scriptToAddress,
4444
scriptToAddressBS,
45-
module Haskoin.Address.Base58,
46-
module Haskoin.Address.Bech32,
45+
module Bitcoin.Address.Base58,
46+
module Bitcoin.Address.Bech32,
4747
) where
4848

4949
import Control.Applicative
@@ -66,13 +66,13 @@ import Data.Text (Text)
6666
import qualified Data.Text as T
6767
import Data.Word (Word8)
6868
import GHC.Generics (Generic)
69-
import Haskoin.Address.Base58
70-
import Haskoin.Address.Bech32
71-
import Haskoin.Crypto
72-
import Haskoin.Data
73-
import Haskoin.Keys.Common
74-
import Haskoin.Script
75-
import Haskoin.Util
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/Haskoin/Address/Base58.hs renamed to src/Bitcoin/Address/Base58.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
-- Portability : POSIX
66
--
77
-- Support for legacy 'Base58' addresses. Superseded by Bech32 for Bitcoin
8-
module Haskoin.Address.Base58 (
8+
module Bitcoin.Address.Base58 (
99
-- * Base58
1010
Base58,
1111
encodeBase58,
@@ -28,8 +28,8 @@ import Data.String.Conversions (cs)
2828
import Data.Text (Text)
2929
import qualified Data.Text as T
3030
import Data.Word
31-
import Haskoin.Crypto.Hash
32-
import Haskoin.Util
31+
import Bitcoin.Crypto.Hash
32+
import Bitcoin.Util
3333
import Numeric (readInt, showIntAtBase)
3434

3535

src/Haskoin/Address/Bech32.hs renamed to src/Bitcoin/Address/Bech32.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
--
88
-- Support for Bitcoin SegWit (BTC) Bech32 addresses. This module is a modified
99
-- version of Marko Bencun's reference implementation.
10-
module Haskoin.Address.Bech32 (
10+
module Bitcoin.Address.Bech32 (
1111
-- * Bech32
1212
HRP,
1313
Bech32,

src/Bitcoin/Block.hs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
-- |
2+
-- Stability : experimental
3+
-- Portability : POSIX
4+
--
5+
-- Most functions relating to blocks are exported by this module.
6+
module Bitcoin.Block (
7+
module Bitcoin.Block.Common,
8+
module Bitcoin.Block.Headers,
9+
module Bitcoin.Block.Merkle,
10+
) where
11+
12+
import Bitcoin.Block.Common
13+
import Bitcoin.Block.Headers
14+
import Bitcoin.Block.Merkle

src/Haskoin/Block/Common.hs renamed to src/Bitcoin/Block/Common.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-- Portability : POSIX
88
--
99
-- Common data types and functions to handle blocks from the block chain.
10-
module Haskoin.Block.Common (
10+
module Bitcoin.Block.Common (
1111
-- * Blocks
1212
Block (..),
1313
BlockHeight,
@@ -66,10 +66,10 @@ import Data.String.Conversions (cs)
6666
import Data.Text (Text)
6767
import Data.Word (Word32)
6868
import GHC.Generics (Generic)
69-
import Haskoin.Crypto.Hash
70-
import Haskoin.Network.Common
71-
import Haskoin.Transaction.Common
72-
import Haskoin.Util
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

0 commit comments

Comments
 (0)