mastercoin-wallet 0.0.2 → 0.0.3

data/Gemfile

@@ -1,12 +1,14 @@
 source "http://rubygems.org"
+gem 'mastercoin-ruby',git: "https://github.com/maran/mastercoin-ruby.git", branch: "develop"
 gem 'qtbindings'
 gem 'httparty'
 gem 'active_support'
 gem 'bitcoin-ruby', '~> 0.0.1', git: "https://github.com/maran/bitcoin-ruby.git"
-gem 'mastercoin-ruby'
 gem 'ffi'
+gem 'i18n'
 
 group :development do
+  gem 'releasy', git: "https://github.com/Spooner/releasy.git"
   gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 1.8.7"
+  gem "jeweler", "~> 1.8.8"
 end

data/Gemfile.lock

@@ -1,9 +1,31 @@
+GIT
+  remote: https://github.com/Spooner/releasy.git
+  revision: 1386fc1b439de45994919ddad5633b4ad1745817
+  specs:
+    releasy (0.2.3)
+      bundler (>= 1.2.1)
+      cri (~> 2.1.0)
+      ocra (~> 1.3.0)
+      rake (>= 0.9.2.2)
+      thor (~> 0.14.6)
+
 GIT
   remote: https://github.com/maran/bitcoin-ruby.git
   revision: b9baf584a509e89cca0a9e5dc879f225dd9aa529
   specs:
     bitcoin-ruby (0.0.1)
 
+GIT
+  remote: https://github.com/maran/mastercoin-ruby.git
+  revision: 07437c33dba284e0e638dbd24245219e93b2462f
+  branch: develop
+  specs:
+    mastercoin-ruby (0.0.4)
+      activesupport (>= 3.0.0)
+      bitcoin-ruby (~> 0.0.1)
+      sequel (~> 4.1.1)
+      thor
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -12,9 +34,10 @@ GEM
     activesupport (3.0.0)
     addressable (2.3.5)
     builder (3.2.2)
+    cri (2.1.0)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
-    ffi (1.9.0)
+    ffi (1.9.3)
     git (1.2.6)
     github_api (0.10.1)
       addressable
@@ -24,12 +47,13 @@ GEM
       nokogiri (~> 1.5.2)
       oauth2
     hashie (2.0.5)
-    highline (1.6.19)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
+    highline (1.6.20)
+    httparty (0.12.0)
+      json (~> 1.8)
       multi_xml (>= 0.5.2)
     httpauth (0.2.0)
-    jeweler (1.8.7)
+    i18n (0.6.5)
+    jeweler (1.8.8)
       builder
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -38,14 +62,10 @@ GEM
       nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.8.0)
+    json (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    mastercoin-ruby (0.0.2)
-      bitcoin-ruby (~> 0.0.1)
-      sequel (~> 4.1.1)
-      thor
-    multi_json (1.8.0)
+    multi_json (1.8.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.5.10)
@@ -56,13 +76,14 @@ GEM
       multi_json (~> 1.0)
       multi_xml (~> 0.5)
       rack (~> 1.2)
+    ocra (1.3.1)
     qtbindings (4.8.3.0)
     rack (1.5.2)
-    rake (10.1.0)
+    rake (0.9.2.2)
     rdoc (4.0.1)
       json (~> 1.4)
     sequel (4.1.1)
-    thor (0.18.1)
+    thor (0.14.6)
 
 PLATFORMS
   ruby
@@ -73,6 +94,8 @@ DEPENDENCIES
   bundler (~> 1.0)
   ffi
   httparty
-  jeweler (~> 1.8.7)
-  mastercoin-ruby
+  i18n
+  jeweler (~> 1.8.8)
+  mastercoin-ruby!
   qtbindings
+  releasy!

data/Makefile

@@ -1,11 +1,23 @@
-all: lib/mastercoin-wallet/gui/ui_simple_send.rb lib/mastercoin-wallet/gui/ui_first_run.rb lib/mastercoin-wallet/gui/images.rb
+all: lib/mastercoin-wallet/gui/ui_main.rb lib/mastercoin-wallet/gui/ui_bitcoin_offer.rb lib/mastercoin-wallet/gui/ui_purchase_offer.rb lib/mastercoin-wallet/gui/ui_selling_offer.rb lib/mastercoin-wallet/gui/ui_simple_send.rb lib/mastercoin-wallet/gui/ui_first_run.rb lib/mastercoin-wallet/gui/images.rb
 
 lib/mastercoin-wallet/gui/ui_simple_send.rb: lib/mastercoin-wallet/gui/simple_send_window.ui
 		rbuic4 lib/mastercoin-wallet/gui/simple_send_window.ui -o lib/mastercoin-wallet/gui/ui_simple_send.rb
 
+lib/mastercoin-wallet/gui/ui_selling_offer.rb: lib/mastercoin-wallet/gui/selling_offer_window.ui
+		rbuic4 lib/mastercoin-wallet/gui/selling_offer_window.ui -o lib/mastercoin-wallet/gui/ui_selling_offer.rb
+
+lib/mastercoin-wallet/gui/ui_purchase_offer.rb: lib/mastercoin-wallet/gui/purchase_offer_window.ui
+		rbuic4 lib/mastercoin-wallet/gui/purchase_offer_window.ui -o lib/mastercoin-wallet/gui/ui_purchase_offer.rb
+
+lib/mastercoin-wallet/gui/ui_bitcoin_offer.rb: lib/mastercoin-wallet/gui/bitcoin_offer_window.ui
+		rbuic4 lib/mastercoin-wallet/gui/bitcoin_offer_window.ui -o lib/mastercoin-wallet/gui/ui_bitcoin_offer.rb
+
 lib/mastercoin-wallet/gui/ui_first_run.rb: lib/mastercoin-wallet/gui/first_run_window.ui
 		rbuic4 first_run_window.ui -o ui_first_run.rb
 
+lib/mastercoin-wallet/gui/ui_main.rb: lib/mastercoin-wallet/gui/main_window.ui
+		rbuic4 lib/mastercoin-wallet/gui/main_window.ui -o lib/mastercoin-wallet/gui/ui_main.rb
+
 lib/mastercoin-wallet/gui/images.rb: resources/images.qrc
 		rbrcc -name images resources/images.qrc -o lib/mastercoin-wallet/gui/images.rb
 

data/README.rdoc

@@ -7,6 +7,8 @@ Mastercoin wallet implementation in Ruby using QT bindings.
 * Rubygems
 * QT 4
 
+Check your ruby version using ruby -v. If the version is lower then 1.9.2 or not installed yet, install {rvm}[http://rvm.io/] and ruby 1.9.3.
+
 Dependencies will differ based on your operating system.
 
 === OS X 
@@ -14,9 +16,12 @@ Install {homebrew}[http://brew.sh/] if you haven't got it yet.
 
 * brew install qt
 
-Check your ruby version using ruby -v. If the version is lower then 1.9.2 install {rvm}[http://rvm.io/] and ruby 1.9.3.
+=== Debian/Ubuntu
+These instructions might not be complete. Additional instructions welcome.
+
+* apt-get install libqt4-gui libqt4-dev cake
 
-== Installation ==
+== 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.
 
 == First run configuration

data/Rakefile

@@ -34,3 +34,22 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'releasy'
+Releasy::Project.new do
+  name "Mastercoin Wallet"
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  verbose # Can be removed if you don't want to see all build messages.
+  executable "bin/mastercoin-wallet"
+  files ["lib/**/*.*", "bin/*.*", "resources/*.*"]
+
+  exclude_encoding
+  # Create a variety of releases, for all platforms.
+  add_build :osx_app do
+    url "com.maran.mastercoin_wallet"
+    wrapper "../wrappers/gosu-mac-wrapper-0.7.47.tar.gz"
+    icon "resources/logo.icns"
+  end
+
+  add_deploy :local # Only deploy locally.
+end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/mastercoin-wallet

@@ -8,7 +8,7 @@ app.setWindowIcon(Qt::Icon.new(":/logo.svg"))
 
 if MastercoinWallet.config.has_key?(:private_key)
   dialog = MastercoinWallet::MainWindow.new
-  dialog.setMinimumSize(570, 300)
+  dialog.setMinimumSize(746,469)
   dialog.exec
 else
   dialog = MastercoinWallet::FirstRunWindow.new

data/lib/mastercoin-wallet/builder.rb

@@ -0,0 +1,254 @@
+module MastercoinWallet
+  module Builder
+    attr_accessor :fee, :tx_amount, :mastercoin_tx, :btc_amount
+
+    def set_fee(force_fee = nil)
+      self.fee = force_fee || BigDecimal.new("0.0001")
+
+      if self.fee < 0.0001
+        self.fee = BigDecimal.new("0.0001")
+      end
+
+      self.tx_amount = BigDecimal.new("0.00006")
+      if @receiving_address
+        output_counter = 4
+      else
+        output_counter = 3
+      end
+      self.mastercoin_tx = (output_counter * tx_amount)
+    end
+
+    def create_bitcoin_transaction_for(amount)
+      self.btc_amount = BigDecimal.new(amount)
+      self.fee = BigDecimal.new("0.0001")
+      self.tx_amount = BigDecimal.new("0.00006")
+
+      # TODO REFACTOR AND DRY IT
+      valid_output = MastercoinWallet.config.spendable_outputs.find{|x| BigDecimal.new(x[:value]) > (self.fee + self.tx_amount + self.btc_amount)}
+
+      if valid_output.is_a?(Array)
+        ouput = valid_output[0]
+      else
+        output = valid_output
+      end
+
+      unless output
+          Qt::MessageBox.critical(self, tr("Could not send transaction"),
+                                 tr("It appears there are no spendable outputs for this address that are big enough to transmit this transaction. Please consolidate some coins and send them to your Mastercoin address."))
+          return
+      end
+
+      change_amount = BigDecimal.new(output["value"]) - self.fee - self.btc_amount - self.tx_amount
+
+      tx = MastercoinWallet.config.bitcoin_transactions.find{|x| x["hash"] == output["prev_out"]["hash"]}
+      if tx.is_a?(Array)
+        tx = tx[0]
+      end
+
+      # DRY THIS AS WELL SHOULD BE IS OWN METHOD
+      begin
+        priv_key = MastercoinWallet.config.get_encrypted_key(:private_key, @password)
+      rescue ArgumentError
+        Qt::MessageBox.information(self, tr("Could not send payment."),
+                                   tr("Could not send payment, wrong password."))
+        return
+      end
+        begin
+          key = Bitcoin::Key.from_base58(priv_key)
+        rescue ArgumentError
+          begin
+            key = Bitcoin::Key.new(priv_key)
+          rescue ArgumentError, OpenSSL::BNError
+              Qt::MessageBox.information(self, tr("Could not send payment."),
+                                         tr("Could not send payment, wrong password."))
+            return
+          end
+        end
+
+        tx = build_tx do |t|
+          t.input do |i|
+            i.prev_out Bitcoin::Protocol::Tx.from_hash(tx)
+            i.prev_out_index output["prev_out"]["n"] 
+            i.signature_key key
+          end
+
+          # Change address
+          t.output do |o|
+            o.value change_amount * 1e8
+
+            o.script do |s|
+              s.type :address
+              s.recipient MastercoinWallet.config.address
+            end
+          end
+
+          # Receiving address
+          t.output do |o|
+            o.value self.btc_amount * 1e8
+
+            o.script do |s|
+              s.type :address
+              s.recipient @receiving_address
+            end
+          end
+
+          # Exodus address
+          t.output do |o|
+            o.value self.tx_amount * 1e8
+
+            o.script do |s|
+              s.type :address
+              s.recipient Mastercoin::EXODUS_ADDRESS
+            end
+          end
+        end
+
+        tx = Bitcoin::Protocol::Tx.new( tx.to_payload )
+
+        MastercoinWallet.log.debug("TX Made: #{tx.to_hash}")
+
+        transaction_hash = tx.to_payload.unpack("H*").first
+
+        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}")
+
+        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
+        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."))
+        end
+    end
+
+    def create_transaction_with_keys(data_keys, options = {})
+      public_keys = []
+      public_keys << data_keys
+      public_keys.flatten!
+
+      if options.has_key?(:force_fee)
+        self.set_fee(BigDecimal.new(options[:force_fee]))
+      else
+        self.set_fee
+      end
+
+      valid_output = MastercoinWallet.config.spendable_outputs.find{|x| BigDecimal.new(x[:value]) > (self.fee + self.mastercoin_tx)}
+
+      if valid_output.is_a?(Array)
+        ouput = valid_output[0]
+      else
+        output = valid_output
+      end
+
+      unless output
+          Qt::MessageBox.critical(self, tr("Could not send transaction"),
+                                 tr("It appears there are no spendable outputs for this address that are big enough to transmit this transaction. Please consolidate some coins and send them to your Mastercoin address."))
+          return
+      end
+
+      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)
+      rescue ArgumentError
+        Qt::MessageBox.information(self, tr("Could not send payment."),
+                                   tr("Could not send payment, wrong password."))
+        return
+      end
+        begin
+          key = Bitcoin::Key.from_base58(priv_key)
+        rescue ArgumentError
+          begin
+            key = Bitcoin::Key.new(priv_key)
+          rescue ArgumentError, OpenSSL::BNError
+              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)
+
+
+        tx = build_tx do |t|
+          t.input do |i|
+            i.prev_out Bitcoin::Protocol::Tx.from_hash(tx)
+            i.prev_out_index output["prev_out"]["n"] 
+            i.signature_key key
+          end
+
+          # Change address
+          t.output do |o|
+            o.value change_amount * 1e8
+
+            o.script do |s|
+              s.type :address
+              s.recipient MastercoinWallet.config.address
+            end
+          end
+
+          if @receiving_address
+            # Receiving address
+            t.output do |o|
+              o.value tx_amount * 1e8
+
+              o.script do |s|
+                s.type :address
+                s.recipient @receiving_address
+              end
+            end
+          end
+
+          # Exodus address
+          t.output do |o|
+            o.value tx_amount * 1e8
+
+            o.script do |s|
+              s.type :address
+              s.recipient Mastercoin::EXODUS_ADDRESS
+            end
+          end
+
+          # Data address
+          t.output do |o|
+            o.value (tx_amount) * 1e8 * 2
+
+            o.script do |s|
+              s.type :multisig
+              s.recipient 1, *public_keys
+            end
+          end
+        end
+
+        tx = Bitcoin::Protocol::Tx.new( tx.to_payload )
+
+        MastercoinWallet.log.debug("TX Made: #{tx.to_hash}")
+
+        transaction_hash = tx.to_payload.unpack("H*").first
+
+        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}")
+
+        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
+        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."))
+        end
+    end
+
+  end
+end