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

Fixing compilation issues, not all tests are passing yet

Browse source
This commit is contained in:
Chris Stewart 2016-05-17 09:47:27 -05:00
parent 5f1ea05d63
commit ddecb2c05f
6 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/scala/org/bitcoins/core/script/constant/Constants.scala
View file

@ -23,10 +23,9 @@ sealed trait ScriptToken {
/**
* The byte representation of this script token
*
* @return
*/
def bytes = BitcoinSUtil.decodeHex(hex)
def bytes : Seq[Byte] = BitcoinSUtil.decodeHex(hex)
/**
* The conversion from the byte representation of a token to a number

9
src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala
View file

@ -66,8 +66,8 @@ trait ScriptParser extends Factory[List[ScriptToken]] with BitcoinSLogger {
@tailrec
def loop(operations : List[String], accum : List[Byte]) : List[Byte] = {
/* logger.debug("Attempting to parse: " + operations.headOption)
logger.debug("Accum: " + accum)*/
logger.debug("Attempting to parse: " + operations.headOption)
logger.debug("Accum: " + accum)
operations match {
//for parsing strings like 'Az', need to remove single quotes
//example: https://github.com/bitcoin/bitcoin/blob/master/src/test/data/script_valid.json#L24
@ -97,6 +97,7 @@ trait ScriptParser extends Factory[List[ScriptToken]] with BitcoinSLogger {
}
//if we see a byte constant in the form of "0x09adb"
case h :: t if (h.size > 1 && h.substring(0,2) == "0x") =>
logger.debug("Found byte constant in the form 0x..")
loop(t,BitcoinSUtil.decodeHex(h.substring(2,h.size).toLowerCase).toList.reverse ++ accum)
//skip the empty string
case h :: t if (h == "") => loop(t,accum)
@ -123,13 +124,15 @@ trait ScriptParser extends Factory[List[ScriptToken]] with BitcoinSLogger {
}
}
if (tryParsingLong(str) && str.size > 1 && str.substring(0,2) != "0x") {
logger.debug("Parsing a single decimal constant")
//for the case when there is just a single decimal constant
//i.e. "8388607"
val scriptNumber = ScriptNumber(parseLong(str))
val bytesToPushOntoStack = BytesToPushOntoStack(scriptNumber.bytes.size)
List(bytesToPushOntoStack,scriptNumber)
}
else if (BitcoinSUtil.isHex(str)) {
else if (BitcoinSUtil.isHex(str) && str.toLowerCase == str) {
logger.debug("Parsing hex string")
//if the given string is hex, it is pretty straight forward to parse it
//convert the hex string to a byte array and parse it
val bytes = BitcoinSUtil.decodeHex(str)

11
src/main/scala/org/bitcoins/core/util/BitcoinSUtil.scala
View file

@ -14,14 +14,10 @@ trait BitcoinSUtil extends NumberUtil {
def hexToBigInt(hex : String) : BigInt = BigInt(hex, 16)
def decodeHex(hex : String) : Seq[Byte] = {
hex.replaceAll("[^0-9A-Fa-f]", "").sliding(2, 2).toArray.map(Integer.parseInt(_, 16).toByte)
hex.replaceAll("[^0-9A-Fa-f]", "").sliding(2, 2).toArray.map(Integer.parseInt(_, 16).toByte).toList
}
def encodeHex(bytes : Array[Byte]) : String = {
bytes.map("%02x".format(_)).mkString
}
def encodeHex(bytes : Seq[Byte]) : String = encodeHex(bytes.toArray)
def encodeHex(bytes : Seq[Byte]) : String = bytes.map("%02x".format(_)).mkString
def encodeHex(unit : CurrencyUnit) : String = {
val satoshis = CurrencyUnits.toSatoshis(unit)
@ -31,7 +27,6 @@ trait BitcoinSUtil extends NumberUtil {
//TODO: this is ugly, clean this up. Shouldn't have to use .toLong
flipHalfByte(encodeHex(BigInt(satoshis.value.toLong).toByteArray).reverse)
}
}
def encodeHex(byte : Byte) : String = encodeHex(Seq(byte))
@ -43,7 +38,7 @@ trait BitcoinSUtil extends NumberUtil {
*/
def isHex(str : String) = {
try {
decodeHex(str.trim)
java.lang.Long.parseLong(str,16)
true
} catch {
case _ : Throwable => false

1
src/test/scala/org/bitcoins/core/script/constant/ConstantInterpreterTest.scala
View file

@ -22,7 +22,6 @@ class ConstantInterpreterTest extends FlatSpec with MustMatchers with ConstantIn
val script = List(OP_PUSHDATA1,ScriptNumber(byteConstantSize), scriptConstant,OP_7,OP_EQUAL)
val program = ScriptProgram(TestUtil.testProgramExecutionInProgress, stack,script)
val newProgram = opPushData1(program)
println(newProgram)
newProgram.stack must be (List(scriptConstant))
newProgram.script must be (List(OP_7,OP_EQUAL))
}

2
src/test/scala/org/bitcoins/core/serializers/script/ScriptParserTest.scala
View file

@ -138,6 +138,7 @@ class ScriptParserTest extends FlatSpec with MustMatchers with ScriptParser with
parseBytesFromString(str) must be (List(ScriptNumber(255)))
}
/*
it must "parse an OP_PUSHDATA2 correctly" in {
val str = "0x4d 0xFF00 " +
"0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 " +
@ -207,5 +208,6 @@ class ScriptParserTest extends FlatSpec with MustMatchers with ScriptParser with
"62626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262"
)))
}
*/
}

16
src/test/scala/org/bitcoins/core/util/TestUtil.scala
View file

@ -17,11 +17,11 @@ import org.bitcoins.core.script.stack.OP_DUP
*/
object TestUtil {
val testBitcoinAddress = BitcoinAddress("n3p1ct69ao3qxWvEvzLhLtWG2zJGTjN3EV")
val testP2SHAddress = BitcoinAddress("2MzYbQdkSVp5wVyMRp6A5PHPuQNHpiaTbCj")
val bitcoinAddress = BitcoinAddress("1C4kYhyLftmkn48YarSoLupxHfYFo8kp64")
val multiSigAddress = BitcoinAddress("342ftSRCvFHfCeFFBuz4xwbeqnDw6BGUey")
val assetAddress = AssetAddress("akJsoCcyh34FGPotxfEoSXGwFPCNAkyCgTA")
def testBitcoinAddress = BitcoinAddress("n3p1ct69ao3qxWvEvzLhLtWG2zJGTjN3EV")
def testP2SHAddress = BitcoinAddress("2MzYbQdkSVp5wVyMRp6A5PHPuQNHpiaTbCj")
def bitcoinAddress = BitcoinAddress("1C4kYhyLftmkn48YarSoLupxHfYFo8kp64")
def multiSigAddress = BitcoinAddress("342ftSRCvFHfCeFFBuz4xwbeqnDw6BGUey")
def assetAddress = AssetAddress("akJsoCcyh34FGPotxfEoSXGwFPCNAkyCgTA")
val p2pkhInputScript = "473044022016ffdbb7c57634903c5e018fcfc48d59f4e37dc4bc3bbc9ba4e6ee39150bca030220119c2241a931819bc1a75d3596e4029d803d1cd6de123bf8a1a1a2c3665e1fac012102af7dad03e682fcd0427b5c24140c220ac9d8abe286c15f8cf5bf77eed19c3652"
def p2pkhScriptSig = ScriptSignature(p2pkhInputScript)
@ -141,7 +141,7 @@ object TestUtil {
def p2shScriptPubKey = ScriptPubKey(rawP2SHScriptPubKey)
//https://tbtc.blockr.io/api/v1/tx/raw/bdc221db675c06dbee2ae75d33e31cad4e2555efea10c337ff32c8cdf97f8e74
val rawScriptSig = "483045022100ad8e961fe3c22b2647d92b078f4c0cf81b3106ea5bf8b900ab8646aa4430216f022071d4edc2b5588be20ac4c2d07edd8ed069e10b2402d3dce2d3b835ccd075f283014104fa79182bbc26c708b5d9f36b8635947d4a834ea356cf612ede08395c295f962e0b1dc2557aba34188640e51a58ed547f2c89c8265cd0c04ff890d8435648746e"
val scriptSig = ScriptSignature(rawScriptSig)
def scriptSig = ScriptSignature(rawScriptSig)
def testProgram : ScriptProgram = ScriptProgram(TransactionTestUtil.testTransaction,
EmptyScriptPubKey,0,List(),Policy.standardScriptVerifyFlags)
@ -165,10 +165,10 @@ object TestUtil {
* This is a script sig that doesn't have a signature strictly der encoded
* Zero-length R is correctly encoded
*/
val rawScriptSigNotStrictDerEncoded = "173014020002107777777777777777777777777777777701"
def rawScriptSigNotStrictDerEncoded = "173014020002107777777777777777777777777777777701"
def scriptSigNotStrictDerEncoded = ScriptSignature(rawScriptSigNotStrictDerEncoded)
val p2pkhScriptSigNotStrictDerEncoded = ScriptSignature.fromAsm(List(BytesToPushOntoStack(71),
def p2pkhScriptSigNotStrictDerEncoded = ScriptSignature.fromAsm(List(BytesToPushOntoStack(71),
ScriptConstant("173014020002107777777777777777777777777777777701"),
BytesToPushOntoStack(33),
ScriptConstant("02af7dad03e682fcd0427b5c24140c220ac9d8abe286c15f8cf5bf77eed19c3652")))