mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-24 15:02:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Modidfying 'toString' function on ScriptWitness

Browse source
This commit is contained in:
Chris Stewart 2016-12-28 12:28:31 -06:00
parent 897719a854
commit 48d7b474b5
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/scala/org/bitcoins/core/protocol/script/ScriptWitness.scala
View file

@ -2,7 +2,6 @@ package org.bitcoins.core.protocol.script
import org.bitcoins.core.crypto.{ECDigitalSignature, ECPublicKey} import org.bitcoins.core.crypto.{ECDigitalSignature, ECPublicKey}
import org.bitcoins.core.protocol.NetworkElement import org.bitcoins.core.protocol.NetworkElement
import org.bitcoins.core.script.constant.ScriptToken
import org.bitcoins.core.serializers.script.RawScriptWitnessParser import org.bitcoins.core.serializers.script.RawScriptWitnessParser
import org.bitcoins.core.util.{BitcoinSUtil, Factory} import org.bitcoins.core.util.{BitcoinSUtil, Factory}
@ -16,7 +15,7 @@ sealed trait ScriptWitness extends NetworkElement {
/** The byte vectors that are placed on to the stack when evaluating a witness program */ /** The byte vectors that are placed on to the stack when evaluating a witness program */
def stack : Seq[Seq[Byte]] def stack : Seq[Seq[Byte]]
override def toString = stack.map(BitcoinSUtil.encodeHex(_)).toString override def toString = "ScriptWitness(" + stack.map(BitcoinSUtil.encodeHex(_)).toString + ")"
override def hex = RawScriptWitnessParser.write(this) override def hex = RawScriptWitnessParser.write(this)
} }

2
src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala
View file

@ -1,8 +1,8 @@
package org.bitcoins.core.protocol.transaction package org.bitcoins.core.protocol.transaction
import org.bitcoins.core.number.UInt32 import org.bitcoins.core.number.UInt32
import org.bitcoins.core.protocol.NetworkElement
import org.bitcoins.core.protocol.script.{ScriptPubKey, ScriptSignature} import org.bitcoins.core.protocol.script.{ScriptPubKey, ScriptSignature}
import org.bitcoins.core.protocol.{CompactSizeUInt, NetworkElement}
import org.bitcoins.core.script.constant.ScriptToken import org.bitcoins.core.script.constant.ScriptToken
import org.bitcoins.core.serializers.transaction.RawTransactionInputParser import org.bitcoins.core.serializers.transaction.RawTransactionInputParser
import org.bitcoins.core.util.Factory import org.bitcoins.core.util.Factory

2
src/main/scala/org/bitcoins/core/protocol/transaction/TransactionWitness.scala
View file

@ -3,7 +3,7 @@ package org.bitcoins.core.protocol.transaction
import org.bitcoins.core.protocol.NetworkElement import org.bitcoins.core.protocol.NetworkElement
import org.bitcoins.core.protocol.script.ScriptWitness import org.bitcoins.core.protocol.script.ScriptWitness
import org.bitcoins.core.serializers.transaction.RawTransactionWitnessParser import org.bitcoins.core.serializers.transaction.RawTransactionWitnessParser
import org.bitcoins.core.util.{BitcoinSUtil, Factory} import org.bitcoins.core.util.BitcoinSUtil
/** /**
* Created by chris on 11/21/16. * Created by chris on 11/21/16.

3
src/main/scala/org/bitcoins/core/script/interpreter/ScriptInterpreter.scala
View file

@ -1,6 +1,5 @@
package org.bitcoins.core.script.interpreter package org.bitcoins.core.script.interpreter
import org.bitcoins.core.script.constant.ScriptToken
import org.bitcoins.core.consensus.Consensus import org.bitcoins.core.consensus.Consensus
import org.bitcoins.core.crypto.{BaseTransactionSignatureComponent, WitnessV0TransactionSignatureComponent} import org.bitcoins.core.crypto.{BaseTransactionSignatureComponent, WitnessV0TransactionSignatureComponent}
import org.bitcoins.core.currency.{CurrencyUnit, CurrencyUnits} import org.bitcoins.core.currency.{CurrencyUnit, CurrencyUnits}
@ -10,7 +9,7 @@ import org.bitcoins.core.protocol.transaction.{BaseTransaction, EmptyTransaction
import org.bitcoins.core.script._ import org.bitcoins.core.script._
import org.bitcoins.core.script.arithmetic._ import org.bitcoins.core.script.arithmetic._
import org.bitcoins.core.script.bitwise._ import org.bitcoins.core.script.bitwise._
import org.bitcoins.core.script.constant._ import org.bitcoins.core.script.constant.{ScriptToken, _}
import org.bitcoins.core.script.control._ import org.bitcoins.core.script.control._
import org.bitcoins.core.script.crypto._ import org.bitcoins.core.script.crypto._
import org.bitcoins.core.script.flag._ import org.bitcoins.core.script.flag._