mastercoin-wallet 0.0.2 → 0.0.3

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

@@ -0,0 +1,50 @@
+module MastercoinWallet 
+  class BitcoinOfferWindow < Qt::Dialog
+    include Bitcoin::Builder
+    include MastercoinWallet::Builder
+
+    slots 'send_transaction()'
+
+    def initialize(parent=nil, options)
+      super(parent)
+
+      @ui = Ui_BitcoinOffer.new
+      @ui.setupUi(self)
+
+      @amount_input = findChild(Qt::LineEdit, "amountInput")
+      @password_input = findChild(Qt::LineEdit, "passwordInput")
+      @address_input = findChild(Qt::LineEdit, "addressInput")
+
+      @amount_input.text = options[:bitcoin_amount] if options.has_key?(:bitcoin_amount)
+      @address_input.text = options[:address] if options.has_key?(:address)
+
+      @submit = findChild(Qt::PushButton, "submit_button")
+
+      @amount_input.validator = Qt::DoubleValidator.new(0.00000001, 10000,8, @amount_input)
+
+      @submit.enabled = true
+
+      connect(@submit, SIGNAL('clicked()'), self, SLOT('send_transaction()'))
+    end
+
+    def send_transaction
+      @amount = @amount_input.text()
+      @receiving_address = @address_input.text()
+      @password = @password_input.text()
+
+      unless Bitcoin::valid_address?(@receiving_address)
+        Qt::MessageBox.critical(self, tr("Invalid address"),
+                                tr("Please fill in a valid Bitcoin/Mastercoin address"))
+      end
+
+      unless @receiving_address.empty? || @amount.empty? || @password.empty? 
+         create_bitcoin_transaction_for(@amount)
+         close()
+      else
+        Qt::MessageBox.critical(self, tr("Invalid form"),
+                                tr("Please fill in all required inputs"))
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BitcoinOffer</class>
+ <widget class="QDialog" name="BitcoinOffer">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>534</width>
+    <height>238</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>New Purchase Offer</string>
+  </property>
+  <widget class="QWidget" name="verticalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>9</x>
+     <y>39</y>
+     <width>518</width>
+     <height>148</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="passwordInput">
+        <property name="echoMode">
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="addressInput">
+        <property name="minimumSize">
+         <size>
+          <width>300</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="placeholderText">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Masteroin address</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Amount</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Password</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="amountInput">
+        <property name="placeholderText">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>0</y>
+     <width>231</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>&lt;h3&gt;Pay for Purchase Offer&lt;/h3&gt;</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="submit_button">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>410</x>
+     <y>190</y>
+     <width>114</width>
+     <height>32</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Send</string>
+   </property>
+   <property name="autoDefault">
+    <bool>false</bool>
+   </property>
+  </widget>
+ </widget>
+ <tabstops>
+  <tabstop>addressInput</tabstop>
+  <tabstop>amountInput</tabstop>
+  <tabstop>passwordInput</tabstop>
+  <tabstop>submit_button</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

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

@@ -1,41 +1,93 @@
 module MastercoinWallet 
   class MainWindow < Qt::Dialog
-    slots 'new_simple_send()'
+    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)
+      address = item.text(0)
+      available = item.text(2)
+      fee = item.text(4)
+      new_purchase_offer({address: address, available: available, fee: fee})
+    end
+
+    def create_bitcoin_tx(item, position)
+      address = item.text(0)
+      bitcoin_amount = item.text(2)
+      if item.text(4) == "Waiting on Payment"
+        new_bitcoin_payment({address: address, bitcoin_amount: bitcoin_amount})
+      else
+        Qt::MessageBox.critical(self, tr("Invalid offer"),
+                                tr("You can't pay for this offer, either because it's not accepted yet or because it's expired."))
+      end
+    end
 
     def initialize()
       super
-      setWindowTitle(tr("Mastercoin wallet - v0.0.1"))
+  
 
-      @rows = []
+      @ui = Ui_MainWindow.new
+      @ui.setupUi(self)
 
-      createBalanceOverview()
+      setWindowTitle(tr("Mastercoin wallet - v0.0.3"))
 
-      @recentTransactions = Qt::TreeWidget.new
-      @recentTransactions.setColumnCount(2)
-      @recentTransactions.setHeaderLabels(["Address", "Amount", "Date"])
+      @rows = []
 
+      #createBalanceOverview()
+
+      @recentTransactions = findChild(Qt::TreeWidget, "overviewTree")
       @recentTransactions.setColumnWidth(0,300)
       @recentTransactions.setColumnWidth(1,50)
 
-      overview = Qt::VBoxLayout.new
-      @btc_balance_label = Qt::Label.new(tr("#{MastercoinWallet.config.btc_balance} BTC"))
-      overview.addWidget(Qt::Label.new(tr("<h3>Mastercoin wallet</h3>")),0,0)
-      overview.addWidget(Qt::Label.new(tr(MastercoinWallet.config.address)),1,0)
-      overview.addWidget(@btc_balance_label,1,1)
+      @order_book =  findChild(Qt::TreeWidget, "orderTree")
+      @order_book.setColumnWidth(0,280)
+      @order_book.setColumnWidth(1,70)
+      @order_book.setColumnWidth(2,80)
+      @order_book.setColumnWidth(4,70)
+
+      connect(@order_book, SIGNAL('itemDoubleClicked(QTreeWidgetItem *, int)'), self, SLOT('create_order(QTreeWidgetItem *,int)'))
+
+      @purchase_offers =  findChild(Qt::TreeWidget, "purchaseTree")
+      @purchase_offers.setColumnWidth(0,280)
+      @purchase_offers.setColumnWidth(1,70)
+      @purchase_offers.setColumnWidth(2,80)
+      @purchase_offers.setColumnWidth(4,100)
+
+      connect(@purchase_offers, SIGNAL('itemDoubleClicked(QTreeWidgetItem *, int)'), self, SLOT('create_bitcoin_tx(QTreeWidgetItem *,int)'))
+
+      @balance_label = findChild(Qt::Label, "mscBalanceLabel")
+      @test_balance_label = findChild(Qt::Label, "tMscBalanceLabel")
+      @btc_balance_label = findChild(Qt::Label, "bitcoinLabel")
+      @address_label = findChild(Qt::Label, "mscAddressLabel")
+      @address_label.text = MastercoinWallet.config.address
       
-      simple_send = Qt::PushButton.new
+      simple_send = findChild(Qt::PushButton, "simpleSendButton")
       simple_send.setText("New simple send")
       connect(simple_send, SIGNAL('clicked()'), self, SLOT('new_simple_send()'))
 
-      self.layout = Qt::GridLayout.new do |m|
-        m.addWidget(@gridGroupBox, 0, 0)
-        m.addLayout(overview, 0, 1)
-        m.addWidget(@recentTransactions, 1,0,1, 2)
-        m.addWidget(simple_send, 2,1)
-      end
+      selling_offer = findChild(Qt::PushButton, "sellingButton")
+      connect(selling_offer, SIGNAL('clicked()'), self, SLOT('new_selling_offer()'))
 
-      MastercoinWallet.network.add_observer(self, :update)
-      MastercoinWallet.network.sync!
+      purchase_offer = findChild(Qt::PushButton, "purchaseButton")
+      connect(purchase_offer, SIGNAL('clicked()'), self, SLOT('new_purchase_offer()'))
+
+      self.update
+      MastercoinWallet.selling_offers.add_observer(self, :update_order_book)
+      MastercoinWallet.wallet.add_observer(self, :update)
+      self.sync
+
+      # Sync every 30 seconds
+      @timer = Qt::Timer.new(self)
+      connect(@timer, SIGNAL('timeout()'), self, SLOT('sync()'))
+      @timer.start(30000)
+    end
+
+    def sync
+      MastercoinWallet.selling_offers.retrieve!
+      MastercoinWallet.wallet.sync!
+    end
+    
+    def new_bitcoin_payment(options = {})
+      dialog = MastercoinWallet::BitcoinOfferWindow.new(nil, options)
+      dialog.exec
     end
 
     def new_simple_send
@@ -43,39 +95,113 @@ module MastercoinWallet
       dialog.exec
     end
 
+    def new_selling_offer
+      dialog = MastercoinWallet::SellingOfferWindow.new
+      dialog.exec
+    end
+
+    def new_purchase_offer(options = {})
+      dialog = MastercoinWallet::PurchaseOfferWindow.new(nil, options)
+      dialog.exec
+    end
+
     def update(status = true)
-      puts "update"
       load_transactions
       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"])
+      row.setText(1, item["amount"])
+      row.setText(2, type)
+      row.setText(3, coin_name(item["currency_id"]))
+      row.setText(4, item["tx_date"])
+      return row
+    end
+
+    def add_offer_row(item)
+      row = Qt::TreeWidgetItem.new
+      row.setText(0, item["address"])
+      row.setText(1, coin_name(item["currency_id"]))
+      row.setText(2, item["amount_available"])
+      row.setText(3, "#{item["price_per_coin"]} BTC")
+      row.setText(4, item["required_fee"])
+      row.setText(5, item["tx_date"])
+      return row
+    end
+
+    def add_purchase_row(item)
+      row = Qt::TreeWidgetItem.new
+      row.setText(0, item["selling_offer"]["address"])
+      row.setText(1, item["amount"])
+      row.setText(2, item["bitcoins_required"])
+      row.setText(3, coin_name(item["currency_id"]))
+      row.setText(4, item["status_text"])
+      row.setText(5, item["tx_date"])
+      return row
+    end
+
+    def update_order_book(orders)
+      orders.each do |order|
+        @rows << add_offer_row(order)
+      end
+      @order_book.clear()
+      @order_book.insertTopLevelItems(0, @rows)
+    end
+
     def load_transactions
+      if MastercoinWallet.config.has_key?(:pending_offers)
+        MastercoinWallet.config.pending_offers.each do |x|
+          @rows << add_purchase_row(x)
+        end
+        @purchase_offers.clear()
+        @purchase_offers.insertTopLevelItems(0, @rows)
+      end
+
       if MastercoinWallet.config.has_key?(:received_transactions)
         MastercoinWallet.config.received_transactions.each do |x|
-          row = Qt::TreeWidgetItem.new
-          row.setText(0, x["address"])
-          row.setText(1, x["amount"])
-          row.setText(2, x["tx_date"])
-          @rows << row
+          @rows << add_row(x, "Receiving")
+        end
+      end
+
+      if MastercoinWallet.config.has_key?(:exodus_transactions)
+        MastercoinWallet.config.exodus_transactions.each do |x|
+          @rows << add_row(x, "Exodus")
         end
       end
 
       if MastercoinWallet.config.has_key?(:sent_transactions)
         MastercoinWallet.config.sent_transactions.each do |x|
-          row = Qt::TreeWidgetItem.new
-          row.setText(0, x["receiving_address"])
-          row.setText(1, x["amount"])
-          row.setText(2, x["tx_date"])
-          @rows << row
+          @rows << add_row(x, "Sent")
         end
       end
-
+      if MastercoinWallet.config.has_key?(:bought)
+        MastercoinWallet.config.sent_transactions.each do |x|
+          @rows << add_row(x, "Bought")
+        end
+      end
+      if MastercoinWallet.config.has_key?(:sold)
+        MastercoinWallet.config.sent_transactions.each do |x|
+          @rows << add_row(x, "Sold")
+        end
+      end
+      @recentTransactions.clear()
       @recentTransactions.insertTopLevelItems(0, @rows)
     end
 
     def update_balance
       @balance_label.setText("#{MastercoinWallet.config.balance} MSC")
-      @test_balance_label.setText("Test #{MastercoinWallet.config.test_balance} MSC")
+      @test_balance_label.setText("#{MastercoinWallet.config.test_balance} Test MSC")
       @btc_balance_label.setText(tr("#{MastercoinWallet.config.btc_balance} BTC"))
     end
 

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

@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QDialog" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>746</width>
+    <height>469</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>New Purchase Offer</string>
+  </property>
+  <widget class="QTabWidget" name="mainTab">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>731</width>
+     <height>451</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="currentIndex">
+    <number>0</number>
+   </property>
+   <widget class="QWidget" name="tab">
+    <attribute name="title">
+     <string>Dashboard</string>
+    </attribute>
+    <widget class="QGroupBox" name="balanceGroup">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>0</y>
+       <width>201</width>
+       <height>111</height>
+      </rect>
+     </property>
+     <property name="title">
+      <string>Balances</string>
+     </property>
+     <widget class="QLabel" name="mscBalanceLabel">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>30</y>
+        <width>181</width>
+        <height>19</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Updating MSC balance</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="tMscBalanceLabel">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>50</y>
+        <width>171</width>
+        <height>20</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Updating test MSC balance</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="bitcoinLabel">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>70</y>
+        <width>171</width>
+        <height>19</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Updating Bitcoin balance</string>
+      </property>
+     </widget>
+    </widget>
+    <widget class="QLabel" name="mscAddressLabel">
+     <property name="geometry">
+      <rect>
+       <x>220</x>
+       <y>40</y>
+       <width>471</width>
+       <height>51</height>
+      </rect>
+     </property>
+     <property name="font">
+      <font>
+       <family>Verdana</family>
+       <pointsize>24</pointsize>
+      </font>
+     </property>
+     <property name="text">
+      <string>MSC Address</string>
+     </property>
+    </widget>
+    <widget class="QTreeWidget" name="overviewTree">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>120</y>
+       <width>711</width>
+       <height>251</height>
+      </rect>
+     </property>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+     <property name="columnCount">
+      <number>5</number>
+     </property>
+     <column>
+      <property name="text">
+       <string>Address</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Amount</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Type</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Currency</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Date</string>
+      </property>
+     </column>
+    </widget>
+    <widget class="QPushButton" name="simpleSendButton">
+     <property name="geometry">
+      <rect>
+       <x>580</x>
+       <y>380</y>
+       <width>141</width>
+       <height>32</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>new Simple Send</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_3">
+     <property name="geometry">
+      <rect>
+       <x>220</x>
+       <y>20</y>
+       <width>231</width>
+       <height>19</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Mastercoin wallet for</string>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QWidget" name="tab_2">
+    <attribute name="title">
+     <string>Distributed exchange</string>
+    </attribute>
+    <widget class="QTreeWidget" name="orderTree">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>30</y>
+       <width>701</width>
+       <height>131</height>
+      </rect>
+     </property>
+     <property name="toolTip">
+      <string>Double click to create a purchase offer from this Selling Offer</string>
+     </property>
+     <column>
+      <property name="text">
+       <string>Seller</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Currency</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Units available</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Price per coin</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Required fee</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Date</string>
+      </property>
+     </column>
+    </widget>
+    <widget class="QLabel" name="label">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>-2</y>
+       <width>151</width>
+       <height>31</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>&lt;h2&gt;Order book&lt;/h2&gt;</string>
+     </property>
+    </widget>
+    <widget class="QPushButton" name="sellingButton">
+     <property name="geometry">
+      <rect>
+       <x>580</x>
+       <y>160</y>
+       <width>131</width>
+       <height>32</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>New Selling Offer</string>
+     </property>
+    </widget>
+    <widget class="QTreeWidget" name="purchaseTree">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>250</y>
+       <width>701</width>
+       <height>131</height>
+      </rect>
+     </property>
+     <column>
+      <property name="text">
+       <string>Offer address</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Amount</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Bitcoin amount</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Currency</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Offer status</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Date</string>
+      </property>
+     </column>
+    </widget>
+    <widget class="QLabel" name="label_2">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>210</y>
+       <width>191</width>
+       <height>31</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>&lt;h2&gt;My purchase offers&lt;/h2&gt;</string>
+     </property>
+    </widget>
+    <widget class="QPushButton" name="purchaseButton">
+     <property name="geometry">
+      <rect>
+       <x>560</x>
+       <y>380</y>
+       <width>151</width>
+       <height>32</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>New Purchase Offer</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_4">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>160</y>
+       <width>521</width>
+       <height>21</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Hint: You can double click to create a Purchase Offer for an item in the order book</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_5">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>380</y>
+       <width>521</width>
+       <height>41</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Hint: You can double click to send the required Bitcoins for an accepted Purchase offer that's waiting on payment</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </widget>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>