btcruby 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b9b9d085300b3e99129f1512fa8b0b7794a4aa4
-  data.tar.gz: 7fc8e5d75b7518afd548c7c5dbf49b7c98ec7f7a
+  metadata.gz: f1937e58fcda56495863a298341de0e58def9807
+  data.tar.gz: 4b1dab008f068d52b3bfd69dc7816c03c3fd05aa
 SHA512:
-  metadata.gz: 408fcbdd2fdc406a450382dcce2c86744a7c718f5a4d770a3a7c714f56a28b674d51a450968a2af857bac8c8390f37438efc8db8ef6e5003dc35a4623b3d5204
-  data.tar.gz: 48b073e59fa89922faa469dff926beff3261ef762270efd18de1ba31aabb5506ff84d7297d582192d392d7daee4fec7bb284ee04e0d5445e920dd9df62ead358
+  metadata.gz: 1f73e371b4252cd9b0a16db3fc68dbcba11122dd4dd4e9fa7dc95468d3c438c82ac8463d5b63632d58ad037a3fc81f55640111eda88792f80cb28a8961c11eba
+  data.tar.gz: 09f11c01667ca03872e1de72a676d454803742538f02822b8a599985768c68287a40e5fe8087083186cb3613f76039c4aef41a759b5aff3fcb1cbfe0470e7eb5

data/RELEASE_NOTES.md

@@ -2,6 +2,13 @@
 BTCRuby Release Notes
 =====================
 
+1.0.7 (July 19, 2015)
+--------------------
+
+* Script `subscript` and `find_and_delete` APIs.
+* Fixed block parsing API (list of transactions was always empty).
+* Added OP_CHECKLOCKTIMEVERIFY.
+
 1.0.6 (July 13, 2015)
 --------------------
 

data/lib/btcruby/block.rb

@@ -82,7 +82,7 @@ module BTC
                    time: nil,
                    bits: 0,
                    nonce: 0,
-                   transactions: [],
+                   transactions: nil,
 
                    # optional attributes
                    height: nil,
@@ -103,6 +103,7 @@ module BTC
       )
 
       @transactions = transactions if transactions
+      @transactions ||= []
     end
 
     def init_with_stream(stream)

data/lib/btcruby/opcode.rb

@@ -179,6 +179,7 @@ module BTC
   # Expansion
   OP_NOP1  = 0xb0
   OP_NOP2  = 0xb1
+  OP_CHECKLOCKTIMEVERIFY = OP_NOP2 # See BIP65
   OP_NOP3  = 0xb2
   OP_NOP4  = 0xb3
   OP_NOP5  = 0xb4

data/lib/btcruby/script.rb

@@ -238,7 +238,7 @@ module BTC
     # and a new script instance is returned.
     def without_dropped_prefix_data
       if dropped_prefix_data
-        return Script.new << @chunks[2..-1]
+        return self.class.new << @chunks[2..-1]
       end
       self
     end
@@ -278,7 +278,7 @@ module BTC
 
     # Complete copy of a script.
     def dup
-      BTC::Script.new(data: self.data)
+      self.class.new(data: self.data)
     end
 
     def ==(other)
@@ -314,7 +314,7 @@ module BTC
     # Wraps the recipient into an output P2SH script
     # (OP_HASH160 <20-byte hash of the recipient> OP_EQUAL).
     def p2sh_script
-      Script.new << OP_HASH160 << BTC.hash160(self.data) << OP_EQUAL
+      self.class.new << OP_HASH160 << BTC.hash160(self.data) << OP_EQUAL
     end
 
 
@@ -326,18 +326,18 @@ module BTC
     def simulated_signature_script(strict: true)
       if public_key_hash_script?
          # assuming non-compressed pubkeys to be conservative
-        return Script.new << Script.simulated_signature(hashtype: SIGHASH_ALL) << Script.simulated_uncompressed_pubkey
+        return self.class.new << Script.simulated_signature(hashtype: SIGHASH_ALL) << Script.simulated_uncompressed_pubkey
 
       elsif public_key_script?
-        return Script.new << Script.simulated_signature(hashtype: SIGHASH_ALL)
+        return self.class.new << Script.simulated_signature(hashtype: SIGHASH_ALL)
 
       elsif script_hash_script? && !strict
         # This is a wild approximation, but works well if most p2sh scripts are 2-of-3 multisig scripts.
         # If you have a very particular smart contract scheme you should not use TransactionBuilder which estimates fees this way.
-        return Script.new << OP_0 << [Script.simulated_signature(hashtype: SIGHASH_ALL)]*2 << Script.simulated_multisig_script(2,3).data
+        return self.class.new << OP_0 << [Script.simulated_signature(hashtype: SIGHASH_ALL)]*2 << Script.simulated_multisig_script(2,3).data
 
       elsif multisig_script?
-        return Script.new << OP_0 << [Script.simulated_signature(hashtype: SIGHASH_ALL)]*self.multisig_signatures_required
+        return self.class.new << OP_0 << [Script.simulated_signature(hashtype: SIGHASH_ALL)]*self.multisig_signatures_required
       else
         return nil
       end
@@ -360,7 +360,7 @@ module BTC
 
     # Returns a dummy script that simulates m-of-n multisig script
     def self.simulated_multisig_script(m,n)
-      Script.new <<
+      self.new <<
         Opcode.opcode_for_small_integer(m) <<
         [simulated_uncompressed_pubkey]*n  << # assuming non-compressed pubkeys to be conservative
         Opcode.opcode_for_small_integer(n) <<
@@ -384,9 +384,9 @@ module BTC
     # Appends a pushdata opcode with the most compact encoding.
     # Optional opcode may be equal to OP_PUSHDATA1, OP_PUSHDATA2, or OP_PUSHDATA4.
     # ArgumentError is raised if opcode does not represent a given data length.
-    def append_pushdata(pushdata, opcode: nil)
-      raise ArgumentError, "No pushdata is given" if !pushdata
-      encoded_pushdata = self.class.encode_pushdata(pushdata, opcode: opcode)
+    def append_pushdata(data, opcode: nil)
+      raise ArgumentError, "No data provided" if !data
+      encoded_pushdata = self.class.encode_pushdata(data, opcode: opcode)
       if !encoded_pushdata
         raise ArgumentError, "Cannot encode pushdata with opcode #{opcode}"
       end
@@ -433,11 +433,7 @@ module BTC
           self << element
         end
       elsif object.is_a?(Chunk)
-        if object.pushdata?
-          append_pushdata(object.pushdata)
-        else
-          append_opcode(object.opcode)
-        end
+        @chunks << object
       else
         raise ArgumentError, "Operand must be an integer, a string a BTC::Script instance or an array of any of those."
       end
@@ -449,9 +445,40 @@ module BTC
       self.dup << other
     end
 
-
-
-
+    # Same arguments as with Array#[].
+    def subscript(*args)
+      self.class.new << chunks[*args]
+    end
+    alias_method :[], :subscript
+
+    # Removes chunks matching subscript byte-for-byte and returns a new script instance with subscript removed.
+    # So if pushdata items are encoded differently, they won't match.
+    # Consensus-critical code.
+    def find_and_delete(subscript)
+      subscript.is_a?(Script) or raise ArgumentError,"Argument must be an instance of BTC::Script"
+      # Replacing [a b a]
+      # Script: a b b a b a b a c
+      # Result: a b b       b a c
+      subscriptsize = subscript.chunks.size
+      buf = []
+      i = 0
+      result = self.class.new
+      chunks.each do |chunk|
+        if chunk == subscript.chunks[i]
+          buf << chunk
+          i+=1
+          if i == subscriptsize # matched the whole subscript
+            i = 0
+            buf.clear
+          end
+        else
+          i = 0
+          result << buf
+          result << chunk
+        end
+      end
+      result
+    end
 
 
     # Private API
@@ -708,6 +735,10 @@ module BTC
         @raw_data = raw_data
       end
 
+      def ==(other)
+        @raw_data == other.raw_data
+      end
+
       protected
 
       def data_is_ascii_printable?(data)

data/lib/btcruby/version.rb

@@ -1,3 +1,3 @@
 module BTC
-  VERSION = "1.0.6".freeze
+  VERSION = "1.0.7".freeze
 end

data/spec/script_spec.rb

@@ -62,5 +62,33 @@ describe BTC::Script do
 
   end
 
+  it "should support subscripts" do
+    s = Script.new << OP_DUP << OP_HASH160 << OP_CODESEPARATOR << "some data" << OP_EQUALVERIFY << OP_CHECKSIG
+    s.subscript(0..-1).must_equal s
+    s[0..-1].must_equal s
+    s.subscript(3..-1).must_equal(Script.new << "some data" << OP_EQUALVERIFY << OP_CHECKSIG)
+    s[3..-1].must_equal(Script.new << "some data" << OP_EQUALVERIFY << OP_CHECKSIG)
+  end
+
+
+  it "removing subscript does not modify receiver" do
+    s = Script.new << OP_DUP << OP_HASH160 << OP_CODESEPARATOR << "some data" << OP_EQUALVERIFY << OP_CHECKSIG
+    s1 = s.dup
+    s2 = s1.find_and_delete(Script.new << OP_HASH160)
+    s.must_equal s1
+    s2.must_equal(Script.new << OP_DUP << OP_CODESEPARATOR << "some data" << OP_EQUALVERIFY << OP_CHECKSIG)
+  end
+
+  it "should find subsequence" do
+    s = Script.new << OP_1 << OP_3 << OP_1 << OP_2 << OP_1 << OP_2 << OP_1 << OP_3
+    s2 = s.find_and_delete(Script.new << OP_1 << OP_2 << OP_1)
+    s2.must_equal(Script.new << OP_1 << OP_3 << OP_2 << OP_1 << OP_3)
+  end
+
+  it "should not find-and-delete non-matching encoding for the same pushdata" do
+    s = Script.new.append_pushdata("foo").append_pushdata("foo", opcode:OP_PUSHDATA1)
+    s2 = s.find_and_delete(Script.new << "foo")
+    s2.must_equal(Script.new.append_pushdata("foo", opcode:OP_PUSHDATA1))
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: btcruby
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Oleg Andreev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi