coin-op 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 763ee324d095d2518ed75c63c176c03bc3c2cf8e
-  data.tar.gz: b6eec07e082b37b2cadb269bd741713aad1be530
+  metadata.gz: ddcac303efc3cea02f7d42a2a2a7a9c89d16c292
+  data.tar.gz: 9a14fbb3178a73eeb5379fa486d6551c3c57835a
 SHA512:
-  metadata.gz: 241a753e6a272af37c651c303bf96aa239b725b232a68381e9221e98577d05a21901f8a8ac4f1e01a02b556a2117c19ba907a7e0b480f3ac1f69b2b16b873cb5
-  data.tar.gz: 0c823fc19951647daa65312e0f5af73395594bb52461c5f09dc432a716b9789de484cc5168fb8159308e1d0bc104109506edb1d347b413753cb2d6760da56bc2
+  metadata.gz: b7f368cf4336f909d61a54cad255936c9c8cc5b95bef6ffbdd6025df699b18d7bad1c6e25e2900a05a49df1586a2ed230260a5e1d9c8612d6dd52150ef9db041
+  data.tar.gz: bc80f5346aa7d29608cb3d115188be258cf01e7b0d21b80b8a8d55a77a79fd636c44cd6d90b24ad9e070f25d1f2a3835af5901efcbe2b4ecb264a1937411cc87

data.tar.gz.sig

@@ -1 +1 @@
-,��JH�?:~=\t�U]	��R0�\$ӡ^����P����s��L�bg��\��ٖ����S�i��{��!j��w?-Oe"QTsǍdtMT��U3L1�`�H����/b�l�C�Ӣ�����5U�%ym��z|~��68i��w��C2�A���[��t�Z�������M�ؾ�%���dr�m �ۥ�ĿH
�
+RhGo�k'Y����%�{�V4$aa��81�[�

data/lib/coin-op/bit/input.rb

@@ -6,7 +6,7 @@ module CoinOp::Bit
     include CoinOp::Encodings
 
     attr_reader :native, :output, :binary_sig_hash,
-      :signatures, :sig_hash, :script_sig, :index
+      :signatures, :sig_hash, :script_sig, :index, :sequence
 
     # Takes a Hash containing these fields:
     #
@@ -16,6 +16,8 @@ module CoinOp::Bit
     #
     # Optionally:
     #
+    # * :sequence - an integer used to modify the behavior of lock_time
+    #               defaults to 0xFFFFFFFF (lock_time disabled)
     # * script_sig_asm - the string form of the scriptSig for this input
     #
     def initialize(options={})
@@ -23,7 +25,6 @@ module CoinOp::Bit
         options.values_at :transaction, :index, :output, :network
 
       script_sig_asm = options[:script_sig_asm]
-
       unless @output.is_a? Output
         @output = Output.new(@output, network: @network)
       end
@@ -36,6 +37,11 @@ module CoinOp::Bit
       @native.prev_out = decode_hex(@output.transaction_hash).reverse
       @native.prev_out_index = @output.index
 
+      if options[:sequence]
+        @sequence = options[:sequence].to_i
+        @native.sequence = int_to_byte_array(@sequence, endianness: :little)
+      end
+
       if script_sig_asm
         self.script_sig = Bitcoin::Script.binary_from_string(script_sig_asm)
       end
@@ -63,10 +69,10 @@ module CoinOp::Bit
 
     def to_json(*a)
       {
-        :output => self.output,
-        :signatures => self.signatures.map {|b| hex(b) },
-        :sig_hash => self.sig_hash || "",
-        :script_sig => self.script_sig || ""
+        output: self.output,
+        signatures: self.signatures.map {|b| hex(b) },
+        sig_hash: self.sig_hash || "",
+        script_sig: self.script_sig || ""
       }.to_json(*a)
     end
 
@@ -80,16 +86,16 @@ module CoinOp::Bit
 
     def initialize(binary_hash, index)
       @output = {
-        # the binary hash is the result of 
+        # the binary hash is the result of
         # [tx.hash].pack("H*").reverse
-        :transaction_hash => hex(binary_hash.reverse),
-        :index => index,
+        transaction_hash: hex(binary_hash.reverse),
+        index: index
       }
     end
 
     def to_json(*a)
       {
-        :output => @output,
+        output: @output
       }.to_json(*a)
     end
 
@@ -98,5 +104,3 @@ module CoinOp::Bit
 
 
 end
-
-

data/lib/coin-op/bit/transaction.rb

@@ -17,9 +17,10 @@ module CoinOp::Bit
         data.values_at :version, :lock_time, :fee, :inputs, :outputs, :confirmations
 
       transaction = self.new(
-        :fee => fee,
-        :version => version, :lock_time => lock_time,
-        :confirmations => confirmations,
+        fee: fee,
+        version: version,
+        lock_time: lock_time,
+        confirmations: confirmations,
         network: network
       )
 
@@ -93,15 +94,16 @@ module CoinOp::Bit
     end
 
 
-    attr_reader :native, :inputs, :outputs, :confirmations
+    attr_reader :native, :inputs, :outputs, :confirmations, :lock_time, :version
 
     # A new Transaction contains no inputs or outputs; these can be added with
     # #add_input and #add_output.
-    # FIXME:  version and locktime options are ignored here.
     def initialize(options={})
       @native = Bitcoin::Protocol::Tx.new
       @inputs = []
       @outputs = []
+      @lock_time = @native.lock_time = (options[:lock_time] || 0)
+      @version = @native.ver = (options[:version] || 1)
       @network = options[:network]
       @fee_override = options[:fee]
       @confirmations = options[:confirmations]
@@ -224,13 +226,13 @@ module CoinOp::Bit
     # Typically used only by #to_json.
     def to_hash
       {
-        :confirmations => self.confirmations.nil? ? 0 : self.confirmations,
-        :version => self.version,
-        :lock_time => self.lock_time,
-        :hash => self.hex_hash,
-        :fee => self.fee,
-        :inputs => self.inputs,
-        :outputs => self.outputs
+        confirmations: self.confirmations.nil? ? 0 : self.confirmations,
+        version: self.version,
+        lock_time: self.lock_time,
+        hash: self.hex_hash,
+        fee: self.fee,
+        inputs: self.inputs,
+        outputs: self.outputs
       }
     end
 
@@ -361,13 +363,12 @@ module CoinOp::Bit
     # Takes a bitcoin address and optional metadata Hash.
     def add_change(address, metadata={})
       add_output(
-        :value => change_value,
-        :address => address,
-        :metadata => {:memo => "change"}.merge(metadata)
+        value: change_value,
+        address: address,
+        metadata: {memo: "change"}.merge(metadata)
       )
     end
 
   end
 
 end
-

data/lib/coin-op/encodings.rb

@@ -22,7 +22,14 @@ module CoinOp
       self.decode_hex(::Bitcoin.decode_base58(string))
     end
 
+    def int_to_byte_array(i, endianness: :little)
+      arr = i.to_s(16).scan(/../).map { |x| x.hex.chr }
+      if endianness = :little
+        arr.reverse.join
+      else
+        arr.join
+      end
+    end
   end
 
 end
-

data/lib/coin-op/version.rb

@@ -1,3 +1,3 @@
 module CoinOp
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coin-op
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Matthew King
@@ -32,7 +32,7 @@ cert_chain:
   tdc4VS7IlSRxlZ3dBOgiigy9GXpJ+7F831AqjxL39EPwdr7RguTNz+pi//RKaT/U
   IlpVB+Xfk0vQdP7iYfjGxDzUf0FACMjsR95waJmadKW1Iy6STw2hwPhYIQz1Hu1A
   -----END CERTIFICATE-----
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -197,3 +197,4 @@ signing_key:
 specification_version: 4
 summary: Crypto currency classes in Ruby
 test_files: []
+has_rdoc: