mastercoin-ruby 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/bin/simple_send

@@ -13,7 +13,7 @@ module Mastercoin
 
       desc "decode_from_address <address>", "Decodes a simple send based on a address"
       def decode_from_address(address)
-        puts Mastercoin::SimpleSend.decode_from_address(address).to_s
+        puts Mastercoin::SimpleSend.decode_from_address(address).explain
       end
       
       desc "encode_to_public_key <options>", "Encodes the parameters into a public key"

data/lib/mastercoin-ruby/transaction.rb

@@ -62,6 +62,7 @@ module Mastercoin
             # Do nothing yet; this is simply the exodus address
           elsif Mastercoin::SimpleSend.decode_from_address(output.get_address).looks_like_mastercoin? # This looks like a data packet
             Mastercoin.log.debug "Found data for address #{output.get_address}"
+            raise NoMastercoinTransactionException.new("More then one data-addresses found, invalidating.") if self.data.present?
             self.data = Mastercoin::SimpleSend.decode_from_address(output.get_address)
           end
         end
@@ -80,19 +81,32 @@ module Mastercoin
         end
 
         unless self.target_address
-          Mastercoin.log.debug "Target address not found attempting peek & decode."
+          Mastercoin.log.debug "Target address not found attempting 'peek & decode' Level 1, checking exodus-sized outputs."
           # Find data outputs and brute force receiver
           found = exodus_size_outputs.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
+            Mastercoin.log.debug "Only one possible target left; found target address."
             self.target_address = found.first.get_address
           else
-            raise NoMastercoinTransactionException.new("Could not find a recipient address.") unless self.data
+            Mastercoin.log.debug "Target address not found attempting 'peek & decode' Level 2, checking all-non exodus-sized outputs."
+
+            self.btc_tx.outputs.each do |output|
+              address = output.get_address
+              sequence = Mastercoin::Util.get_sequence(address)
+              Mastercoin.log.debug "Sequence: #{sequence} for #{address}"
+
+              if (self.data.sequence.to_i + 1).to_s  == sequence.to_s
+                self.target_address = address
+                Mastercoin.log.debug "Target address found #{self.target_address}"
+              end
+            end
           end
         end
       end
+      raise NoMastercoinTransactionException.new("Could not find valid looking target address, invalid") unless self.target_address
       raise NoMastercoinTransactionException.new("Could not find a valid looking data-address, invalid.") unless self.data
     end
 

data/mastercoin-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mastercoin-ruby"
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maran"]
-  s.date = "2013-12-30"
+  s.date = "2014-01-11"
   s.description = "Basic implementation of the Mastercoin protocol."
   s.email = "maran.hidskes@gmail.com"
   s.executables = ["exodus_payment", "mastercoin-console", "mastercoin_transaction", "simple_send", "wallet.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mastercoin-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1760560904608188435
+      hash: 3390840139407744307
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: