btcruby 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16766d44b49b6e361fcd92e76421a0ba4f815fa6
-  data.tar.gz: 92aaedfe9cda6fcfc87ce9f6b158adbb3237e847
+  metadata.gz: cefd4033ae3596836149bf235bb94b7f1b3d6963
+  data.tar.gz: 74ebe0b3428d48d91bda78772ec5c84743ce6723
 SHA512:
-  metadata.gz: 5cab2a47cbb54f031fe4a8f57360657a9790cd1f56843b53d613e40c840612fd35f3910822e2a1f46e9a5f33eb3b84c60635c842d71ec0c1963e19e107cadbfc
-  data.tar.gz: bd806cad97401ba874414b63f0c35cd095e7dae9e28f9ac3e16cc4bcb7caf123a88713d24a05bc2f0f0619dd0ed965e8a000171f47a47a2b55ac1ea4f39def04
+  metadata.gz: c268750c6b2707040f17dee13781809a8bd3e7a36241ceaa5027fe7bc24bfef4e8eec4a13db209fa49c23575550ad6edbfe27ca01591cc2a7d4c08065286c38f
+  data.tar.gz: 2c610aecba52ae7c9a5cf920e2aa6371b0950a1ee39afc95d9c78950a189273d2091c5c98f4cdadc74876b2178f83d5f0ab59a09e422f26ce7a501ef8a228bcf

data/README.md

@@ -62,9 +62,10 @@ $ rake
 4. Generate and publish the gem:
 
 ```
+$ git tag VERSION
 $ git push origin --tags
 $ gem build btcruby.gemspec
-$ gem push btcruby-VER.gem
+$ gem push btcruby-VERSION.gem
 ```
 
 ## Authors

data/RELEASE_NOTES.md

@@ -2,6 +2,12 @@
 BTCRuby Release Notes
 =====================
 
+1.2.2 (November 12, 2015)
+-----------------------
+
+* Added support for inserting scripts during script execution in `BTC::ScriptInterpreter`.
+
+
 1.2.1 (September 8, 2015)
 -----------------------
 

data/lib/btcruby/script/p2sh_extension.rb

@@ -25,6 +25,9 @@ module BTC
       signature_script = @signature_script
       @signature_script = nil
 
+      # NOTE: check for empty stack or "false" item happens
+      # in ScriptInterpreter before this callback is invoked.
+
       # If output script is not P2SH, do nothing.
       return true if !output_script.p2sh?
 

data/lib/btcruby/script/script_interpreter.rb

@@ -46,7 +46,7 @@ module BTC
                    integer_max_size:  4,
                    locktime_max_size: 5)
       @flags             = flags
-      @extensions           = extensions || []
+      @extensions        = extensions || []
       @signature_checker = signature_checker
       
       @raise_on_failure  = raise_on_failure
@@ -142,7 +142,8 @@ module BTC
 
       # Altstack is not shared between individual runs, but we still store it in ivar to make available to the extensions.
       @altstack = []
-
+      @run_script_chunks = script.chunks.to_a.dup # can be modified by `insert_script`
+      
       number_zero  = ScriptNumber.new(integer: 0)
       number_one   = ScriptNumber.new(integer: 1)
       zero_value = "".b
@@ -153,8 +154,11 @@ module BTC
       require_minimal = flag?(SCRIPT_VERIFY_MINIMALDATA)
       condition_flags = []
       index_after_codeseparator = 0
-      script.chunks.each_with_index do |chunk, chunk_index|
-
+      chunk_index = -1 # start with -1 because we increment it in the beginning of the loop.
+      
+      while chunk = @run_script_chunks.shift
+        chunk_index += 1
+        
         opcode = chunk.opcode
         should_execute = !condition_flags.include?(false)
 
@@ -652,8 +656,8 @@ module BTC
               return set_error(SCRIPT_ERR_INVALID_STACK_OPERATION)
             end
 
-            sig = @stack[-2]
-            pubkey    = @stack[-1]
+            sig    = @stack[-2]
+            pubkey = @stack[-1]
 
             # Subset of script starting at the most recent codeseparator
             subscript = script.subscript(index_after_codeseparator..-1)
@@ -814,7 +818,13 @@ module BTC
     rescue ScriptNumberError => e
       return set_error(SCRIPT_ERR_UNKNOWN_ERROR, e.message)
     end # run_script
-
+    
+    
+    # Inserts another script for execution within run_script call.
+    def insert_script(script)
+      @run_script_chunks = script.chunks.to_a + @run_script_chunks
+    end
+    
 
     def stack_pop
       r = @stack.pop

data/lib/btcruby/version.rb

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

metadata

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