Compare commits

..

No commits in common. "0fb02b2514ca21af8a65533bdf12fdcc42a1d3b0" and "f593fefd7f80620137b99209b27fce22edeecccb" have entirely different histories.

View file

@ -31,10 +31,9 @@ import qualified Data.ByteArray as BA
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import qualified Data.ByteString.Char8 as C import qualified Data.ByteString.Char8 as C
import qualified Data.ByteString.Lazy.UTF8 as US import qualified Data.ByteString.Lazy.UTF8 as US
import qualified Data.ByteString.Short as BS (ShortByteString, toShort)
import Data.HexString import Data.HexString
import Data.Int import Data.Int
import Data.Maybe (fromJust, fromMaybe) import Data.Maybe (fromMaybe)
import Data.Structured import Data.Structured
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Encoding as E import qualified Data.Text.Encoding as E
@ -42,7 +41,6 @@ import Data.Word
import qualified GHC.Generics as GHC import qualified GHC.Generics as GHC
import qualified Generics.SOP as SOP import qualified Generics.SOP as SOP
import Haskoin.Address (Address) import Haskoin.Address (Address)
import qualified Haskoin.Crypto.Hash as H (Hash256(..))
import Haskoin.Crypto.Keys.Extended (XPrvKey) import Haskoin.Crypto.Keys.Extended (XPrvKey)
import qualified Haskoin.Transaction.Common as H import qualified Haskoin.Transaction.Common as H
@ -153,9 +151,7 @@ fromRawTxIn :: RawTxIn -> H.TxIn
fromRawTxIn t = fromRawTxIn t =
H.TxIn H.TxIn
(H.OutPoint (H.OutPoint
((fromJust . (read $ US.toString $ C.fromStrict $ rop_hash $ rti_outpoint t)
H.hexToTxHash . E.decodeUtf8Lenient . rop_hash . rti_outpoint)
t)
(rop_n $ rti_outpoint t)) (rop_n $ rti_outpoint t))
(rti_script t) (rti_script t)
(rti_seq t) (rti_seq t)