coin-op 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 163ba3e319097c3ef801ba1eab58674ee7b0639f
-  data.tar.gz: f44670fc083600954042b19c021ebf3351844f07
+  metadata.gz: 4f45ce27e81850de8f674df80ec2f9e3ca0cf50b
+  data.tar.gz: 9a79c80c8d6b01b2fd384eee10fd017fe6229655
 SHA512:
-  metadata.gz: b5403bd152292deb02970a20fd9e64d02a1bb3f0393dc92785e8994ab812a0c44a0e3f97bb078584e2b4c5a1a94a4889dbfe96d527b23f731f0f992c4a2b3c56
-  data.tar.gz: 567314b251b942fcbed42fe501a4bd369023a4fb098f09564bb95c48049ad5f6188d209f0680e6cc38a4d3223cceca24777bb20f3348a3a9769fac2af62d3617
+  metadata.gz: 3086ad2a8d11b8f290c0077d070332fbf7901a49d6f29839e8fd279e0a120526c282e9ca3a73c63978b7a44677e463643c1e2809767b72c322e97d5797e2c626
+  data.tar.gz: a2e2e284c282cd2e61bd090e146be00794a89b2185f9449dfe8c80c48ccab9a890641ac3cb1fb90520d688645a9f9340bffd3bef1751ccc4736fe19f52681b48

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

@@ -251,13 +251,15 @@ module CoinOp::Bit
     end
 
     def address
-      self.script.p2sh_address
+      script.address
     end
 
-    alias_method :p2sh_address, :address
+    def p2sh_address
+      script.p2sh_address
+    end
 
     def p2sh_script
-      Script.new(:address => self.script.p2sh_address, network: network)
+      Script.new(:address => self.script.address, network: network)
     end
 
     def signatures(value, names:)

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

@@ -104,27 +104,29 @@ module CoinOp::Bit
       self.to_hash.to_json(*a)
     end
 
-    def hash160
-      CoinOp.syncbit(@network[:name]) do
-        @native.get_hash160 || Bitcoin.hash160(@hex)
-      end
-    end
-
     # Generate the script that uses a P2SH address.
     # Used for an Output's scriptPubKey value.  Not much used, and
     # can probably be removed, as I think it is equivalent to
-    # Script.new :address => some_p2sh_address
+    # Script.new :address => some.address
     def p2sh_script
-      CoinOp.syncbit(@network[:name]) do |b|
-        self.class.new Bitcoin::Script.to_p2sh_script(self.hash160)
+      CoinOp.syncbit(@network[:name]) do
+        self.class.new Bitcoin::Script.to_p2sh_script(@native.get_hash160)
       end
     end
 
+    def hash160
+      CoinOp.syncbit(@network[:name]) { Bitcoin.hash160(@hex) }
+    end
+
     def p2sh_address
       Bitcoin.encode_address(self.hash160, Bitcoin::NETWORKS[@network[:name]][:p2sh_version])
     end
 
-    alias_method :address, :p2sh_address
+    def address
+      CoinOp.syncbit(@network[:name]) do 
+        @native.get_address
+      end
+    end
 
     # Generate a P2SH script_sig for the current script, using the
     # supplied options, which will, in the case of a multisig input,

data/lib/coin-op/version.rb

@@ -1,3 +1,3 @@
 module CoinOp
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coin-op
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Matthew King
@@ -32,7 +32,7 @@ cert_chain:
   tdc4VS7IlSRxlZ3dBOgiigy9GXpJ+7F831AqjxL39EPwdr7RguTNz+pi//RKaT/U
   IlpVB+Xfk0vQdP7iYfjGxDzUf0FACMjsR95waJmadKW1Iy6STw2hwPhYIQz1Hu1A
   -----END CERTIFICATE-----
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby