mastercoin-ruby 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/mastercoin-ruby.rb

@@ -48,7 +48,7 @@ module Mastercoin
     return @@storage
   end
 
-  def self.init_logger(level = Logger::INFO)
+  def self.init_logger(level = Logger::DEBUG)
     @@log ||= Logger.new(STDOUT)
     @@log.level = level
     @@log

data/lib/mastercoin-ruby/simple_send.rb

@@ -32,7 +32,8 @@ module Mastercoin
     end
 
     def encode_to_address
-      raw = (self.get_sequence.to_i.to_s(16).rjust(2, "0") + self.transaction_type.to_i.to_s(16).rjust(8,"0") + self.currency_id.to_i.to_s(16).rjust(8, "0") + self.amount.to_i.to_s(16).rjust(16, "0") + "000000")
+      self.sequence = self.get_sequence(self.receiving_address, true).to_i
+      raw = (self.sequence.to_s(16).rjust(2, "0") + self.transaction_type.to_i.to_s(16).rjust(8,"0") + self.currency_id.to_i.to_s(16).rjust(8, "0") + self.amount.to_i.to_s(16).rjust(16, "0") + "000000")
       Bitcoin.hash160_to_address(raw)
     end
 
@@ -46,13 +47,13 @@ module Mastercoin
       return simple_send
     end
 
-    def get_sequence(bitcoin_address = nil)
+    def get_sequence(bitcoin_address = nil, encoding = false)
       bitcoin_address ||= self.receiving_address
-      Mastercoin::Util.get_sequence(bitcoin_address)
+      Mastercoin::Util.get_sequence(bitcoin_address, encoding)
     end
 
     def looks_like_mastercoin?
-      Mastercoin::TRANSACTION_TYPES.keys.include?(self.transaction_type.to_i.to_s) && Mastercoin::CURRENCY_IDS.keys.include?(self.currency_id.to_s)
+      Mastercoin::TRANSACTION_TYPES.keys.include?(self.transaction_type.to_i.to_s) && Mastercoin::CURRENCY_IDS.keys.include?(self.currency_id.to_s) && (self.amount / 1e8) < (563061 / 2)
     end
 
     def explain(sending_address = nil, target_address =nil)

data/lib/mastercoin-ruby/transaction.rb

@@ -55,26 +55,31 @@ module Mastercoin
           end
         end
       else
+        exodus_size_outputs = self.btc_tx.outputs.find_all{|x| x.value == exodus_value}
         self.btc_tx.outputs.each do |output|
           if output.get_address == Mastercoin::EXODUS_ADDRESS
             # 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}"
             self.data = Mastercoin::SimpleSend.decode_from_address(output.get_address)
           end
         end
 
-        self.btc_tx.outputs.each do |output|
+        Mastercoin.log.debug "Looking for data sequence #{self.data.sequence} +1 == #{self.data.sequence.to_i + 1}"
+
+        exodus_size_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_s == sequence.to_s
+          if (self.data.sequence.to_i + 1).to_s  == sequence.to_s
             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|
+          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
 

data/lib/mastercoin-ruby/util.rb

@@ -39,10 +39,14 @@ module Mastercoin
       return true
     end
 
-    def self.get_sequence(bitcoin_address)
+    def self.get_sequence(bitcoin_address, encoding = false)
       decoded = Bitcoin.decode_base58(bitcoin_address)
+      seq = decoded[2..3].to_i(16)
+
+      if encoding
+         seq -= 1
+      end
 
-      seq = decoded[2..3].to_i(16) - 1
       if seq < 0
         seq += 256
       end

data/mastercoin-ruby.gemspec

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

data/spec/simple_send_spec.rb

@@ -25,8 +25,13 @@ describe Mastercoin::SimpleSend do
       simple_send.transaction_type.should eq(0)
     end
 
+    it "Should encode proper sequences" do
+      address = @simple_send.encode_to_address
+      Mastercoin::Util.get_sequence(@simple_send.receiving_address).should eq(@simple_send.sequence + 1)
+    end
+
     it "Should be backwards compatible with sequences" do
-      Mastercoin::SimpleSend.new.get_sequence("1CcJFxoEW5PUwesMVxGrq6kAPJ1TJsSVqq").should eq(126)
+      Mastercoin::SimpleSend.new.get_sequence("1CcJFxoEW5PUwesMVxGrq6kAPJ1TJsSVqq").should eq(127)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mastercoin-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1178827526387473621
+      hash: -3636912781632535613
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: