coloredcoins 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b7110f96832703908f365f49cc54d66bc929092
-  data.tar.gz: c16656da6604392b8c96fcae5c5de0d49fa419b0
+  metadata.gz: 6dc49542256b1f86ce32aa7e6a107e7abd8fa590
+  data.tar.gz: fca4a8dfe2efe63b375429dcdf28e8b8e2635020
 SHA512:
-  metadata.gz: 90c41400aecb0bb3e4f485f902cf3c6c7162b907cf71c377799d7d699df4a0f327f74d83c7ec1374b01de374d5f9ead62e55e150a150acf0265ca1edfbea9a6b
-  data.tar.gz: 31f70f9d03eb6b28506071ccea60c0ab4c598798863341bde2e0d56848501c2707b3cfdab6415141d9c03bc0425de2f72c68d6aca0d69927988faa074e72f2fc
+  metadata.gz: 6ab10c67df4296f21fc45b78751860bd191c5cea6504c5f443fd9e43016aa382ef25f683620986f206d65b9f00eae5910a08f2ddd3bd23a1415b84cf57dbfb49
+  data.tar.gz: 16887fe9d1b9eede983785c6fe111aa808ed05dbe9071da01b67bf62f095aea6f79bb8f5b70b2cde2e5688025f847b667b5e9aaed5d041fb31a67b5d89a65282

data/README.md

@@ -1,5 +1,6 @@
 # Coloredcoins
 
+[![Gem Version][rubygems-image]][rubygems-url]
 [![Build Status][travis-image]][travis-url]
 [![Coverage Status][coverage-image]][coverage-url]
 
@@ -122,6 +123,8 @@ Coloredcoins.asset_metadata(asset_id, utxo)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
 
+[rubygems-image]: https://badge.fury.io/rb/coloredcoins.svg
+[rubygems-url]: https://badge.fury.io/rb/coloredcoins
 [travis-image]: https://travis-ci.org/genaromadrid/coloredcoins-ruby.svg?branch=master
 [travis-url]: https://travis-ci.org/genaromadrid/coloredcoins-ruby
 [coverage-image]: https://coveralls.io/repos/github/genaromadrid/coloredcoins-ruby/badge.svg?branch=master

data/lib/coloredcoins.rb

@@ -1,10 +1,12 @@
+require 'bitcoin'
 require 'coloredcoins/version'
 
 module Coloredcoins
-  autoload :API,        'coloredcoins/api'
-  autoload :Connection, 'coloredcoins/connection'
+  autoload :API,         'coloredcoins/api'
+  autoload :Connection,  'coloredcoins/connection'
   autoload :Transaction, 'coloredcoins/transaction'
-  autoload :MultisigTx, 'coloredcoins/multisig_tx'
+  autoload :Multisig,    'coloredcoins/multisig'
+  autoload :MultisigTx,  'coloredcoins/multisig_tx'
 
   attr_writer :api
 

data/lib/coloredcoins/multisig.rb

@@ -0,0 +1,47 @@
+module Coloredcoins
+  class Multisig
+    attr_reader :m, :pub_keys
+    attr_accessor :redeem_script
+
+    def self.valid_sig?(i, script)
+      tx.verify_input_signature(i, script)
+    end
+
+    def initialize(m = nil, pub_keys = nil)
+      @m = m
+      @pub_keys = pub_keys
+    end
+
+    def sign(tx, key)
+      key = Coloredcoins::Transaction.build_key(key)
+      tx.inputs.each_with_index do |input, i|
+        sig_hash   = tx.signature_hash_for_input(i, redeem_script)
+        sigs       = Coloredcoins::Transaction.build_sigs(key, sig_hash)
+        initial    = input.script_sig.or(initial_script)
+
+        input.script_sig = build_script_sig(sigs, sig_hash, initial)
+      end
+    end
+
+    def address
+      @address ||= Bitcoin.hash160_to_p2sh_address(Bitcoin.hash160(redeem_script.hth))
+    end
+
+    def redeem_script
+      @redeem_script ||= Bitcoin::Script.to_p2sh_multisig_script(m, *pub_keys).last
+    end
+
+  private
+
+    def initial_script
+      @initial_script ||= Bitcoin::Script.to_p2sh_multisig_script_sig(redeem_script)
+    end
+
+    def build_script_sig(sigs, sig_hash, initial)
+      sigs.each do |sig|
+        Bitcoin::Script.add_sig_to_multisig_script_sig(sig, initial)
+      end
+      Bitcoin::Script.sort_p2sh_multisig_signatures(initial, sig_hash)
+    end
+  end
+end

data/lib/coloredcoins/multisig_tx.rb

@@ -1,6 +1,9 @@
 module Coloredcoins
   class MultisigTx < Transaction
-    attr_accessor :m, :pub_keys, :redeem_script
+    attr_accessor :m,
+                  :pub_keys,
+                  :redeem_script,
+                  :multisig
 
     def self.build(tx_hex)
       transaction = MultisigTx.new(tx_hex)
@@ -10,45 +13,23 @@ module Coloredcoins
 
     def sign(key)
       check
-      key = build_key(key)
-      tx.inputs.each_with_index do |input, i|
-        sig_hash   = tx.signature_hash_for_input(i, redeem_script)
-        sigs       = build_sigs(key, sig_hash)
-        initial    = input.script_sig.or(initial_script)
-
-        input.script_sig = build_script_sig(sigs, sig_hash, initial)
-      end
+      multisig.sign(tx, key)
       true
     end
 
-    def redeem_script
-      @redeem_script ||= Bitcoin::Script.to_p2sh_multisig_script(m, *pub_keys).last
+    def multisig
+      @multisig ||= Coloredcoins::Multisig.new(m, pub_keys)
     end
 
-    def address
-      @address ||= Bitcoin.hash160_to_p2sh_address(Bitcoin.hash160(redeem_script.hth))
+    def redeem_script=(script)
+      multisig.redeem_script = script
     end
 
   private
 
-    def initial_script
-      @initial_script ||= Bitcoin::Script.to_p2sh_multisig_script_sig(redeem_script)
-    end
-
-    def build_script_sig(sigs, sig_hash, initial)
-      sigs.each do |sig|
-        Bitcoin::Script.add_sig_to_multisig_script_sig(sig, initial)
-      end
-      Bitcoin::Script.sort_p2sh_multisig_signatures(initial, sig_hash)
-    end
-
-    def valid_sig?(i, script)
-      tx.verify_input_signature(i, script)
-    end
-
     def check
-      raise ArgumentError, 'Set "m" before signing' unless m
-      if !pub_keys && !redeem_script
+      raise ArgumentError, 'Set "m" before signing' unless multisig.m
+      if !multisig.pub_keys && !multisig.redeem_script
         raise ArgumentError, 'Set "pub_keys" or "redeem_script" before signing'
       end
     end

data/lib/coloredcoins/transaction.rb

@@ -1,9 +1,20 @@
-require 'bitcoin'
-
 module Coloredcoins
   class Transaction
     attr_reader :tx
 
+    def self.build_key(key)
+      return key if key.is_a?(Array)
+      key = Bitcoin::Key.from_base58(key) unless key.is_a?(Bitcoin::Key)
+      key
+    rescue RuntimeError => e
+      raise InvalidKeyError, 'Invalid key' if e.message == 'Invalid version'
+    end
+
+    def self.build_sigs(key, sig_hash)
+      key = [key] unless key.is_a?(Array)
+      key.map { |k| k.sign(sig_hash) }
+    end
+
     def initialize(hex)
       @tx = Bitcoin::P::Tx.new([hex].pack('H*'))
     end
@@ -27,20 +38,5 @@ module Coloredcoins
       return response[:txId] if response[:txId]
       response
     end
-
-  protected
-
-    def build_key(key)
-      return key if key.is_a?(Array)
-      key = Bitcoin::Key.from_base58(key) unless key.is_a?(Bitcoin::Key)
-      key
-    rescue RuntimeError => e
-      raise InvalidKeyError, 'Invalid key' if e.message == 'Invalid version'
-    end
-
-    def build_sigs(key, sig_hash)
-      key = [key] unless key.is_a?(Array)
-      key.map { |k| k.sign(sig_hash) }
-    end
   end
 end

data/lib/coloredcoins/version.rb

@@ -1,3 +1,3 @@
 module Coloredcoins
-  VERSION = '0.0.0'.freeze
+  VERSION = '0.0.1'.freeze
 end

data/spec/coloredcoins/api_spec.rb

@@ -27,7 +27,7 @@ describe Coloredcoins::API do
     end
   end
 
-  describe 'conncetion methods' do
+  describe 'connection methods' do
     before do
       allow(subject.connection).to receive(:post)
       allow(subject.connection).to receive(:get)
@@ -74,5 +74,27 @@ describe Coloredcoins::API do
         expect(subject.connection).to have_received(:get).with(/assetmetadata/)
       end
     end
+
+    describe 'called from class' do
+      before do
+        @api = Coloredcoins::API.new
+        allow(Coloredcoins).to receive(:api).and_return @api
+        allow(@api).to receive(:send).and_return true
+      end
+
+      %w(
+        issue_asset
+        send_asset
+        broadcast
+        address_info
+        asset_holders
+        asset_metadata
+      ).each do |method|
+        it do
+          Coloredcoins.send(method)
+          expect(@api).to have_received(:send)
+        end
+      end
+    end
   end
 end

data/spec/coloredcoins/multisig_tx_spec.rb

@@ -54,7 +54,7 @@ describe Coloredcoins::MultisigTx do
   end
 
   before do
-    Bitcoin.network = :testnet
+    Bitcoin.network = :testnet3
     Coloredcoins.network = Coloredcoins::TESTNET
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coloredcoins
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Genaro Madrid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -178,6 +178,7 @@ files:
 - lib/coloredcoins.rb
 - lib/coloredcoins/api.rb
 - lib/coloredcoins/connection.rb
+- lib/coloredcoins/multisig.rb
 - lib/coloredcoins/multisig_tx.rb
 - lib/coloredcoins/transaction.rb
 - lib/coloredcoins/version.rb