coin-op 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfeba45649380d25bdb450efa635c4abfeb97808
-  data.tar.gz: 9163ba6bb9a926d3e68ac56d52cfedf8a58f5896
+  metadata.gz: 2901af471862b2ef2ccdc2ca7fc7192a71400d93
+  data.tar.gz: 538d7b513fc85ef0da0bdb8175886708766e2bd9
 SHA512:
-  metadata.gz: 5dc4eb2daff6a91ed33309ef74562ec21573c165708825bf616b03f3bf6df2d1ef20ee277d726889fb808b4f99325cee05916e77cd4099eb04ef91ad9969cc4d
-  data.tar.gz: 8186166830812cf399ad01542cc936e156589d42bef51be532e39a61d57324b99c2f72e47022f6799425703b15a2982db6ab270ea995f106113c71c214102c5a
+  metadata.gz: b19ee9fc1272c34d5380ad87eaa4b32e121d17059b80ba97ff568b4e09debdd881b9e0ec78cd63ca35c118bfee9c3541b3cd4dbfc4e6d7815c8f7a65cf26c686
+  data.tar.gz: 57f64f37f1e18e3e1d8b50f7fa8eda1ee89bb6b3e05af583ff39c45e50d04bae46231bd0857051c68df96b68278e8d21c173ab357e1a0ae25cdd19e974250b59

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

@@ -46,7 +46,7 @@ module CoinOp::Bit
 
     def binary_sig_hash=(blob)
       @binary_sig_hash = blob
-      @sig_hash = base58(blob)
+      @sig_hash = hex(blob)
     end
 
     def script_sig=(blob)
@@ -59,7 +59,7 @@ module CoinOp::Bit
     def to_json(*a)
       {
         :output => self.output,
-        :signatures => self.signatures.map {|b| base58(b) },
+        :signatures => self.signatures.map {|b| hex(b) },
         :sig_hash => self.sig_hash || "",
         :script_sig => self.script_sig || ""
       }.to_json(*a)

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

@@ -24,6 +24,7 @@ module CoinOp::Bit
       @trees = {}
       private_trees = options[:private]
 
+      # FIXME: we should allow this.
       if !private_trees
         raise "Must supply :private"
       end
@@ -41,6 +42,17 @@ module CoinOp::Bit
       end
     end
 
+    def get_node(arg)
+      case arg
+      when MoneyTree::Node
+        arg
+      when String
+        MoneyTree::Node.from_serialized_address(arg)
+      else
+        raise "Unusable type: #{node.class}"
+      end
+    end
+
     def drop(*names)
       names = names.map(&:to_sym)
       options = {:private => {}, :public => {}}
@@ -93,9 +105,8 @@ module CoinOp::Bit
       end
     end
 
-    alias_method :public_address, :public_seed
 
-    def private_addresses
+    def private_seeds
       out = {}
       @private_trees.each do |name, tree|
         out[name] = self.private_address(name)
@@ -103,7 +114,7 @@ module CoinOp::Bit
       out
     end
 
-    def public_addresses
+    def public_seeds
       out = {}
       @private_trees.each do |name, node|
         out[name] = node.to_serialized_address
@@ -111,16 +122,9 @@ module CoinOp::Bit
       out
     end
 
-    def get_node(arg)
-      case arg
-      when MoneyTree::Node
-        arg
-      when String
-        MoneyTree::Node.from_serialized_address(arg)
-      else
-        raise "Unusable type: #{node.class}"
-      end
-    end
+    alias_method :public_address, :public_seed
+    alias_method :private_addresses, :private_seeds
+    alias_method :public_addresses, :public_seeds
 
     def path(path)
       options = {
@@ -159,6 +163,13 @@ module CoinOp::Bit
       end
     end
 
+    def set_sig_hashes(transaction)
+      transaction.inputs.each do |input|
+        path = input.output.metadata[:wallet_path]
+        node = self.path(path)
+        input.binary_sig_hash = transaction.sig_hash(input, node.script)
+      end
+    end
 
     # Takes a Transaction and any number of Arrays of signature dictionaries.
     # Each sig_dict in an Array corresponds to the Input with the same index.
@@ -200,11 +211,8 @@ module CoinOp::Bit
   class MultiNode
     include CoinOp::Encodings
 
-    attr_reader :path, :keys, :public_keys
+    attr_reader :path, :private, :public, :keys, :public_keys
     def initialize(options)
-      # m of n 
-      # TODO: take @m from the options
-      @m = 2
       @path = options[:path]
 
       @keys = {}
@@ -222,15 +230,18 @@ module CoinOp::Bit
       end
     end
 
-    def script
+    def script(m=2)
+      # m of n 
       keys = @public_keys.sort_by {|name, key| name }.map {|name, key| key.pub }
-      Script.new(:public_keys => keys, :needed => @m)
+      Script.new(:public_keys => keys, :needed => m)
     end
 
-    def p2sh_address
+    def address
       self.script.p2sh_address
     end
 
+    alias_method :p2sh_address, :address
+
     def p2sh_script
       Script.new(:address => self.script.p2sh_address)
     end

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

@@ -87,9 +87,6 @@ module CoinOp::Bit
         input.instance_eval do
           @native = native
         end
-        if input.is_a? Input
-          input.binary_sig_hash = self.sig_hash(input)
-        end
         # TODO: is this re-nativization necessary for outputs, too?
       end
     end

data/lib/coin-op/crypto.rb

@@ -24,7 +24,7 @@ module CoinOp
       #
       def self.decrypt(passphrase, hash)
         salt, nonce, ciphertext =
-          hash.values_at(:salt, :nonce, :ciphertext).map {|s| decode_base58(s) }
+          hash.values_at(:salt, :nonce, :ciphertext).map {|s| decode_hex(s) }
         box = self.new(passphrase, salt, hash[:iterations])
         box.decrypt(nonce, ciphertext)
       end
@@ -53,10 +53,10 @@ module CoinOp
         nonce = RbNaCl::Random.random_bytes(RbNaCl::SecretBox.nonce_bytes)
         ciphertext = @box.encrypt(nonce, plaintext)
         {
-          :salt => base58(@salt),
+          :salt => hex(@salt),
           :iterations => @iterations,
-          :nonce => base58(nonce),
-          :ciphertext => base58(ciphertext)
+          :nonce => hex(nonce),
+          :ciphertext => hex(ciphertext)
         }
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coin-op
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matthew King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby