bitbot 0.0.2 → 0.0.3

data/README.md

@@ -87,6 +87,7 @@ blockchain:
   wallet_id: <long guid>
   password1: <password>
   password2: <secondary password>
+  withdrawal_fee: <fee in satoshi, default: 50000>
 
 data:
   path: /home/me/.bitbot

data/bitbot.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = %q{bitbot}
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Zach Wily"]
   s.email       = ["zach@zwily.com"]

data/lib/bitbot/plugin/common.rb

@@ -24,6 +24,10 @@ module Bitbot::Common
     @cached_exchange_rates = new
   end
 
+  def withdrawal_fee
+    config['blockchain']['withdrawal_fee'] || 50000
+  end
+
   #
   # Returns a database handle for use in the current thread.
   #
@@ -54,6 +58,15 @@ module Bitbot::Common
     nil
   end
 
+  #
+  # Takes a string, and returns an int with number of satoshi.
+  # Eventually this could be smart enough to handle specified units too,
+  # rather than just assuming BTC every time.
+  #
+  def str_to_satoshi(str)
+    (str.to_f * 10**8).to_i
+  end
+
   #
   # Some number formatting helpers
   #

data/lib/bitbot/plugin/tip.rb

@@ -14,7 +14,7 @@ module Bitbot::Tip
     recipient_user_id = db.get_or_create_user_id_for_username(recipient_ircuser.user)
 
     # Convert amount to satoshi
-    satoshi = (amount.to_f * 10**8).to_i
+    satoshi = str_to_satoshi(amount)
     if satoshi <= 0
       m.user.msg("Cannot send a negative amount.")
       return

data/lib/bitbot/plugin/withdraw.rb

@@ -1,26 +1,24 @@
 module Bitbot::Withdraw
   def on_withdraw(m, args)
     if args =~ /\s+([\d.]+)\s+([13][0-9a-zA-Z]{26,35})/
-      amount = $1.to_f
+      satoshi = str_to_satoshi($1)
       address = $2
 
       user_id = db.get_or_create_user_id_for_username(m.user.user)
-      satoshi = (amount * 10**8).to_i
 
       # Perform the local transaction in the database. Note that we
       # don't do the blockchain update in the transaction, because we
       # don't want to roll back the transaction if the blockchain update
       # *appears* to fail. It might look like it failed, but really
       # succeed, letting someone withdraw money twice.
-      # TODO: don't hardcode fee
       begin
-        db.create_transaction_from_withdrawal(user_id, satoshi, 50000, address)
+        db.create_transaction_from_withdrawal(user_id, satoshi, withdrawal_fee, address)
       rescue Bitbot::InsufficientFundsError
         m.reply "You don't have enough to withdraw #{satoshi_to_str(satoshi)} + 0.0005 fee"
         return
       end
 
-      response = blockchain.create_payment(address, satoshi, 50000)
+      response = blockchain.create_payment(address, satoshi, withdrawal_fee)
       if response["tx_hash"]
         m.reply "Sent #{satoshi_with_usd(satoshi)} to #{address.irc(:bold)} " +
           "in transaction #{response["tx_hash"].irc(:grey)}."
@@ -30,7 +28,7 @@ module Bitbot::Withdraw
       end
     else
       m.reply "Usage: withdraw <amount in BTC> <address>"
-      m.reply "0.0005 BTC will also be withdrawn for the transaction fee."
+      m.reply "#{satoshi_to_str(withdrawal_fee)} BTC will also be withdrawn for the transaction fee."
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitbot
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch