mastercoin-wallet 0.0.5 → 0.0.6

data/README.rdoc

@@ -14,13 +14,26 @@ Dependencies will differ based on your operating system.
 === OS X 
 Install {homebrew}[http://brew.sh/] if you haven't got it yet. 
 
-* brew install qt
+* brew install qt cmake
 
 === Debian/Ubuntu
 These instructions might not be complete. Additional instructions welcome.
 
 * apt-get install libqt4-gui libqt4-dev cake
 
+=== Windows
+These instructions might also not be complete. 
+
+* Download and install Win32 OpenSSL from: http://slproweb.com/products/Win32OpenSSL.html
+* Install Ruby via http://rubyinstaller.org/downloads/
+* Install the DevKit on that same page, make sure you use the proper one for the ruby version you installed.
+* Make sure you follow {these instructions}[https://github.com/oneclick/rubyinstaller/wiki/Development-Kit] on how to properly configure the DevKit 
+* Start a command prompt with ruby and type "gem install mastercoin-wallet"
+
+This last step should hopefully not be needed anymore but for now we need a custom patched bitcoin-ruby for Windows
+* {Download the updated bitcoin-ruby gem}[https://dl.dropboxusercontent.com/u/374/bitcoin-ruby-0.0.2.gem] and install it using gem install bitcoin-ruby-0.0.2.gem 
+* Go back to the ruby command prompt and type mastercoin-wallet to start it
+
 == Installation
 Once the depencies are installed you can just do gem install mastercoin-wallet to install the wallet. Start it by issuing mastercoin-wallet from a terminal.
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+$:.unshift( File.expand_path("../../lib", __FILE__) )
+require 'mastercoin-wallet'
+include MastercoinWallet
+
+require 'irb'
+require 'irb/completion'
+def reload(require_regex)
+  $".grep(/^#{require_regex}/).each {|e| $".delete(e) && require(e) }
+end
+def reload!
+  $".grep(/mastercoin/).each {|e| $".delete(e) && require(e) }
+end
+IRB.start
+

data/lib/mastercoin-wallet/builder.rb

@@ -55,10 +55,10 @@ module MastercoinWallet
       end
         begin
           key = Bitcoin::Key.from_base58(priv_key)
-        rescue ArgumentError
+        rescue ArgumentError, RuntimeError
           begin
             key = Bitcoin::Key.new(priv_key)
-          rescue ArgumentError, OpenSSL::BNError
+          rescue ArgumentError, OpenSSL::BNError, RuntimeError
               Qt::MessageBox.information(self, tr("Could not send payment."),
                                          tr("Could not send payment, wrong password."))
             return
@@ -103,26 +103,41 @@ module MastercoinWallet
           end
         end
 
-        tx = Bitcoin::Protocol::Tx.new( tx.to_payload )
+        transmit!(tx)
+    end
 
-        MastercoinWallet.log.debug("TX Made: #{tx.to_hash}")
+    def pick_outputs(required_amount)
+      used_outputs = MastercoinWallet.config.created_transactions.collect{|x| x["in"][0]["prev_out"] }
+      usuable_outputs = MastercoinWallet.config.spendable_outputs.find{|x| BigDecimal.new(x[:value]) > BigDecimal.new(required_amount.to_s) }
 
-        transaction_hash = tx.to_payload.unpack("H*").first
+      #puts "Found these total: #{usuable_outputs}"
+      #puts "These are used #{used_outputs}"
 
-        MastercoinWallet.log.debug("If you want to send it by Bitcoind use this")
-        MastercoinWallet.log.debug(transaction_hash)
-        MastercoinWallet.log.debug("Required fee: #{tx.calculate_minimum_fee} - Multisig size: #{tx.outputs.last.script.bytesize}")
+      usuable_outputs = [usuable_outputs] if usuable_outputs.is_a?(Hash)
+      usuable_outputs.reject!{|x| puts x; used_outputs.include?(x["prev_out"])}
+      #puts "Left with these: #{usuable_outputs}"
 
-        remote_transaction = Transaction.new(tx.to_hash["hash"], tx.to_json)
-        response = remote_transaction.create!
-        if response.parsed_response.keys.include?("error")
-          Qt::MessageBox.critical(self, tr("Could not relay transaction"),
-                                 tr("The remote server could not transmit your transaction at this moment. #{response.parsed_response}"))
-          return
+      if usuable_outputs.empty?
+        # Outputs are saved in order so the last output should always the one that's unused, make sure it's an output for thist address and that it's big enough
+        if MastercoinWallet.config.created_transactions.last["out"].first["address"] == MastercoinWallet.config.address && MastercoinWallet.config.created_transactions.last["out"].first["value"].to_f >= BigDecimal.new(required_amount)
+          # We are taking an full transaction and building a spendable output based on the details we have
+          output = MastercoinWallet.config.created_transactions.last["out"].first.reverse_merge({prev_out: {hash: MastercoinWallet.config.created_transactions.last["hash"], n: 0}})
+          tx = MastercoinWallet.config.created_transactions.last
+          return output,tx
         else
-          Qt::MessageBox.information(self, tr("Transaction send"),
-                                 tr("Your transaction with hash #{tx.to_hash["hash"]} has been offered to the relay server, it should show up within 10 minutes."))
+          return nil, nil
+        end
+      else
+        if usuable_outputs.is_a?(Array)
+          usuable_outputs = usuable_outputs[0]
+        end
+
+        tx = MastercoinWallet.config.bitcoin_transactions.find{|x| x["hash"] == usuable_outputs["prev_out"]["hash"]}
+        if tx.is_a?(Array)
+          tx = tx[0]
         end
+        return usuable_outputs, tx
+      end
     end
 
     def create_transaction_with_keys(data_keys, options = {})
@@ -136,13 +151,10 @@ module MastercoinWallet
         self.set_fee
       end
 
-      valid_output = MastercoinWallet.config.spendable_outputs.find{|x| BigDecimal.new(x[:value]) > (self.fee + self.mastercoin_tx)}
+      required_amount = (self.fee + self.mastercoin_tx)
+      output, tx = pick_outputs(required_amount)
 
-      if valid_output.is_a?(Array)
-        ouput = valid_output[0]
-      else
-        output = valid_output
-      end
+#      puts "Using output: #{output} and Tx: #{tx}"
 
       unless output
           Qt::MessageBox.critical(self, tr("Could not send transaction"),
@@ -152,10 +164,6 @@ module MastercoinWallet
 
       change_amount = BigDecimal.new(output["value"]) - fee - mastercoin_tx
 
-      tx = MastercoinWallet.config.bitcoin_transactions.find{|x| x["hash"] == output["prev_out"]["hash"]}
-      if tx.is_a?(Array)
-        tx = tx[0]
-      end
 
       begin
         priv_key = MastercoinWallet.config.get_encrypted_key(:private_key, @password)
@@ -166,16 +174,23 @@ module MastercoinWallet
       end
         begin
           key = Bitcoin::Key.from_base58(priv_key)
-        rescue ArgumentError
+        rescue ArgumentError, RuntimeError
           begin
             key = Bitcoin::Key.new(priv_key)
-          rescue ArgumentError, OpenSSL::BNError
+          rescue ArgumentError, OpenSSL::BNError, RuntimeError
               Qt::MessageBox.information(self, tr("Could not send payment."),
                                          tr("Could not send payment, wrong password."))
             return
           end
         end
-        public_keys.insert(0, key.pub_compressed)
+
+        begin
+          public_keys.insert(0, key.pub_compressed)
+        rescue RuntimeError => e
+              Qt::MessageBox.information(self, tr("Could not send payment."),
+                                         tr("Something went wrong while trying to generate your public key. Please report this: #{e}"))
+              return
+        end
 
 
         tx = build_tx do |t|
@@ -227,7 +242,10 @@ module MastercoinWallet
             end
           end
         end
+        transmit!(tx)
+    end
 
+    def transmit!(tx)
         tx = Bitcoin::Protocol::Tx.new( tx.to_payload )
 
         MastercoinWallet.log.debug("TX Made: #{tx.to_hash}")
@@ -245,6 +263,18 @@ module MastercoinWallet
                                  tr("The remote server could not transmit your transaction at this moment. #{response.parsed_response}"))
           return
         else
+          sent_transactions = MastercoinWallet.config.get_key("created_transactions")
+          sent_transactions ||= []
+          sent_transactions << tx.to_hash(with_address: true)
+
+          #transactions = MastercoinWallet.config.get_key("bitcoin_transactions")
+          #transactions ||= []
+          #transactions << tx
+          #transactions = MastercoinWallet.config.set_key!("bitcoin_transactions", transactions)
+
+
+          MastercoinWallet.config.set_key!(:created_transactions, sent_transactions)
+
           Qt::MessageBox.information(self, tr("Transaction send"),
                                  tr("Your transaction with hash #{tx.to_hash["hash"]} has been offered to the relay server, it should show up within 10 minutes."))
         end

data/lib/mastercoin-wallet/config.rb

@@ -1,7 +1,7 @@
 module MastercoinWallet
   class Config
     attr_accessor :options
-    DEFAULT = ActiveSupport::HashWithIndifferentAccess.new(balance: 0, test_balance: 0, spendable_outputs: [], bitcoin_transactions: [], exodus_transactions: [], sent_transactions: [], received_transactions: [], btc_balance: 0)
+    DEFAULT = ActiveSupport::HashWithIndifferentAccess.new(balance: 0, test_balance: 0, spendable_outputs: [], bought_transactions:[], created_transactions: [], sold_transactions: [], bitcoin_transactions: [], exodus_transactions: [], sent_transactions: [], received_transactions: [], btc_balance: 0)
 
     def initialize
       self.ensure_config!
@@ -11,7 +11,7 @@ module MastercoinWallet
       if config.empty?
         self.options = DEFAULT
       else
-        self.options = ActiveSupport::HashWithIndifferentAccess.new(JSON.load(config))
+        self.options = ActiveSupport::HashWithIndifferentAccess.new(JSON.load(config)).reverse_merge(DEFAULT)
       end
     end
 

data/lib/mastercoin-wallet/gui/main_window.rb

@@ -1,5 +1,7 @@
 module MastercoinWallet 
   class MainWindow < Qt::Dialog
+    include MastercoinWallet::Util
+
     slots 'new_simple_send()', 'new_selling_offer()', 'new_purchase_offer()', 'create_order(QTreeWidgetItem *, int)', 'sync()', 'create_bitcoin_tx(QTreeWidgetItem *, int)'
 
     def create_order(item, position)
@@ -26,7 +28,7 @@ module MastercoinWallet
       @ui = Ui_MainWindow.new
       @ui.setupUi(self)
 
-      setWindowTitle(tr("Mastercoin wallet - v0.0.5"))
+      setWindowTitle(tr("Mastercoin wallet - v0.0.6"))
 
       @rows = []
 
@@ -111,22 +113,17 @@ module MastercoinWallet
       update_balance
     end
 
-
-    def coin_name(currency_id)
-      if currency_id.to_s == "1"
-        "MSC"
-      else
-        "Test MSC"
-      end
-    end
-
     def add_row(item, type)
       row = Qt::TreeWidgetItem.new
-      row.setText(0, item["address"])
+      if type == "Sent"
+        row.setText(0, item["receiving_address"])
+      else
+        row.setText(0, item["address"])
+      end
       row.setText(1, item["amount"])
       row.setText(2, type)
       row.setText(3, coin_name(item["currency_id"]))
-      row.setText(4, item["tx_date"])
+      row.setText(4, get_date(item["tx_date"]))
       return row
     end
 
@@ -187,12 +184,12 @@ module MastercoinWallet
         end
       end
       if MastercoinWallet.config.has_key?(:bought)
-        MastercoinWallet.config.sent_transactions.each do |x|
+        MastercoinWallet.config.bought_transactions.each do |x|
           @rows << add_row(x, "Bought")
         end
       end
       if MastercoinWallet.config.has_key?(:sold)
-        MastercoinWallet.config.sent_transactions.each do |x|
+        MastercoinWallet.config.sold_transactions.each do |x|
           @rows << add_row(x, "Sold")
         end
       end

data/lib/mastercoin-wallet/gui/main_window.ui

@@ -35,7 +35,7 @@
     </sizepolicy>
    </property>
    <property name="currentIndex">
-    <number>1</number>
+    <number>0</number>
    </property>
    <widget class="QWidget" name="tab">
     <attribute name="title">
@@ -98,7 +98,7 @@
       <rect>
        <x>220</x>
        <y>40</y>
-       <width>471</width>
+       <width>491</width>
        <height>51</height>
       </rect>
      </property>

data/lib/mastercoin-wallet/gui/ui_main.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'main_window.ui'
 **
-** Created: Tue Nov 5 21:06:14 2013
+** Created: Thu Nov 7 21:47:28 2013
 **      by: Qt User Interface Compiler version 4.8.4
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -59,7 +59,7 @@ class Ui_MainWindow
     @bitcoinLabel.geometry = Qt::Rect.new(10, 70, 171, 19)
     @mscAddressLabel = Qt::Label.new(@tab)
     @mscAddressLabel.objectName = "mscAddressLabel"
-    @mscAddressLabel.geometry = Qt::Rect.new(220, 40, 471, 51)
+    @mscAddressLabel.geometry = Qt::Rect.new(220, 40, 491, 51)
     @font = Qt::Font.new
     @font.family = "Verdana"
     @font.pointSize = 24
@@ -109,7 +109,7 @@ class Ui_MainWindow
 
     retranslateUi(mainWindow)
 
-    @mainTab.setCurrentIndex(1)
+    @mainTab.setCurrentIndex(0)
 
 
     Qt::MetaObject.connectSlotsByName(mainWindow)

data/lib/mastercoin-wallet/network/wallet.rb

@@ -9,6 +9,7 @@ module MastercoinWallet
 
           MastercoinWallet.config.set_key(:balance, (@address["balance"] || 0))
           MastercoinWallet.config.set_key(:test_balance, (@address["test_balance"] || 0))
+          MastercoinWallet.config.set_key(:created_transactions, []) if MastercoinWallet.config.get_key(:created_transactions).blank?
 
           ["sold", "bought", "received_transactions","pending_offers", "sent_transactions", "exodus_transactions", "bitcoin_transactions", "spendable_outputs"].each do |x|
             if @address[x]

data/lib/mastercoin-wallet/util.rb

@@ -0,0 +1,15 @@
+module MastercoinWallet
+  module Util
+    def get_date(date)
+      Time.strptime(date, "%Y-%m-%dT%H:%M:%S.000Z").strftime("%d-%m-%Y %H:%M:%S")
+    end
+
+    def coin_name(currency_id)
+      if currency_id.to_s == "1"
+        "MSC"
+      else
+        "Test MSC"
+      end
+    end
+  end
+end

data/lib/mastercoin-wallet.rb

@@ -15,7 +15,7 @@ module MastercoinWallet
 
   autoload :Address, 'mastercoin-wallet/models/address'
   autoload :Transaction, 'mastercoin-wallet/models/transaction'
-
+  autoload :Util, 'mastercoin-wallet/util'
 
   autoload :MainWindow, 'mastercoin-wallet/gui/main_window'
   autoload :FirstRunWindow, 'mastercoin-wallet/gui/first_run_window'

data/mastercoin-wallet.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "mastercoin-wallet"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maran"]
-  s.date = "2013-11-05"
+  s.date = "2013-11-07"
   s.description = "Mastercoin wallet using QT bindings to create a useful gui wallet"
   s.email = "maran.hidskes@gmail.com"
-  s.executables = ["mastercoin-wallet"]
+  s.executables = ["console", "mastercoin-wallet"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "bin/console",
     "bin/mastercoin-wallet",
     "lib/.DS_Store",
     "lib/mastercoin-wallet.rb",
@@ -55,6 +56,7 @@ Gem::Specification.new do |s|
     "lib/mastercoin-wallet/models/transaction.rb",
     "lib/mastercoin-wallet/network/selling_offer.rb",
     "lib/mastercoin-wallet/network/wallet.rb",
+    "lib/mastercoin-wallet/util.rb",
     "mastercoin-wallet.gemspec",
     "resources/images.qrc",
     "resources/logo.icns",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mastercoin-wallet
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mastercoin-ruby
@@ -174,6 +174,7 @@ dependencies:
 description: Mastercoin wallet using QT bindings to create a useful gui wallet
 email: maran.hidskes@gmail.com
 executables:
+- console
 - mastercoin-wallet
 extensions: []
 extra_rdoc_files:
@@ -188,6 +189,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/console
 - bin/mastercoin-wallet
 - lib/.DS_Store
 - lib/mastercoin-wallet.rb
@@ -217,6 +219,7 @@ files:
 - lib/mastercoin-wallet/models/transaction.rb
 - lib/mastercoin-wallet/network/selling_offer.rb
 - lib/mastercoin-wallet/network/wallet.rb
+- lib/mastercoin-wallet/util.rb
 - mastercoin-wallet.gemspec
 - resources/images.qrc
 - resources/logo.icns
@@ -238,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3844463166486002771
+      hash: -1967742424752974739
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: