coloredcoins 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dc49542256b1f86ce32aa7e6a107e7abd8fa590
-  data.tar.gz: fca4a8dfe2efe63b375429dcdf28e8b8e2635020
+  metadata.gz: cc8e4c5b4f4d87e29d1ce9c2e0d5b22890dd75c3
+  data.tar.gz: 3ffc996218444f1665ca80199d326244c33d7a78
 SHA512:
-  metadata.gz: 6ab10c67df4296f21fc45b78751860bd191c5cea6504c5f443fd9e43016aa382ef25f683620986f206d65b9f00eae5910a08f2ddd3bd23a1415b84cf57dbfb49
-  data.tar.gz: 16887fe9d1b9eede983785c6fe111aa808ed05dbe9071da01b67bf62f095aea6f79bb8f5b70b2cde2e5688025f847b667b5e9aaed5d041fb31a67b5d89a65282
+  metadata.gz: 3e207996c656637f96f0f30aaf55cc52b10ac68bf5dc4335447de584e2e78a60c80a86d1c0dc1703a90c79cd38b7192d9d4c6edf2b1957bb6baa3c8db87a30f9
+  data.tar.gz: 1d74d40c5008bad348de132ce5d285d0f9fdf22c312fe04ea6e1954483a1e3df151bd89a8c834d09ebdb4ecc59d650bfb21484293e3a16a19cf4046de23844e5

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+*.sublime-workspace

data/coloredcoins.sublime-project

@@ -0,0 +1,17 @@
+{
+	"folders":
+	[
+		{
+      "file_exclude_patterns": ["*.sublime-workspace"],
+      "folder_exclude_patterns": [
+        "pkg",
+        "coverage",
+        "tmp"
+      ],
+			"path": ".",
+      "follow_symlinks": true,
+      "tab_size": 2,
+      "translate_tabs_to_spaces": false,
+		}
+	]
+}

data/lib/coloredcoins/multisig.rb

@@ -3,10 +3,6 @@ module Coloredcoins
     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
@@ -23,6 +19,10 @@ module Coloredcoins
       end
     end
 
+    def valid_sig?(i, script)
+      tx.verify_input_signature(i, script)
+    end
+
     def address
       @address ||= Bitcoin.hash160_to_p2sh_address(Bitcoin.hash160(redeem_script.hth))
     end
@@ -38,6 +38,8 @@ module Coloredcoins
     end
 
     def build_script_sig(sigs, sig_hash, initial)
+      # sort them first since they could not be sorted comming from a difirent library
+      initial = Bitcoin::Script.sort_p2sh_multisig_signatures(initial, sig_hash)
       sigs.each do |sig|
         Bitcoin::Script.add_sig_to_multisig_script_sig(sig, initial)
       end

data/lib/coloredcoins/multisig_tx.rb

@@ -2,7 +2,6 @@ module Coloredcoins
   class MultisigTx < Transaction
     attr_accessor :m,
                   :pub_keys,
-                  :redeem_script,
                   :multisig
 
     def self.build(tx_hex)
@@ -21,6 +20,10 @@ module Coloredcoins
       @multisig ||= Coloredcoins::Multisig.new(m, pub_keys)
     end
 
+    def redeem_script
+      multisig.redeem_script
+    end
+
     def redeem_script=(script)
       multisig.redeem_script = script
     end

data/lib/coloredcoins/version.rb

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

data/spec/coloredcoins/multisig_tx_spec.rb

@@ -13,6 +13,28 @@ describe Coloredcoins::MultisigTx do
       ec81f128e2eac8e2f0e62465cd8700000000
     ).join
   end
+  let!(:pre_signed_tx_hex) do
+    %w(
+      010000000125b956a45ff3c6927ab85aaed92d88cdbea00a0d813
+      41cfe535b982ab50cf9f700000000fd150100483045022100d57f
+      6d91ce7475d0e47e8ec76f486d1c6a24a04caad93b484b7d0dc3d7
+      d90ac802201e1793473e2c1b88695fe50b99ec8a92b88a947f21cb
+      d073cdf7aa03ffbf269b014cc95241047a130127056525587eac13
+      ad69f23c5e198d596025f65ac33d769e54fa3e3094b7aa4bad47ae
+      c9a0b1d487fd2b4f41eed468079de70f4526c721924ac3bfd12141
+      0442dbb77ea49ebe546982d2ad1cb0bea3ff3abfe8fb6368582956
+      22f8c5cbfd07b5a66e811e5178d8971a5f352299c163258aa6d81b
+      56c980b679f1644b1dfd80410499df3d55d5741a2222d9a5d175e3
+      bbd9124e61b4c7f5830356c0d8082861a0e3c61ee29ec2eaabd693
+      f5f83568dfea0add98b1c3e971b9da7b01ed97ab3b74fb53aeffff
+      ffff03ac0200000000000047512103ffffffffffffffffffffffff
+      ffffffffffffffffffffffffffffffffffffffff2103caf376cb1c
+      b7d09e33bf355c4c7f5b7962502173627efbd1e3d2fc16573a65fb
+      52ae00000000000000001c6a1a4343020287d1e95ca859b73cda02
+      c81c772ba186dc1a12a00110e45c01000000000017a914e1088f81
+      edc427ec81f128e2eac8e2f0e62465cd8700000000
+    ).join
+  end
   let!(:prev_tx_hex) do
     %w(
       0100000001463e1b35f72a4e978f2b7fb82f95823e90e4f50b30
@@ -113,29 +135,56 @@ describe Coloredcoins::MultisigTx do
             expect { subject.to_hex }.not_to raise_error
           end
 
-          context 'when signing with another key' do
+          context 'with another key' do
             let!(:partially_signed_tx) do
               Coloredcoins::MultisigTx.build(subject.to_hex) do |tx|
                 tx.m = m
                 tx.pub_keys = pub_keys
               end
             end
-            let(:tx) { partially_signed_tx.tx }
+            let(:partial_tx) { partially_signed_tx.tx }
+
+            it { expect(partially_signed_tx.to_hex) }
+
+            context 'when signed' do
+              before { partially_signed_tx.sign(keys[1]) }
 
-            it 'should be valid' do
-              partially_signed_tx.sign(keys[1])
-              tx.inputs.each_with_index do |_input, i|
-                expect(tx.verify_input_signature(i, prev_tx)).to be true
+              it 'should be valid' do
+                partial_tx.inputs.each_with_index do |_input, i|
+                  expect(partial_tx.verify_input_signature(i, prev_tx)).to be true
+                end
               end
-            end
 
-            it 'can be converted to hex' do
-              expect { partially_signed_tx.to_hex }.not_to raise_error
+              it 'can be converted to hex' do
+                expect { partially_signed_tx.to_hex }.not_to raise_error
+              end
             end
           end
         end
       end
 
+      context 'with a pre-signed signed tx' do
+        let!(:partially_signed_tx) do
+          Coloredcoins::MultisigTx.build(pre_signed_tx_hex) do |tx|
+            tx.m = m
+            tx.pub_keys = pub_keys
+          end
+        end
+        let(:tx) { partially_signed_tx.tx }
+
+        before { partially_signed_tx.sign(keys[1]) }
+
+        it 'should be valid' do
+          tx.inputs.each_with_index do |_input, i|
+            expect(tx.verify_input_signature(i, prev_tx)).to be true
+          end
+        end
+
+        it 'can be converted to hex' do
+          expect { partially_signed_tx.to_hex }.not_to raise_error
+        end
+      end
+
       context 'with several keys' do
         let!(:key) { [keys[0], keys[1]] }
         before { subject.sign(key) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coloredcoins
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Genaro Madrid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -175,6 +175,7 @@ files:
 - Rakefile
 - bump
 - coloredcoins.gemspec
+- coloredcoins.sublime-project
 - lib/coloredcoins.rb
 - lib/coloredcoins/api.rb
 - lib/coloredcoins/connection.rb