btcruby 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a64dd3f298bb55c7d1bc660b6318771030fa6e6f
-  data.tar.gz: 6f9d6e72597bc798b2f025c3003d093f972a50ff
+  metadata.gz: e73f94175000adb419e6113bafc872a4ed2085fe
+  data.tar.gz: d77e81499ba58dcfbb3b46e3be208fc5680d60a4
 SHA512:
-  metadata.gz: 38c83c30020fdc804fcd467bf20bd241709924c7b7708e8da72202c23717e9cb59b54c9916e6d5a09902b067107ebd8d4c14fa26b854495e4f1ac34693eb8ac7
-  data.tar.gz: 7cbd2dc8332ae5e4756d813b207f592d541ff1d878b512bb902853b9b8fb6d626f28505cd1aea90f54706871544fcde1c45c9d1ccd81927aa85f2ff39e18e9ec
+  metadata.gz: 29ef9077eae00c04723693c7ca5ce068010f8f1c419344e89c6ca7272de4c4cc46c4ab3cd483104a8857ba131e8ecfbfcba99dff4060a2cda43471b762aecabf
+  data.tar.gz: 0bb1d1e596806f3700cdcb2869440d3432be01b95b19d8eddf86771785f5e605ea9a0160559287ccc1d10d2f8b58992a7ec9da78e5cfa9d2ca6d0ebfca88a68c

data/RELEASE_NOTES.md

@@ -2,6 +2,13 @@
 BTCRuby Release Notes
 =====================
 
+1.1.6 (August 26, 2015)
+-----------------------
+
+* Re-defined Issuance ID to not include amount. Now it is defined purely by an outpoint.
+* Fixed namespace issue with `BTC::ScriptError`.
+
+
 1.1.5 (August 20, 2015)
 -----------------------
 

data/lib/btcruby/open_assets/issuance_id.rb

@@ -13,11 +13,9 @@ module BTC
       125 # 's' prefix
     end
 
-    def initialize(string: nil, hash: nil, network: nil, outpoint: nil, amount: nil, _raw_data: nil)
-      if outpoint || amount
-        raise ArgumentError, "Outpoint is missing" if !outpoint
-        raise ArgumentError, "Amount is missing" if !amount || amount < 0
-        data = outpoint.transaction_hash + WireFormat.encode_uint32be(outpoint.index) + WireFormat.encode_uint64le(amount) 
+    def initialize(string: nil, hash: nil, network: nil, outpoint: nil, _raw_data: nil)
+      if outpoint
+        data = outpoint.transaction_hash + WireFormat.encode_uint32be(outpoint.index)
         super(hash: BTC.hash160(data), network: network)
       else
         super(string: string, hash: hash, network: network, _raw_data: _raw_data)

data/lib/btcruby/script/script_error.rb

@@ -48,6 +48,7 @@ module BTC
   include ScriptErrors
   
   class ScriptError
+    include ScriptErrors
     attr_reader :code
     attr_reader :message
     attr_reader :description

data/lib/btcruby/script/script_number.rb

@@ -145,110 +145,3 @@ module BTC
 
   end
 end
-
-if $0 == __FILE__
-  require 'btcruby'
-
-  include BTC
-  def run_tests
-
-    # Decoding
-
-    [-1000000000000000,-10000,-100,-1,0,1,10,1000,100000000000000].each do |i|
-      should_equal(ScriptNumber.new(integer: i).to_i, i, "Must return integer as-is.")
-    end
-
-    should_equal(ScriptNumber.new(data: "").to_i,          0,   "Must parse empty string as zero.")
-    should_equal(ScriptNumber.new(data: "\x01").to_i,      1,   "Must parse 0x01 as 1.")
-    should_equal(ScriptNumber.new(data: "\xff").to_i,     -127, "Must parse 0xff as -127.")
-    should_equal(ScriptNumber.new(data: "\xff\x00").to_i,  255, "Must parse 0xff00 as 255.")
-    should_equal(ScriptNumber.new(data: "\x81").to_i,     -1,   "Must parse 0x81 as -1.")
-    should_equal(ScriptNumber.new(data: "\x8f").to_i,     -15,  "Must parse 0x8f as -0x0f.")
-    should_equal(ScriptNumber.new(data: "\x00\x81").to_i, -256, "Must parse 0x0081 as -256.")
-    should_equal(ScriptNumber.new(data: "\xff\x80").to_i, -255, "Must decode -255.")
-
-    should_raise('non-minimally encoded script number') { ScriptNumber.new(data: "\x00") }
-    should_raise('non-minimally encoded script number') { ScriptNumber.new(data: "\x80") }
-    should_raise('non-minimally encoded script number') { ScriptNumber.new(data: "\x00\x80") }
-    should_raise('non-minimally encoded script number') { ScriptNumber.new(data: "\x01\x80") }
-    should_raise('non-minimally encoded script number') { ScriptNumber.new(data: "\x00\x00\x80") }
-    should_raise('non-minimally encoded script number') { ScriptNumber.new(data: "\x00\x10\x80") }
-    should_raise('non-minimally encoded script number') { ScriptNumber.new(data: "\x10\x00\x80") }
-    should_raise('script number overflow (3 > 2)')      { ScriptNumber.new(data: "\x00\x00\x80", max_size: 2) }
-
-    # Encoding
-
-    should_equal(ScriptNumber.new(integer:  0).to_hex,      "")
-    should_equal(ScriptNumber.new(integer:  1).to_hex,      "01")
-    should_equal(ScriptNumber.new(integer: -1).to_hex,      "81")
-    should_equal(ScriptNumber.new(integer:  255).to_hex,    "ff00")
-    should_equal(ScriptNumber.new(integer: -255).to_hex,    "ff80")
-    should_equal(ScriptNumber.new(integer:  0xffff).to_hex, "ffff00")
-    should_equal(ScriptNumber.new(integer: -0xffff).to_hex, "ffff80")
-
-    # Back and forth test
-
-    (-100000..10000).each do |i|
-      d = ScriptNumber.new(integer: i).data
-      #puts BTC.to_hex(d) if i % 16 == 0
-      i2 = ScriptNumber.new(data: d).to_i
-      should_equal(i, i2)
-    end
-    
-    # Booleans
-    
-    should_equal(ScriptNumber.new(boolean: true), 1)
-    should_equal(ScriptNumber.new(boolean: false), 0)
-
-    # Equality
-
-    should_equal(ScriptNumber.new(integer: 0) == 0, true)
-    should_equal(ScriptNumber.new(integer: 1) == 1, true)
-    should_equal(ScriptNumber.new(integer: -1) == -1, true)
-
-    should_equal(ScriptNumber.new(integer: 0) == ScriptNumber.new(integer: 0), true)
-    should_equal(ScriptNumber.new(integer: 1) == ScriptNumber.new(integer: 1), true)
-    should_equal(ScriptNumber.new(integer: -1) == ScriptNumber.new(integer: -1), true)
-    
-    should_equal(ScriptNumber.new(integer: 0) != 0, false)
-    should_equal(ScriptNumber.new(integer: 1) != 1, false)
-    should_equal(ScriptNumber.new(integer: -1) != -1, false)
-
-    should_equal(ScriptNumber.new(integer: 0) != ScriptNumber.new(integer: 0), false)
-    should_equal(ScriptNumber.new(integer: 1) != ScriptNumber.new(integer: 1), false)
-    should_equal(ScriptNumber.new(integer: -1) != ScriptNumber.new(integer: -1), false)
-    
-    # Arithmetic
-    
-    sn = ScriptNumber.new(integer: 123)
-    sn -= 1
-    should_equal(sn, 122)
-    
-    puts "All tests passed."
-  end
-
-  def should_equal(a, b, msg = 'Must equal')
-    a == b or raise "#{msg} Expected #{b.inspect}, received #{a.inspect}."
-  end
-
-  def should_raise(message)
-    raised = false
-    begin
-      yield
-    rescue => e
-      if e.message == message
-        raised = true
-      else
-        raise "Raised unexpected exception: #{e}"
-      end
-    end
-    if !raised
-      raise "Should have raised #{message.inspect}!"
-    end
-  end
-
-  run_tests
-end
-
-
-

data/lib/btcruby/version.rb

@@ -1,3 +1,3 @@
 module BTC
-  VERSION = "1.1.5".freeze
+  VERSION = "1.1.6".freeze
 end

data/spec/open_assets/issuance_id_spec.rb

@@ -3,14 +3,14 @@ require_relative '../spec_helper'
 describe BTC::IssuanceID do
   it "should encode script to a correct address" do
     key = BTC::Key.new(private_key: "18E14A7B6A307F426A94F8114701E7C8E774E7F9A47E2C2035DB29A206321725".from_hex, public_key_compressed: false)
-    issuance_id = BTC::IssuanceID.new(outpoint: BTC::Outpoint.new(transaction_hash: BTC.hash256("tx1"), index:1), amount:100, network: BTC::Network.mainnet)
-    issuance_id.hash.to_hex.must_equal "29d2765469a299d1219a1cbf7561534eae4595f7"
-    issuance_id.to_s.must_equal "SR78rsv5RCMMay22D3ZUZmMgPkRGpqphnQ"
+    issuance_id = BTC::IssuanceID.new(outpoint: BTC::Outpoint.new(transaction_hash: BTC.hash256("tx1"), index:1), network: BTC::Network.mainnet)
+    issuance_id.hash.to_hex.must_equal "601a635e4f95178e999b9957cc8cea255e988a4f"
+    issuance_id.to_s.must_equal "SW49WjotbWmG4GMWXZmpP3bdCrABmC8LRG"
     issuance_id.is_a?(BTC::IssuanceID).must_equal true
   end
   it "should decode an asset address" do
-    issuance_id = BTC::Address.parse("SR78rsv5RCMMay22D3ZUZmMgPkRGpqphnQ")
+    issuance_id = BTC::Address.parse("SW49WjotbWmG4GMWXZmpP3bdCrABmC8LRG")
     issuance_id.is_a?(BTC::IssuanceID).must_equal true
-    issuance_id.hash.to_hex.must_equal "29d2765469a299d1219a1cbf7561534eae4595f7"
+    issuance_id.hash.to_hex.must_equal "601a635e4f95178e999b9957cc8cea255e988a4f"
   end
 end

data/spec/script_number_spec.rb

@@ -0,0 +1,128 @@
+require_relative 'spec_helper'
+
+describe BTC::ScriptNumber do
+
+  [-1000000000000000,-10000,-100,-1,0,1,10,1000,100000000000000].each do |i|
+    it "should return integer #{i} as-is after a round-trip" do
+      BTC::ScriptNumber.new(integer: i).to_i.must_equal i
+    end
+  end
+  
+  it "should validate a range of back-and-forth conversions" do
+    (-100000..10000).each do |i|
+      BTC::ScriptNumber.new(integer: i).to_i.must_equal i
+    end
+  end
+
+  it "should parse empty string as zero" do
+    BTC::ScriptNumber.new(data: "").to_i.must_equal 0
+  end
+
+  it "should parse 0x01 as 1" do
+    BTC::ScriptNumber.new(data: "\x01").to_i.must_equal 1
+  end
+
+  it "should parse 0xff as -127" do
+    BTC::ScriptNumber.new(data: "\xff").to_i.must_equal -127
+  end
+
+  it "should parse 0xff00 as 255." do
+    BTC::ScriptNumber.new(data: "\xff\x00").to_i.must_equal 255
+  end
+
+  it "should parse 0x81 as -1." do
+    BTC::ScriptNumber.new(data: "\x81").to_i.must_equal -1
+  end
+
+  it "should parse 0x8f as -0x0f." do
+    BTC::ScriptNumber.new(data: "\x8f").to_i.must_equal -15
+  end
+
+  it "should parse 0x0081 as -256." do
+    BTC::ScriptNumber.new(data: "\x00\x81").to_i.must_equal -256
+  end
+
+  it "should decode -255." do
+    BTC::ScriptNumber.new(data: "\xff\x80").to_i.must_equal -255
+  end
+  
+  it "should raise exception for non-minimally-encoded data" do
+    should_raise('non-minimally encoded script number') { BTC::ScriptNumber.new(data: "\x00") }
+    should_raise('non-minimally encoded script number') { BTC::ScriptNumber.new(data: "\x80") }
+    should_raise('non-minimally encoded script number') { BTC::ScriptNumber.new(data: "\x00\x80") }
+    should_raise('non-minimally encoded script number') { BTC::ScriptNumber.new(data: "\x01\x80") }
+    should_raise('non-minimally encoded script number') { BTC::ScriptNumber.new(data: "\x00\x00\x80") }
+    should_raise('non-minimally encoded script number') { BTC::ScriptNumber.new(data: "\x00\x10\x80") }
+    should_raise('non-minimally encoded script number') { BTC::ScriptNumber.new(data: "\x10\x00\x80") }
+  end
+  
+  it "should raise exception for invalid encoding" do
+    should_raise('script number overflow (3 > 2)')      { BTC::ScriptNumber.new(data: "\x00\x00\x80", max_size: 2) }    
+  end
+  
+  it "should encode booleans" do
+    BTC::ScriptNumber.new(boolean: true).must_equal 1
+    BTC::ScriptNumber.new(boolean: true).data.must_equal "\x01"
+    BTC::ScriptNumber.new(boolean: false).must_equal 0
+    BTC::ScriptNumber.new(boolean: false).data.must_equal ""
+  end
+  
+  it "should check equality checks" do
+    (BTC::ScriptNumber.new(integer: 0) == 0).must_equal true
+    (BTC::ScriptNumber.new(integer: 1) == 1).must_equal true
+    (BTC::ScriptNumber.new(integer: -1) == -1).must_equal true
+    
+    (BTC::ScriptNumber.new(integer: 0) == BTC::ScriptNumber.new(integer: 0)).must_equal true
+    (BTC::ScriptNumber.new(integer: 1) == BTC::ScriptNumber.new(integer: 1)).must_equal true
+    (BTC::ScriptNumber.new(integer: -1) == BTC::ScriptNumber.new(integer: -1)).must_equal true
+
+    (BTC::ScriptNumber.new(integer: 0) != 0).must_equal false
+    (BTC::ScriptNumber.new(integer: 1) != 1).must_equal false
+    (BTC::ScriptNumber.new(integer: -1) != -1).must_equal false
+    (BTC::ScriptNumber.new(integer: 0) != BTC::ScriptNumber.new(integer: 0)).must_equal false
+    (BTC::ScriptNumber.new(integer: 1) != BTC::ScriptNumber.new(integer: 1)).must_equal false
+    (BTC::ScriptNumber.new(integer: -1) != BTC::ScriptNumber.new(integer: -1)).must_equal false
+  end
+  
+  it "should support #-" do
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = sn - 20
+    sn -= 3
+    sn.must_equal 100
+  end
+
+  it "should support #+" do
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = sn + 20
+    sn += 7
+    sn.must_equal 150
+  end
+  
+  it "should support unary minus operator" do
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = -sn
+    sn.must_equal -123
+  end
+  
+  it "should support unary plus operator" do
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = +sn
+    sn.must_equal 123
+  end
+
+  def should_raise(message)
+    raised = false
+    begin
+      yield
+    rescue => e
+      if e.message == message
+        raised = true
+      else
+        raise "Raised unexpected exception: #{e}"
+      end
+    end
+    if !raised
+      raise "Should have raised #{message.inspect}!"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: btcruby
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Oleg Andreev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -156,6 +156,7 @@ files:
 - spec/open_assets/issuance_id_spec.rb
 - spec/proof_of_work_spec.rb
 - spec/script_interpreter_spec.rb
+- spec/script_number_spec.rb
 - spec/script_spec.rb
 - spec/secp256k1_spec.rb
 - spec/spec_helper.rb
@@ -207,6 +208,7 @@ test_files:
 - spec/open_assets/issuance_id_spec.rb
 - spec/proof_of_work_spec.rb
 - spec/script_interpreter_spec.rb
+- spec/script_number_spec.rb
 - spec/script_spec.rb
 - spec/secp256k1_spec.rb
 - spec/transaction_builder_spec.rb