sibit 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 478069971b53901e3037034ee2830d5b66154a77fc1b5087b17f15e94870ca39
-  data.tar.gz: 48039e52d5835aef4515e28c3fa3575e946e99556fcdb424f71c9f4c022f66e5
+  metadata.gz: bffdfd4fc0e852f5e78e27ce795d452f8d73b2e19af8b6d7f0c568a981b042b9
+  data.tar.gz: ab3d76f7ffa5d2773c969d74a707cc713a0a91b6f23f79827a8bb860dffd71a4
 SHA512:
-  metadata.gz: 80d804206aa880655b81a696a73558a47fc8dd1eee00d0c82fe7965283469d0b0586e56cace8d6309114af8572f8781deda7c259f6522317a9180c889a3e7fe5
-  data.tar.gz: 92d14ce0a35f45a1d994615a18fdde4472b33e39ff30c64f22606c0691bf37beed91db3a0c71f8a0f9f8b690da11eae24b8606030483213b5d34f42aae36d0fb
+  metadata.gz: bcf1082248a88d3d497957e7433a20b9ebb2ac66ee75136390ff8d28aef8082e2a8bbdc8f1ef766fb17b30835e3215c35128c3146ba24ad25788b3cac0519f6f
+  data.tar.gz: 41a43a40203b84dc78021a671993abfd5d5e9ed2ff502cc3891d8c4040b4b8d409fcbc9e6fa17ed71c69fdc66e3a78dee92ea72d199eee1ffc6def2b0097951b

data/README.md

@@ -57,16 +57,15 @@ $ sibit balance 1CC3X2gu58d6wXUWMffpuzN9JAfTUWu4Kj
 To send a payment from a few addresses to a new address:
 
 ```
-$ sibit pay KEY AMOUNT FEE SOURCE1,SOURCE2,... TARGET CHANGE
+$ sibit pay AMOUNT FEE A1:P1,A2:P2,... TARGET CHANGE
 e87f138c9ebf5986151667719825c28458a28cc66f69fed4f1032a93b399fdf8
 ```
 
 Here,
-`KEY` is the private key,
 `AMOUNT` is the amount of [satoshi](https://en.bitcoin.it/wiki/Satoshi_%28unit%29) you are sending,
 `FEE` is the [miner fee](https://en.bitcoin.it/wiki/Miner_fees) you are ready to spend to make this transaction delivered
 (you can say `S`, `M`, `L`, or `XL` if you want it to be calculated automatically),
-`SOURCE1,SOURCE2,...` is a comma-separated list of addresses you are sending your coins from,
+`A1:P1,A2:P2,...` is a comma-separated list of addresses `A` and private keys `P` you are sending your coins from,
 `TARGET` is the address you are sending to,
 `CHANGE` is the address where the change will be sent to.
 The transaction hash will be returned.
@@ -90,7 +89,7 @@ address = sibit.create(pkey)
 balance = sibit.balance(address)
 target = sibit.create(pkey) # where to send coins to
 change = sibit.create(pkey) # where the change will sent to
-tx = sibit.pay(pkey, 10_000_000, 'XL', [address], target, change)
+tx = sibit.pay(10_000_000, 'XL', { address => pkey }, target, change)
 ```
 
 Should work.

data/bin/sibit

@@ -65,19 +65,24 @@ Options are:"
     raise 'Address argument is required' if address.nil?
     puts sibit.balance(address)
   when 'pay'
-    pvt = opts.arguments[1]
-    raise 'Private key argument is required' if pvt.nil?
-    amount = opts.arguments[2]
+    amount = opts.arguments[1]
     raise 'Amount argument is required' if amount.nil?
-    fee = opts.arguments[3]
+    fee = opts.arguments[2]
     raise 'Miners fee argument is required' if fee.nil?
-    sources = opts.arguments[4]
+    sources = opts.arguments[3]
     raise 'Addresses argument is required' if sources.nil?
-    target = opts.arguments[5]
+    target = opts.arguments[4]
     raise 'Target argument is required' if target.nil?
-    change = opts.arguments[6]
+    change = opts.arguments[5]
     raise 'Change argument is required' if change.nil?
-    puts sibit.pay(pvt, amount, fee, sources.split(','), target, change)
+    puts sibit.pay(
+      amount, fee,
+      sources.split(',').map do |p|
+        address, pvt = p.split(':')
+        { address: address, pvt: pvt }
+      end,
+      target, change
+    )
   else
     raise "Command #{opts.arguments[0]} is not supported"
   end

data/lib/sibit/version.rb

@@ -26,5 +26,5 @@
 # License:: MIT
 class Sibit
   # Current version of the library.
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/lib/sibit.rb

@@ -83,19 +83,19 @@ class Sibit
   # If there are more than 1000 UTXOs in the address where you are trying
   # to send bitcoins from, this method won't be helpful.
   #
-  # +pvt+: the private key as a Hash160 string
   # +amount+: the amount either in satoshis or ending with 'BTC', like '0.7BTC'
   # +fee+: the miners fee in satoshis (as integer) or S/M/X/XL as a string
-  # +sources+: the array of bitcoin addresses where the coins are now
+  # +sources+: the hashmap of bitcoin addresses where the coins are now, with
+  # their addresses as keys and private keys as values
   # +target+: the target address to send to
   # +change+: the address where the change has to be sent to
-  def pay(pvt, amount, fee, sources, target, change)
+  def pay(amount, fee, sources, target, change)
     satoshi = satoshi(amount)
     builder = Bitcoin::Builder::TxBuilder.new
     unspent = 0
     size = 100
     utxos = get_json(
-      "/unspent?active=#{sources.join('|')}&limit=1000"
+      "/unspent?active=#{sources.keys.join('|')}&limit=1000"
     )['unspent_outputs']
     debug("#{utxos.count} UTXOs found:")
     utxos.each do |utxo|
@@ -104,7 +104,8 @@ class Sibit
         i.prev_out(utxo['tx_hash_big_endian'])
         i.prev_out_index(utxo['tx_output_n'])
         i.prev_out_script = [utxo['script']].pack('H*')
-        i.signature_key(key(pvt))
+        address = Bitcoin::Script.new([utxo['script']].pack('H*')).get_address
+        i.signature_key(key(sources[address]))
       end
       size += 180
       debug("  #{utxo['value']}/#{utxo['confirmations']} at #{utxo['tx_hash_big_endian']}")
@@ -133,7 +134,7 @@ class Sibit
     start = Time.now
     res = Net::HTTP.get_response(URI('https://blockchain.info' + uri))
     raise Error, "Failed to retrieve #{uri}: #{res.code}" unless res.code == '200'
-    debug("GET #{uri}: #{res.code} in #{age(start)}")
+    debug("GET #{uri}: #{res.code}/#{res.body.length}b in #{age(start)}")
     JSON.parse(res.body)
   end
 

data/test/test_sibit.rb

@@ -55,6 +55,7 @@ class TestSibit < Minitest::Test
     puts "address: #{address}"
     assert(!address.nil?)
     assert(/^1[0-9a-zA-Z]+$/.match?(address))
+    assert_equal(address, sibit.create(pkey))
   end
 
   def test_get_balance
@@ -99,9 +100,11 @@ class TestSibit < Minitest::Test
     target = sibit.create(sibit.generate)
     change = sibit.create(sibit.generate)
     tx = sibit.pay(
-      'fd2333686f49d8647e1ce8d5ef39c304520b08f3c756b67068b30a3db217dcb2',
       '0.0001BTC', 'S',
-      ['1JvCsJtLmCxEk7ddZFnVkGXpr9uhxZPmJi'],
+      {
+        '1JvCsJtLmCxEk7ddZFnVkGXpr9uhxZPmJi' =>
+        'fd2333686f49d8647e1ce8d5ef39c304520b08f3c756b67068b30a3db217dcb2'
+      },
       target, change
     )
     assert(!tx.nil?)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Yegor Bugayenko