mastercoin-ruby 0.0.5 → 0.1.0

data/Gemfile

@@ -8,7 +8,7 @@ source "http://rubygems.org"
 
 gem 'bitcoin-ruby', '~> 0.0.1', git: "https://github.com/maran/bitcoin-ruby.git"
 gem 'sequel', '~> 4.1.1'
-gem 'thor'
+gem 'thor', '>= 0.14.6'
 gem 'activesupport', '>= 3.0.0'
 
 group :development do

data/Gemfile.lock

@@ -84,4 +84,4 @@ DEPENDENCIES
   rdoc (~> 3.12)
   rspec
   sequel (~> 4.1.1)
-  thor
+  thor (>= 0.14.6)

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/bin/mastercoin_transaction

@@ -12,7 +12,8 @@ module Mastercoin
       def lookup(hash) 
         puts "Looking up tx with hash #{hash}"
         Mastercoin.set_storage(options[:storage])
-        puts Mastercoin::Transaction.new(hash)
+        a = Mastercoin::Transaction.new(hash)
+        puts a.to_s
       end
     end
   end

data/lib/mastercoin-ruby.rb

@@ -9,11 +9,13 @@ module Mastercoin
   autoload :ExodusPayment, 'mastercoin-ruby/exodus_payment'
   autoload :Transaction, 'mastercoin-ruby/transaction'
   autoload :Message, 'mastercoin-ruby/message'
+  autoload :PurchaseOffer, 'mastercoin-ruby/purchase_offer'
   autoload :Util, 'mastercoin-ruby/util'
   autoload :BitcoinWrapper, 'mastercoin-ruby/bitcoin_wrapper'
 
   TRANSACTION_SIMPLE_SEND = "0"
   TRANSACTION_SELL_FOR_BITCOIN = 20
+  TRANSACTION_PURCHASE_BTC_TRADE = 22
 
   TRANSACTION_TYPES = {
     TRANSACTION_SIMPLE_SEND => "Simple transfer",
@@ -21,7 +23,7 @@ module Mastercoin
     "11" => "Mark compromised",
     TRANSACTION_SELL_FOR_BITCOIN => "Currency trade offer bitcoins",
     "21" => "Currency trade offer master-coin derived",
-    "22" => "Currency trade offer accept",
+    TRANSACTION_PURCHASE_BTC_TRADE  => "Currency trade offer accept",
     "30" => "Register data-stream",
     "40" => "Bet offer",
     "100" => "Create child currency"

data/lib/mastercoin-ruby/message.rb

@@ -13,12 +13,19 @@ module Mastercoin
 
     def self.probe_and_read(keys, xor_target)
       result = Message.probe(keys, xor_target)
-      transaction_type = (result[0][1] + result[1][1])[2..9].to_i(16)
+
+      if result.length > 1
+        transaction_type = (result[0][1] + result[1][1])[2..9].to_i(16)
+      else
+        transaction_type = result[0][1][2..9].to_i(16)
+      end
     
       if transaction_type == Mastercoin::TRANSACTION_SELL_FOR_BITCOIN
         Mastercoin::SellingOffer.decode_from_compressed_public_key([result[0][0], result[1][0]], xor_target)
+      elsif transaction_type.to_s == Mastercoin::TRANSACTION_PURCHASE_BTC_TRADE.to_i.to_s
+       Mastercoin::PurchaseOffer.decode_from_compressed_public_key(result[0][0], xor_target)
       elsif transaction_type.to_s == Mastercoin::TRANSACTION_SIMPLE_SEND.to_s
-        Mastercoin::SimpleSend.decode_from_compressed_public_key(keys, xor_target)
+        Mastercoin::SimpleSend.decode_from_compressed_public_key(result[0][0], xor_target)
       end
     end
 

data/lib/mastercoin-ruby/purchase_offer.rb

@@ -0,0 +1,61 @@
+module Mastercoin
+  class PurchaseOffer < Mastercoin::Message
+    attr_accessor :transaction_type, :currency_id, :amount
+
+    # Supply the amount in 'dacoinminster's
+    #77702fd6333eb5a67fa03b6fdb0fda04981bd671fd2a9175e2bee43340770940
+    def initialize(options= {})
+      self.transaction_type = Mastercoin::TRANSACTION_PURCHASE_BTC_TRADE
+      self.currency_id = options[:currency_id]
+      self.amount = options[:amount]
+    end
+
+    # hardcode the sequence for a public key simple send since it's always fits inside a public key
+    # Please note that we start at 01 - 00 will generate unvalid ECDSA points somehow
+    def public_key_sequence
+      01
+    end
+
+    def self.decode_key_to_data(public_key)
+      simple_send = PurchaseOffer.new
+      simple_send.transaction_type = public_key[2..9].to_i(16)
+      simple_send.currency_id = public_key[10..17].to_i(16)
+      simple_send.amount = public_key[18..33].to_i(16)
+      return simple_send
+    end
+
+    def encode_data_to_key
+      raw = (self.public_key_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"))
+      raw = raw.ljust(62,"0")
+      return raw
+    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")
+      Bitcoin.hash160_to_address(raw)
+    end
+
+    def self.decode_from_address(raw_address)
+      simple_send = Mastercoin::PurchaseOffer.new
+      decoded = Bitcoin.decode_base58(raw_address)
+      simple_send.sequence = decoded[2..3].to_i(16)
+      simple_send.transaction_type = decoded[4..11].to_i(16)
+      simple_send.currency_id = decoded[12..19].to_i(16)
+      simple_send.amount = decoded[20..35].to_i(16)
+      return simple_send
+    end
+
+    def get_sequence(bitcoin_address = nil)
+      bitcoin_address ||= self.receiving_address
+      Mastercoin::Util.get_sequence(bitcoin_address)
+    end
+
+    def explain
+      "Purchase Offer transaction for %.8f #{self.currency_id_text}." % (self.amount / 1e8)
+    end
+
+    def currency_id_text
+      Mastercoin::CURRENCY_IDS[self.currency_id.to_s]
+    end
+  end
+end

data/mastercoin-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mastercoin-ruby"
-  s.version = "0.0.5"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maran"]
-  s.date = "2013-10-28"
+  s.date = "2013-11-04"
   s.description = "Basic implementation of the Mastercoin protocol."
   s.email = "maran.hidskes@gmail.com"
   s.executables = ["console", "exodus_payment", "mastercoin_transaction", "simple_send", "wallet.rb"]
@@ -36,11 +36,13 @@ Gem::Specification.new do |s|
     "lib/mastercoin-ruby/bitcoin_wrapper.rb",
     "lib/mastercoin-ruby/exodus_payment.rb",
     "lib/mastercoin-ruby/message.rb",
+    "lib/mastercoin-ruby/purchase_offer.rb",
     "lib/mastercoin-ruby/selling_offer.rb",
     "lib/mastercoin-ruby/simple_send.rb",
     "lib/mastercoin-ruby/transaction.rb",
     "lib/mastercoin-ruby/util.rb",
     "mastercoin-ruby.gemspec",
+    "spec/purchase_offer_spec.rb",
     "spec/selling_offer_spec.rb",
     "spec/simple_send_spec.rb"
   ]
@@ -56,7 +58,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<bitcoin-ruby>, ["~> 0.0.1"])
       s.add_runtime_dependency(%q<sequel>, ["~> 4.1.1"])
-      s.add_runtime_dependency(%q<thor>, [">= 0"])
+      s.add_runtime_dependency(%q<thor>, [">= 0.14.6"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -65,7 +67,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<bitcoin-ruby>, ["~> 0.0.1"])
       s.add_dependency(%q<sequel>, ["~> 4.1.1"])
-      s.add_dependency(%q<thor>, [">= 0"])
+      s.add_dependency(%q<thor>, [">= 0.14.6"])
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -75,7 +77,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<bitcoin-ruby>, ["~> 0.0.1"])
     s.add_dependency(%q<sequel>, ["~> 4.1.1"])
-    s.add_dependency(%q<thor>, [">= 0"])
+    s.add_dependency(%q<thor>, [">= 0.14.6"])
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

data/spec/purchase_offer_spec.rb

@@ -0,0 +1,30 @@
+require 'mastercoin-ruby'
+
+describe Mastercoin::PurchaseOffer do
+  before do 
+    @purchase_offer = Mastercoin::PurchaseOffer.new(currency_id: 2, amount: 50)
+  end
+
+  it "Should generate valid non-obfusciated Mastercoin keys" do
+    @purchase_offer.encode_data_to_key.should eq("01000000160000000200000000000000320000000000000000000000000000")
+  end
+
+  it "Should parse valid non-obfusciated keys" do
+    @purchase_offer = Mastercoin::PurchaseOffer.decode_key_to_data("01000000160000000200000000000000320000000000000000000000000000")
+    @purchase_offer.currency_id.should be(2)
+    @purchase_offer.amount.should be(50)
+    @purchase_offer.transaction_type.to_i.should be(22)
+  end
+
+  it "Should generate valid obfusciated Mastercoin keys" do
+    @purchase_offer.encode_to_compressed_public_key("1J2svn2GxYx9LPrpCLFikmzn9kkrXBrk8B")[0..-3].should eq("02d52c390e44f1110410078a9db148e7a334924666fb10aaaa9bffcc2e2ecde3")
+    @purchase_offer.transaction_type.to_i.should be(22)
+  end
+
+  it "Should read valid obfusciated Mastercoin keys" do
+    @purchase_offer = Mastercoin::PurchaseOffer.decode_from_compressed_public_key("02d52c390e44f1110410078a9db148e7a334924666fb10aaaa9bffcc2e2ecde33e", "1J2svn2GxYx9LPrpCLFikmzn9kkrXBrk8B")
+    @purchase_offer.currency_id.should be(2)
+    @purchase_offer.amount.should be(50)
+    @purchase_offer.transaction_type.to_i.should be(22)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mastercoin-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.6
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -170,11 +170,13 @@ files:
 - lib/mastercoin-ruby/bitcoin_wrapper.rb
 - lib/mastercoin-ruby/exodus_payment.rb
 - lib/mastercoin-ruby/message.rb
+- lib/mastercoin-ruby/purchase_offer.rb
 - lib/mastercoin-ruby/selling_offer.rb
 - lib/mastercoin-ruby/simple_send.rb
 - lib/mastercoin-ruby/transaction.rb
 - lib/mastercoin-ruby/util.rb
 - mastercoin-ruby.gemspec
+- spec/purchase_offer_spec.rb
 - spec/selling_offer_spec.rb
 - spec/simple_send_spec.rb
 homepage: http://github.com/maran/mastercoin-ruby
@@ -192,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1833207625332828551
+      hash: 3082060516544649458
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: