mastercoin-ruby 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/mastercoin-ruby/message.rb

@@ -76,6 +76,10 @@ module Mastercoin
       result
     end
 
+    def explain(sending_address= nil)
+      puts "Not implemented"
+    end
+
 
     def mangle_key_until_valid(key)
       key[64..66] = Random.rand(256).to_s(16).rjust(2,"0")

data/lib/mastercoin-ruby/purchase_offer.rb

@@ -50,8 +50,8 @@ module Mastercoin
       Mastercoin::Util.get_sequence(bitcoin_address)
     end
 
-    def explain
-      "Purchase Offer transaction for %.8f #{self.currency_id_text}." % (self.amount / 1e8)
+    def explain(sending_address= nil)
+      "Purchase Offer transaction for %.8f #{self.currency_id_text} from #{sending_address}." % (self.amount / 1e8)
     end
 
     def currency_id_text

data/lib/mastercoin-ruby/selling_offer.rb

@@ -39,8 +39,8 @@ module Mastercoin
       end
     end
 
-    def explain
-      "Selling Offer of #{(self.amount / 1e8).to_f} #{Mastercoin::CURRENCY_IDS[self.currency_id.to_s]} for #{(self.bitcoin_amount / 1e8).to_f} Bitcoins. Time limit #{self.time_limit}. BTC Fee #{self.transaction_fee}"
+    def explain(sending_address)
+      "Selling Offer from #{sending_address} of #{(self.amount / 1e8).to_f} #{Mastercoin::CURRENCY_IDS[self.currency_id.to_s]} for #{(self.bitcoin_amount / 1e8).to_f} Bitcoins. Time limit #{self.time_limit}. BTC Fee #{self.transaction_fee}"
     end
   end
 end

data/lib/mastercoin-ruby/simple_send.rb

@@ -55,8 +55,8 @@ module Mastercoin
       Mastercoin::TRANSACTION_TYPES.keys.include?(self.transaction_type.to_i.to_s) && Mastercoin::CURRENCY_IDS.keys.include?(self.currency_id.to_s)
     end
 
-    def explain
-      "SimpleSend transaction for %.8f #{self.currency_id_text}." % (self.amount / 1e8)
+    def explain(sending_address = nil, target_address =nil)
+      "SimpleSend transaction from #{sending_address} for %.8f #{self.currency_id_text} to #{self.receiving_address || target_address}." % (self.amount / 1e8)
     end
 
     def currency_id_text

data/lib/mastercoin-ruby/transaction.rb

@@ -35,13 +35,15 @@ module Mastercoin
         self.multisig = false
       end
 
-      if multisig
-        self.btc_tx.outputs.each do |output|
-          if output.get_address == Mastercoin::EXODUS_ADDRESS
-            exodus_value = output.value
-          end
+      # This should probably be next up for refactor, smelling code creep!
+
+      self.btc_tx.outputs.each do |output|
+        if output.get_address == Mastercoin::EXODUS_ADDRESS
+          exodus_value = output.value
         end
+      end
 
+      if multisig
         self.btc_tx.outputs.each do |output|
           if output.script.is_multisig?
             keys = output.script.get_multisig_pubkeys.collect{|x| x.unpack("H*")[0]}
@@ -69,6 +71,19 @@ module Mastercoin
             self.target_address = address
           end
         end
+
+        unless self.target_address
+          # Find data outputs and brute force receiver
+          found = self.btc_tx.outputs.find_all{|x| x.value == exodus_value}.reject do |output|
+            output.get_address == Mastercoin::EXODUS_ADDRESS || Mastercoin::SimpleSend.decode_from_address(output.get_address).looks_like_mastercoin? # This looks like a data packet
+          end
+
+          if found.length == 1
+            self.target_address = found.first.get_address
+          else
+            puts "Could not find target address"
+          end
+        end
       end
       raise NoMastercoinTransactionException.new("Could not find a valid looking data-address, invalid.") unless self.data
     end
@@ -82,7 +97,7 @@ module Mastercoin
     end
 
     def to_s
-      self.data.explain
+      self.data.explain(self.sending_address, self.target_address)
     end
   end
 end

data/mastercoin-ruby.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "mastercoin-ruby"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maran"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mastercoin-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 473417032215847410
+      hash: 1640464448657650911
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: