btcruby 1.1.6 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e73f94175000adb419e6113bafc872a4ed2085fe
-  data.tar.gz: d77e81499ba58dcfbb3b46e3be208fc5680d60a4
+  metadata.gz: 69203af0ce59eee2b3131a2df44cae9a7ca517be
+  data.tar.gz: f5fc80c6a9fed850298d7eb9b5812af45474e0d6
 SHA512:
-  metadata.gz: 29ef9077eae00c04723693c7ca5ce068010f8f1c419344e89c6ca7272de4c4cc46c4ab3cd483104a8857ba131e8ecfbfcba99dff4060a2cda43471b762aecabf
-  data.tar.gz: 0bb1d1e596806f3700cdcb2869440d3432be01b95b19d8eddf86771785f5e605ea9a0160559287ccc1d10d2f8b58992a7ec9da78e5cfa9d2ca6d0ebfca88a68c
+  metadata.gz: 82f4dcc9b9114d38049baddc9675bbbde98ced25699cf4c03f9ff01c83217e265c06d096b6d945e967424ddad6b2975b755d821d5bfaecb1e9553b97c52d9bb3
+  data.tar.gz: 4818136ee80be83560ed4432889eb80de6b14973f1f8448cadebfc35cd47103f6ede63753656fc3b9ffcb32bdf814381abce98fd8dcd4d240f182182075bd497

data/lib/btcruby/script/{cltv_plugin.rb → cltv_extension.rb}

@@ -1,7 +1,7 @@
 module BTC
   # Performs CHECKLOCKTIMEVERIFY (BIP65) evaluation
-  class CLTVPlugin
-    include ScriptInterpreterPlugin
+  class CLTVExtension
+    include ScriptInterpreterExtension
 
     # Default `locktime_max_size` is 5.
     # Default `lock_time_checker` equals current interpreter's signature checker.

data/lib/btcruby/script/{p2sh_plugin.rb → p2sh_extension.rb}

@@ -1,15 +1,15 @@
 module BTC
   # Performs Pay-to-Script-Hash (BIP16) evaluation
-  class P2SHPlugin
-    include ScriptInterpreterPlugin
+  class P2SHExtension
+    include ScriptInterpreterExtension
 
     # Returns additional flags to be available to #flag? checks during script execution.
-    # This way one plugin can affect evaluation of another.
+    # This way one extension can affect evaluation of another.
     def extra_flags
       SCRIPT_VERIFY_P2SH
     end
 
-    # Every plugin gets this callback. If plugin return `false`, execution is stopped and interpreter returns `false`.
+    # Every extension gets this callback. If extension return `false`, execution is stopped and interpreter returns `false`.
     # Default value is `true`.
     def did_execute_signature_script(interpreter: nil, signature_script: nil)
       @signature_script = signature_script

data/lib/btcruby/script/script_interpreter.rb

@@ -15,9 +15,9 @@ module BTC
     include ScriptErrors
     include Opcodes
 
-    # Flags specified for this interpreter, not including flags added by plugins.
+    # Flags specified for this interpreter, not including flags added by extensions.
     attr_accessor :flags
-    attr_accessor :plugins
+    attr_accessor :extensions
     attr_accessor :signature_checker
     attr_accessor :raise_on_failure
     attr_accessor :max_pushdata_size
@@ -36,7 +36,7 @@ module BTC
     # (required if the scripts use signature-checking opcodes).
     # Checker can be transaction checker or block checker
     def initialize(flags:             SCRIPT_VERIFY_NONE,
-                   plugins:           nil,
+                   extensions:           nil,
                    signature_checker: nil,
                    raise_on_failure:  false,
                    max_pushdata_size: MAX_SCRIPT_ELEMENT_SIZE,
@@ -46,7 +46,7 @@ module BTC
                    integer_max_size:  4,
                    locktime_max_size: 5)
       @flags             = flags
-      @plugins           = plugins || []
+      @extensions           = extensions || []
       @signature_checker = signature_checker
       
       @raise_on_failure  = raise_on_failure
@@ -69,8 +69,8 @@ module BTC
         return set_error(SCRIPT_ERR_SIG_PUSHONLY)
       end
 
-      if plugin = plugin_to_handle_scripts(signature_script, output_script)
-        return plugin.handle_scripts(
+      if extension = extension_to_handle_scripts(signature_script, output_script)
+        return extension.handle_scripts(
           interpreter: self,
           signature_script: signature_script,
           output_script: output_script
@@ -87,13 +87,13 @@ module BTC
         return false
       end
 
-      # This is implemented in P2SHPlugin
+      # This is implemented in P2SHExtension
       # stack_copy = if flag?(SCRIPT_VERIFY_P2SH)
       #   @stack.dup
       # end
 
-      if plugin = plugin_to_handle_output_script(output_script)
-        return plugin.handle_output_script(
+      if extension = extension_to_handle_output_script(output_script)
+        return extension.handle_output_script(
           interpreter: self,
           output_script: output_script
         ) && verify_clean_stack_if_needed
@@ -118,7 +118,7 @@ module BTC
       end
 
       # Additional validation for pay-to-script-hash (P2SH) transactions:
-      # See P2SHPlugin#did_execute_output_script.
+      # See P2SHExtension#did_execute_output_script.
 
       return verify_clean_stack_if_needed
     end
@@ -140,7 +140,7 @@ module BTC
         return set_error(SCRIPT_ERR_SCRIPT_SIZE)
       end
 
-      # Altstack is not shared between individual runs, but we still store it in ivar to make available to the plugins.
+      # Altstack is not shared between individual runs, but we still store it in ivar to make available to the extensions.
       @altstack = []
 
       number_zero  = ScriptNumber.new(integer: 0)
@@ -169,10 +169,10 @@ module BTC
           end
         end
         
-        # Check if there is a plugin for this opcode before we check for disabled opcodes.
-        opcode_plugin = plugin_to_handle_opcode(opcode)
+        # Check if there is a extension for this opcode before we check for disabled opcodes.
+        opcode_extension = extension_to_handle_opcode(opcode)
         
-        if !opcode_plugin
+        if !opcode_extension
           if opcode == OP_CAT ||
              opcode == OP_SUBSTR ||
              opcode == OP_LEFT ||
@@ -200,9 +200,9 @@ module BTC
           end
           stack_push(chunk.pushdata)
 
-        elsif should_execute && opcode_plugin
+        elsif should_execute && opcode_extension
           
-          if !opcode_plugin.handle_opcode(interpreter: self, opcode: opcode)
+          if !opcode_extension.handle_opcode(interpreter: self, opcode: opcode)
             # error is set already
             return false
           end
@@ -224,7 +224,7 @@ module BTC
           when OP_NOP
             # nothing
             
-          # See CLTVPlugin
+          # See CLTVExtension
           # when OP_CHECKLOCKTIMEVERIFY
           #   begin
           #     if !flag?(SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)
@@ -896,7 +896,7 @@ module BTC
     end
 
     def all_flags
-      @plugins.inject(@flags) do |f, p|
+      @extensions.inject(@flags) do |f, p|
         f | p.extra_flags
       end
     end
@@ -929,44 +929,44 @@ module BTC
 
     private
 
-    def plugin_to_handle_scripts(signature_script, output_script)
-      @plugins.each do |plugin|
-        if plugin.should_handle_scripts(interpreter: self, signature_script: signature_script, output_script: output_script)
-          return plugin
+    def extension_to_handle_scripts(signature_script, output_script)
+      @extensions.each do |extension|
+        if extension.should_handle_scripts(interpreter: self, signature_script: signature_script, output_script: output_script)
+          return extension
         end
       end
       nil
     end
 
-    def plugin_to_handle_output_script(output_script)
-      @plugins.each do |plugin|
-        if plugin.should_handle_output_script(interpreter: self, output_script: output_script)
-          return plugin
+    def extension_to_handle_output_script(output_script)
+      @extensions.each do |extension|
+        if extension.should_handle_output_script(interpreter: self, output_script: output_script)
+          return extension
         end
       end
       nil
     end
 
-    def plugin_to_handle_opcode(opcode)
-      @plugins.each do |plugin|
-        if plugin.should_handle_opcode(interpreter: self, opcode: opcode)
-          return plugin
+    def extension_to_handle_opcode(opcode)
+      @extensions.each do |extension|
+        if extension.should_handle_opcode(interpreter: self, opcode: opcode)
+          return extension
         end
       end
       nil
     end
 
     def did_execute_signature_script(signature_script)
-      @plugins.each do |plugin|
-        if !plugin.did_execute_signature_script(interpreter: self, signature_script: signature_script)
+      @extensions.each do |extension|
+        if !extension.did_execute_signature_script(interpreter: self, signature_script: signature_script)
           return false
         end
       end
     end
 
     def did_execute_output_script(output_script)
-      @plugins.each do |plugin|
-        if !plugin.did_execute_output_script(interpreter: self, output_script: output_script)
+      @extensions.each do |extension|
+        if !extension.did_execute_output_script(interpreter: self, output_script: output_script)
           return false
         end
       end

data/lib/btcruby/script/{script_interpreter_plugin.rb → script_interpreter_extension.rb}

@@ -1,5 +1,5 @@
 module BTC
-  # ScriptInterpreterPlugin allows adding extensions to the script machinery without requiring source code meddling.
+  # ScriptInterpreterExtension allows adding extensions to the script machinery without requiring source code meddling.
   # ScriptInterpreter provides several extension points:
   # - extra flags (e.g. requirement for push-only opcodes in signature script)
   # - pre-flight hook to completely take control over both scripts' execution
@@ -7,19 +7,19 @@ module BTC
   # - interior hook to take control over output script execution after signature script is being executed
   # - callback after output script execution
   # - hook for handling the opcodes
-  module ScriptInterpreterPlugin
+  module ScriptInterpreterExtension
     include ScriptFlags
     include ScriptErrors
     include Opcodes
 
     # Returns additional flags to be available to #flag? checks during script execution.
-    # This way one plugin can affect evaluation of another.
+    # This way one extension can affect evaluation of another.
     def extra_flags
       0
     end
 
-    # The first plugin that returns true takes control over both scripts via `handle_scripts`.
-    # No other callbacks are called for this plugin or any other.
+    # The first extension that returns true takes control over both scripts via `handle_scripts`.
+    # No other callbacks are called for this extension or any other.
     # Default value is `false`.
     def should_handle_scripts(interpreter: nil, signature_script: nil, output_script: nil)
       false
@@ -30,14 +30,14 @@ module BTC
       false
     end
 
-    # Every plugin gets this callback. If plugin return `false`, execution is stopped and interpreter returns `false`.
+    # Every extension gets this callback. If extension return `false`, execution is stopped and interpreter returns `false`.
     # Default value is `true`.
     def did_execute_signature_script(interpreter: nil, signature_script: nil)
       true
     end
 
-    # The first plugin that returns true takes control over output script via #handle_output_script.
-    # No other callbacks are called for this plugin or any other.
+    # The first extension that returns true takes control over output script via #handle_output_script.
+    # No other callbacks are called for this extension or any other.
     # Default value is `false`.
     def should_handle_output_script(interpreter: nil, output_script: nil)
       false
@@ -48,13 +48,13 @@ module BTC
       false
     end
 
-    # Every plugin gets this callback. If plugin return `false`, execution is stopped and interpreter returns `false`.
+    # Every extension gets this callback. If extension return `false`, execution is stopped and interpreter returns `false`.
     # Default value is `true`.
     def did_execute_output_script(interpreter: nil, output_script: nil)
       true
     end
 
-    # The first plugin that returns true takes control over that opcode.
+    # The first extension that returns true takes control over that opcode.
     # Default value is `false`.
     def should_handle_opcode(interpreter: nil, opcode: nil)
       false

data/lib/btcruby/version.rb

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

data/lib/btcruby.rb

@@ -41,9 +41,9 @@ require_relative 'btcruby/script/signature_checker.rb'
 require_relative 'btcruby/script/test_signature_checker.rb'
 require_relative 'btcruby/script/transaction_signature_checker.rb'
 
-require_relative 'btcruby/script/script_interpreter_plugin.rb'
-require_relative 'btcruby/script/p2sh_plugin.rb'
-require_relative 'btcruby/script/cltv_plugin.rb'
+require_relative 'btcruby/script/script_interpreter_extension.rb'
+require_relative 'btcruby/script/p2sh_extension.rb'
+require_relative 'btcruby/script/cltv_extension.rb'
 
 require_relative 'btcruby/transaction_builder.rb'
 require_relative 'btcruby/proof_of_work.rb'

data/spec/script_interpreter_spec.rb

@@ -10,12 +10,12 @@ describe BTC::ScriptInterpreter do
     def verify_script(sig_script, output_script, flags, expected_result, record)
       tx = build_spending_transaction(sig_script, build_crediting_transaction(output_script));
       checker = BTC::TransactionSignatureChecker.new(transaction: tx, input_index: 0)
-      plugins = []
-      plugins << BTC::P2SHPlugin.new if (flags & BTC::ScriptFlags::SCRIPT_VERIFY_P2SH) != 0
-      plugins << BTC::CLTVPlugin.new if (flags & BTC::ScriptFlags::SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY) != 0
+      extensions = []
+      extensions << BTC::P2SHExtension.new if (flags & BTC::ScriptFlags::SCRIPT_VERIFY_P2SH) != 0
+      extensions << BTC::CLTVExtension.new if (flags & BTC::ScriptFlags::SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY) != 0
       interpreter = BTC::ScriptInterpreter.new(
         flags: flags,
-        plugins: plugins,
+        extensions: extensions,
         signature_checker: checker,
         raise_on_failure: false,
       )

data/spec/transaction_spec.rb

@@ -75,12 +75,12 @@ describe BTC::Transaction do
                     end
                     
                     checker = BTC::TransactionSignatureChecker.new(transaction: tx, input_index: txin.index)
-                    plugins = []
-                    plugins << BTC::P2SHPlugin.new if (flags & BTC::ScriptFlags::SCRIPT_VERIFY_P2SH) != 0
-                    plugins << BTC::CLTVPlugin.new if (flags & BTC::ScriptFlags::SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY) != 0
+                    extensions = []
+                    extensions << BTC::P2SHExtension.new if (flags & BTC::ScriptFlags::SCRIPT_VERIFY_P2SH) != 0
+                    extensions << BTC::CLTVExtension.new if (flags & BTC::ScriptFlags::SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY) != 0
                     interpreter = BTC::ScriptInterpreter.new(
                       flags: flags,
-                      plugins: plugins,
+                      extensions: extensions,
                       signature_checker: checker,
                       raise_on_failure: expected_result,
                     )
@@ -123,12 +123,12 @@ describe BTC::Transaction do
       
       # def verify_script(tx, txin, sig_script, output_script, flags, expected_result, record)
       #   checker = TransactionSignatureChecker.new(transaction: tx, input_index: txin.index)
-      #   plugins = []
-      #   plugins << P2SHPlugin.new if (flags & ScriptFlags::SCRIPT_VERIFY_P2SH) != 0
-      #   plugins << CLTVPlugin.new if (flags & ScriptFlags::SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY) != 0
+      #   extensions = []
+      #   extensions << P2SHExtension.new if (flags & ScriptFlags::SCRIPT_VERIFY_P2SH) != 0
+      #   extensions << CLTVExtension.new if (flags & ScriptFlags::SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY) != 0
       #   interpreter = ScriptInterpreter.new(
       #     flags: flags,
-      #     plugins: plugins,
+      #     extensions: extensions,
       #     signature_checker: checker,
       #     raise_on_failure: expected_result,
       #   )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: btcruby
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: '1.2'
 platform: ruby
 authors:
 - Oleg Andreev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -104,15 +104,15 @@ files:
 - lib/btcruby/outpoint.rb
 - lib/btcruby/proof_of_work.rb
 - lib/btcruby/safety.rb
-- lib/btcruby/script/cltv_plugin.rb
+- lib/btcruby/script/cltv_extension.rb
 - lib/btcruby/script/opcode.rb
-- lib/btcruby/script/p2sh_plugin.rb
+- lib/btcruby/script/p2sh_extension.rb
 - lib/btcruby/script/script.rb
 - lib/btcruby/script/script_chunk.rb
 - lib/btcruby/script/script_error.rb
 - lib/btcruby/script/script_flags.rb
 - lib/btcruby/script/script_interpreter.rb
-- lib/btcruby/script/script_interpreter_plugin.rb
+- lib/btcruby/script/script_interpreter_extension.rb
 - lib/btcruby/script/script_number.rb
 - lib/btcruby/script/signature_checker.rb
 - lib/btcruby/script/signature_hashtype.rb