Rename modules to Bitcoin.*

This also removes other references to Haskoin from the library.

Author: tochicool

README.md

@@ -1,6 +1,6 @@
-# Haskoin Core
+# Bitcoin
 
-Haskoin Core is a library of Bitcoin functions written in Haskell featuring:
+Bitcoin is a library of Bitcoin functions written in Haskell featuring:
 
 - Hashing functions (SHA-256, RIPEMD-160)
 - Base58 support

bitcoin.cabal

@@ -43,52 +43,52 @@ source-repository head
 
 library
   exposed-modules:
-      Haskoin
-      Haskoin.Address
-      Haskoin.Address.Base58
-      Haskoin.Address.Bech32
-      Haskoin.Block
-      Haskoin.Block.Common
-      Haskoin.Block.Headers
-      Haskoin.Block.Merkle
-      Haskoin.Constants
-      Haskoin.Crypto
-      Haskoin.Crypto.Hash
-      Haskoin.Crypto.Signature
-      Haskoin.Data
-      Haskoin.Keys
-      Haskoin.Keys.Common
-      Haskoin.Keys.Extended
-      Haskoin.Keys.Mnemonic
-      Haskoin.Network
-      Haskoin.Network.Bloom
-      Haskoin.Network.Common
-      Haskoin.Network.Message
-      Haskoin.Script
-      Haskoin.Script.Common
-      Haskoin.Script.SigHash
-      Haskoin.Script.Standard
-      Haskoin.Transaction
-      Haskoin.Transaction.Builder
-      Haskoin.Transaction.Builder.Sign
-      Haskoin.Transaction.Common
-      Haskoin.Transaction.Genesis
-      Haskoin.Transaction.Partial
-      Haskoin.Transaction.Segwit
-      Haskoin.Transaction.Taproot
-      Haskoin.Util
-      Haskoin.Util.Arbitrary
-      Haskoin.Util.Arbitrary.Address
-      Haskoin.Util.Arbitrary.Block
-      Haskoin.Util.Arbitrary.Crypto
-      Haskoin.Util.Arbitrary.Keys
-      Haskoin.Util.Arbitrary.Message
-      Haskoin.Util.Arbitrary.Network
-      Haskoin.Util.Arbitrary.Script
-      Haskoin.Util.Arbitrary.Transaction
-      Haskoin.Util.Arbitrary.Util
+      Bitcoin
+      Bitcoin.Address
+      Bitcoin.Address.Base58
+      Bitcoin.Address.Bech32
+      Bitcoin.Block
+      Bitcoin.Block.Common
+      Bitcoin.Block.Headers
+      Bitcoin.Block.Merkle
+      Bitcoin.Constants
+      Bitcoin.Crypto
+      Bitcoin.Crypto.Hash
+      Bitcoin.Crypto.Signature
+      Bitcoin.Data
+      Bitcoin.Keys
+      Bitcoin.Keys.Common
+      Bitcoin.Keys.Extended
+      Bitcoin.Keys.Mnemonic
+      Bitcoin.Network
+      Bitcoin.Network.Bloom
+      Bitcoin.Network.Common
+      Bitcoin.Network.Message
+      Bitcoin.Script
+      Bitcoin.Script.Common
+      Bitcoin.Script.SigHash
+      Bitcoin.Script.Standard
+      Bitcoin.Transaction
+      Bitcoin.Transaction.Builder
+      Bitcoin.Transaction.Builder.Sign
+      Bitcoin.Transaction.Common
+      Bitcoin.Transaction.Genesis
+      Bitcoin.Transaction.Partial
+      Bitcoin.Transaction.Segwit
+      Bitcoin.Transaction.Taproot
+      Bitcoin.Util
+      Bitcoin.Util.Arbitrary
+      Bitcoin.Util.Arbitrary.Address
+      Bitcoin.Util.Arbitrary.Block
+      Bitcoin.Util.Arbitrary.Crypto
+      Bitcoin.Util.Arbitrary.Keys
+      Bitcoin.Util.Arbitrary.Message
+      Bitcoin.Util.Arbitrary.Network
+      Bitcoin.Util.Arbitrary.Script
+      Bitcoin.Util.Arbitrary.Transaction
+      Bitcoin.Util.Arbitrary.Util
   other-modules:
-      Haskoin.Keys.Extended.Internal
+      Bitcoin.Keys.Extended.Internal
   hs-source-dirs:
       src
   build-depends:
@@ -128,20 +128,20 @@ test-suite spec
   type: exitcode-stdio-1.0
   main-is: Spec.hs
   other-modules:
-      Haskoin.Address.Bech32Spec
-      Haskoin.AddressSpec
-      Haskoin.BlockSpec
-      Haskoin.Crypto.HashSpec
-      Haskoin.Crypto.SignatureSpec
-      Haskoin.Keys.ExtendedSpec
-      Haskoin.Keys.MnemonicSpec
-      Haskoin.KeysSpec
-      Haskoin.NetworkSpec
-      Haskoin.ScriptSpec
-      Haskoin.Transaction.PartialSpec
-      Haskoin.Transaction.TaprootSpec
-      Haskoin.TransactionSpec
-      Haskoin.UtilSpec
+      Bitcoin.Address.Bech32Spec
+      Bitcoin.AddressSpec
+      Bitcoin.BlockSpec
+      Bitcoin.Crypto.HashSpec
+      Bitcoin.Crypto.SignatureSpec
+      Bitcoin.Keys.ExtendedSpec
+      Bitcoin.Keys.MnemonicSpec
+      Bitcoin.KeysSpec
+      Bitcoin.NetworkSpec
+      Bitcoin.ScriptSpec
+      Bitcoin.Transaction.PartialSpec
+      Bitcoin.Transaction.TaprootSpec
+      Bitcoin.TransactionSpec
+      Bitcoin.UtilSpec
       Paths_bitcoin
   hs-source-dirs:
       test

package.yaml

@@ -51,7 +51,7 @@ dependencies:
   - vector >= 0.12.1.2
 library:
   source-dirs: src
-  other-modules: Haskoin.Keys.Extended.Internal
+  other-modules: Bitcoin.Keys.Extended.Internal
   when:
     - condition: false
       other-modules: Paths_bitcoin

scripts/PsbtSignTest.hs

@@ -4,8 +4,8 @@ import qualified Data.ByteString as BS
 import Data.Maybe (fromMaybe)
 import qualified Data.Serialize as S
 import Data.Text (pack)
-import Haskoin (PartiallySignedTransaction, SecKey)
-import qualified Haskoin as H
+import Bitcoin (PartiallySignedTransaction, SecKey)
+import qualified Bitcoin as H
 import System.Environment (getArgs)
 
 

src/Bitcoin.hs

@@ -0,0 +1,29 @@
+-- |
+-- Stability   : experimental
+-- Portability : POSIX
+--
+-- This module exports almost all of Bitcoin Core, excluding only a few highly
+-- specialized address and block-related functions.
+module Bitcoin (
+    module Data,
+    module Constants,
+    module Address,
+    module Block,
+    module Transaction,
+    module Script,
+    module Keys,
+    module Crypto,
+    module Network,
+    module Util,
+) where
+
+import Bitcoin.Address as Address
+import Bitcoin.Block as Block
+import Bitcoin.Constants as Constants
+import Bitcoin.Crypto as Crypto
+import Bitcoin.Data as Data
+import Bitcoin.Keys as Keys
+import Bitcoin.Network as Network
+import Bitcoin.Script as Script
+import Bitcoin.Transaction as Transaction
+import Bitcoin.Util as Util

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

@@ -10,7 +10,7 @@
 -- Portability : POSIX
 --
 -- Base58, Bech32 address and WIF private key serialization support.
-module Haskoin.Address (
+module Bitcoin.Address (
     -- * Addresses
     Address (..),
     isPubKeyAddress,
@@ -42,8 +42,8 @@ module Haskoin.Address (
     payToNestedScriptAddress,
     scriptToAddress,
     scriptToAddressBS,
-    module Haskoin.Address.Base58,
-    module Haskoin.Address.Bech32,
+    module Bitcoin.Address.Base58,
+    module Bitcoin.Address.Bech32,
 ) where
 
 import Control.Applicative
@@ -66,13 +66,13 @@ import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Word (Word8)
 import GHC.Generics (Generic)
-import Haskoin.Address.Base58
-import Haskoin.Address.Bech32
-import Haskoin.Crypto
-import Haskoin.Data
-import Haskoin.Keys.Common
-import Haskoin.Script
-import Haskoin.Util
+import Bitcoin.Address.Base58
+import Bitcoin.Address.Bech32
+import Bitcoin.Crypto
+import Bitcoin.Data
+import Bitcoin.Keys.Common
+import Bitcoin.Script
+import Bitcoin.Util
 
 
 -- | Address format for Bitcoin

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

@@ -5,7 +5,7 @@
 -- Portability : POSIX
 --
 -- Support for legacy 'Base58' addresses. Superseded by Bech32 for Bitcoin
-module Haskoin.Address.Base58 (
+module Bitcoin.Address.Base58 (
     -- * Base58
     Base58,
     encodeBase58,
@@ -28,8 +28,8 @@ import Data.String.Conversions (cs)
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Word
-import Haskoin.Crypto.Hash
-import Haskoin.Util
+import Bitcoin.Crypto.Hash
+import Bitcoin.Util
 import Numeric (readInt, showIntAtBase)
 
 

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

@@ -7,7 +7,7 @@
 --
 -- Support for Bitcoin SegWit (BTC) Bech32 addresses. This module is a modified
 -- version of Marko Bencun's reference implementation.
-module Haskoin.Address.Bech32 (
+module Bitcoin.Address.Bech32 (
     -- * Bech32
     HRP,
     Bech32,

src/Bitcoin/Block.hs

@@ -0,0 +1,14 @@
+-- |
+-- Stability   : experimental
+-- Portability : POSIX
+--
+-- Most functions relating to blocks are exported by this module.
+module Bitcoin.Block (
+    module Bitcoin.Block.Common,
+    module Bitcoin.Block.Headers,
+    module Bitcoin.Block.Merkle,
+) where
+
+import Bitcoin.Block.Common
+import Bitcoin.Block.Headers
+import Bitcoin.Block.Merkle

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

@@ -7,7 +7,7 @@
 -- Portability : POSIX
 --
 -- Common data types and functions to handle blocks from the block chain.
-module Haskoin.Block.Common (
+module Bitcoin.Block.Common (
     -- * Blocks
     Block (..),
     BlockHeight,
@@ -66,10 +66,10 @@ import Data.String.Conversions (cs)
 import Data.Text (Text)
 import Data.Word (Word32)
 import GHC.Generics (Generic)
-import Haskoin.Crypto.Hash
-import Haskoin.Network.Common
-import Haskoin.Transaction.Common
-import Haskoin.Util
+import Bitcoin.Crypto.Hash
+import Bitcoin.Network.Common
+import Bitcoin.Transaction.Common
+import Bitcoin.Util
 import qualified Text.Read as R