btcruby 1.2.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cefd4033ae3596836149bf235bb94b7f1b3d6963
-  data.tar.gz: 74ebe0b3428d48d91bda78772ec5c84743ce6723
+  metadata.gz: 1ade4ab5ec4e048a83afbdf1d80da87d6cb78b65
+  data.tar.gz: df6796d9c48c3b71aad7916fec52a82bff17e09b
 SHA512:
-  metadata.gz: c268750c6b2707040f17dee13781809a8bd3e7a36241ceaa5027fe7bc24bfef4e8eec4a13db209fa49c23575550ad6edbfe27ca01591cc2a7d4c08065286c38f
-  data.tar.gz: 2c610aecba52ae7c9a5cf920e2aa6371b0950a1ee39afc95d9c78950a189273d2091c5c98f4cdadc74876b2178f83d5f0ab59a09e422f26ce7a501ef8a228bcf
+  metadata.gz: 115dcbaf2fdc9a208b317502767ece0935d5d186dca3ce8e59f666236b499f374044c307b800091f7eaf6e9759dd41daa68db7f06293b7e65de5a635f3558044
+  data.tar.gz: 795b12ce7b5d35aaa82b0c929facaf1532792f06cbe96727585649ec824009bea6f495a686f35f9626e1404d05b96026167bbe81ee6d3e0ae52bef9e677a0109

data/RELEASE_NOTES.md

@@ -2,6 +2,13 @@
 BTCRuby Release Notes
 =====================
 
+1.3 (November 24, 2015)
+-----------------------
+
+* `BTC::Script#op_return_script?` now returns `true` for all scripts with first opcode `OP_RETURN`, including scripts with just that opcode or non-pushdata opcodes after it.
+* `BTC::Script#op_return_data_only_script?` now returns `true` only if there is at least one pushdata chunk after `OP_RETURN` opcode and all subsequent opcodes are pushdata-only.
+
+
 1.2.2 (November 12, 2015)
 -----------------------
 

data/lib/btcruby/script/script.rb

@@ -191,12 +191,18 @@ module BTC
     # Returns true if this script is a 'OP_RETURN <data>' script and
     # data size is within 40 bytes.
     def standard_op_return_script?
-      retun false if !op_return_script? || @chunks.size != 2
+      retun false if !op_return_data_only_script? || @chunks.size != 2
       @chunks[1].pushdata.bytesize <= 40
     end
 
-    # Returns true if this script is of form 'OP_RETURN <data>'
+    # Returns true if this script's first opcode is OP_RETURN.
     def op_return_script?
+      return @chunks.size >= 1 &&
+             @chunks[0].opcode == OP_RETURN
+    end
+    
+    # Returns true if this script is of form 'OP_RETURN <data>'
+    def op_return_data_only_script?
       return @chunks.size >= 2 &&
              @chunks[0].opcode == OP_RETURN &&
              @chunks[1..-1].all?{|c| c.pushdata? }
@@ -205,14 +211,14 @@ module BTC
     # Returns first data chunk if this script is 'OP_RETURN <data>'.
     # Otherwise returns nil.
     def op_return_data
-      return nil if !op_return_script?
+      return nil if !op_return_data_only_script?
       return @chunks[1].pushdata
     end
 
     # Returns all data chunks if this script is 'OP_RETURN <data> [<data>...]'
     # Most commonly returned array contains one binary string.
     def op_return_items
-      return nil if !op_return_script?
+      return nil if !op_return_data_only_script?
       return @chunks[1, @chunks.size-1].map{|c| c.pushdata}
     end
 
@@ -220,7 +226,7 @@ module BTC
     # Only checks the prefix and minimal length, does not validate the content.
     # Use this method to quickly filter out non-asset transactions.
     def open_assets_marker?
-      return false if !op_return_script?
+      return false if !op_return_data_only_script?
       data = op_return_data
       return false if !data || data.bytesize < 6
       if data[0, AssetMarker::PREFIX_V1.bytesize] == AssetMarker::PREFIX_V1

data/lib/btcruby/version.rb

@@ -1,3 +1,3 @@
 module BTC
-  VERSION = "1.2.2".freeze
+  VERSION = "1.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: btcruby
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: '1.3'
 platform: ruby
 authors:
 - Oleg Andreev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi