bluzelle 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be7bb808d24a2b87f8d1f128d49b7076dd51d4357e6b5dc81c1302d2e1c1d9b3
-  data.tar.gz: 2576a055d888bcf7726584541274a1dbd3bef680019ddfd0c97fede963cb82f5
+  metadata.gz: 3856b2d51c46b960730b654272313166a81f6ec5317d7810e7d2efc3a79877d8
+  data.tar.gz: 130f1f531f074595fcce80da2d1b64239891db846dbeed7be5f77d3e270477c4
 SHA512:
-  metadata.gz: 3d124f196fff63444c10197f0b9b6108f70eab8aaf2fdb6e80a85e1815efcc1abd7b9f058b0cd362001b8c583637da9641a90a8bed2ef294580b514494040f11
-  data.tar.gz: e20c60cb8c21bae2fa4b35903f7f6fef8fc1ed1b40470241bafb6756733279c3900bba7d654b9dabfaa26e206f3b6e2c8fd53f3087783cabebdc1985c72320b8
+  metadata.gz: e65c93bb1f263c796cf6bfd68c9e52c2a2a3348feedf2db8ffb4bc2fd6390a97cad21b52615270d42479959e583351e49b7ce1fcdd727b850474d8caeaa32172
+  data.tar.gz: 707efb828462ecf5bf91eb907f377b79c90f4e36cf2903e49ec0ab6db4b7eaff3651283206c839450335c6512a4bd7714fac3798f036395e1e57fc61a7a34dce

data/lib/bluzelle.rb

@@ -31,6 +31,7 @@ MSG_KEYS_ORDER = %w[
   UUID
   Value
 ].freeze
+BLOCK_TIME_IN_SECONDS = 5
 
 module Bluzelle
   class OptionsError < StandardError
@@ -43,20 +44,7 @@ module Bluzelle
     raise OptionsError, 'address is required' unless options.fetch('address', nil)
     raise OptionsError, 'mnemonic is required' unless options.fetch('mnemonic', nil)
 
-    gas_info = options.fetch('gas_info', {})
-    unless gas_info.class.equal?(Hash)
-      raise OptionsError, 'gas_info should be a dict of {gas_price, max_fee, max_gas}'
-    end
-
-    gas_info_keys = %w[gas_price max_fee max_gas]
-    gas_info_keys.each do |k|
-      v = gas_info.fetch(k, 0)
-      unless v.class.equal?(Integer)
-        raise OptionsError, 'gas_info[%s] should be an int' % k
-      end
-
-      gas_info[k] = v
-    end
+    Bluzelle::validate_gas_info options.fetch('gas_info', {})
 
     options['debug'] = false unless options.fetch('debug', false)
     options['chain_id'] = DEFAULT_CHAIN_ID unless options.fetch('chain_id', nil)
@@ -114,43 +102,83 @@ module Bluzelle
 
     # mutate
 
-    def create(key, value, lease: 0)
-      send_transaction('post', '/crud/create', { 'Key' => key, 'Lease' => lease.to_s, 'Value' => value })
+    def create(key, value, lease_info: nil, gas_info: nil)
+      payload = {"Key" => key}
+      payload["Lease"] = Bluzelle::lease_info_to_blocks(lease_info).to_s if lease_info
+      payload["Value"] = value
+      send_transaction(
+        'post',
+        '/crud/create',
+        payload,
+        gas_info: gas_info
+      )
     end
 
-    def update(key, value, lease: nil)
+    def update(key, value, lease_info: nil, gas_info: nil)
       payload = {"Key" => key}
-      payload["Lease"] = lease.to_s if lease.is_a? Integer
+      payload["Lease"] = Bluzelle::lease_info_to_blocks(lease_info).to_s if lease_info
       payload["Value"] = value
-      send_transaction("post", "/crud/update", payload)
+      send_transaction(
+        "post",
+        "/crud/update",
+        payload,
+        gas_info: gas_info
+      )
     end
 
-    def delete(key)
-      send_transaction("delete", "/crud/delete", {"Key" => key})
+    def delete(key, gas_info: nil)
+      send_transaction(
+        "delete",
+        "/crud/delete",
+        {"Key" => key},
+        gas_info: gas_info
+      )
     end
 
-    def rename(key, new_key)
-      send_transaction("post", "/crud/rename", {"Key" => key, "NewKey" => new_key})
+    def rename(key, new_key, gas_info: nil)
+      send_transaction(
+        "post",
+        "/crud/rename",
+        {"Key" => key, "NewKey" => new_key},
+        gas_info: gas_info
+      )
     end
 
-    def delete_all()
-      send_transaction("post", "/crud/deleteall", {})
+    def delete_all(gas_info: nil)
+      send_transaction(
+        "post",
+        "/crud/deleteall",
+        {},
+        gas_info: gas_info
+      )
     end
 
-    def multi_update(payload)
+    def multi_update(payload, gas_info: nil)
       list = []
       payload.each do |key, value|
         list.append({"key" => key, "value" => value})
       end
-      send_transaction("post", "/crud/multiupdate", {"KeyValues" => list})
+      send_transaction(
+        "post",
+        "/crud/multiupdate", {"KeyValues" => list},
+        gas_info: gas_info
+      )
     end
 
-    def renew_lease(key, lease)
-      send_transaction("post", "/crud/renewlease", {"Key" => key, "Lease" => lease.to_s})
+    def renew_lease(key, lease_info, gas_info: nil)
+      send_transaction(
+        "post", "/crud/renewlease",
+        {"Key" => key, "Lease" => Bluzelle::lease_info_to_blocks(lease_info).to_s},
+        gas_info: gas_info
+      )
     end
 
-    def renew_all_leases(lease)
-      send_transaction("post", "/crud/renewleaseall", {"Lease" => lease.to_s})
+    def renew_all_leases(lease_info, gas_info: nil)
+      send_transaction(
+        "post", "/crud/renewleaseall",
+        {"Lease" => Bluzelle::lease_info_to_blocks(lease_info).to_s},
+        gas_info: gas_info
+      )
     end
 
     # query
@@ -187,49 +215,57 @@ module Bluzelle
 
     def get_lease(key)
       url = "/crud/getlease/#{@options["uuid"]}/#{key}"
-      api_query(url)["result"]["lease"].to_i
+      Bluzelle::lease_blocks_to_seconds api_query(url)["result"]["lease"].to_i
     end
 
     def get_n_shortest_leases(n)
-      url = "/crud/getnshortestlease/#{@options["uuid"]}/#{n}"
-      api_query(url)["result"]["keyleases"]
+      url = "/crud/getnshortestleases/#{@options["uuid"]}/#{n}"
+      kls = api_query(url)["result"]["keyleases"]
+      kls.each do |kl|
+        kl["lease"] = Bluzelle::lease_blocks_to_seconds kl["lease"]
+      end
+      kls
     end
 
     #
 
-    def tx_read(key)
-      res = send_transaction("post", "/crud/read", {"Key" => key})
+    def tx_read(key, gas_info: nil)
+      res = send_transaction("post", "/crud/read", {"Key" => key}, gas_info: gas_info)
       res["value"]
     end
 
-    def tx_has(key)
-      res = send_transaction("post", "/crud/has", {"Key" => key})
+    def tx_has(key, gas_info: nil)
+      res = send_transaction("post", "/crud/has", {"Key" => key}, gas_info: gas_info)
       res["has"]
     end
 
-    def tx_count()
-      res = send_transaction("post", "/crud/count", {})
+    def tx_count(gas_info: nil)
+      res = send_transaction("post", "/crud/count", {}, gas_info: gas_info)
       res["count"].to_i
     end
 
-    def tx_keys()
-      res = send_transaction("post", "/crud/keys", {})
+    def tx_keys(gas_info: nil)
+      res = send_transaction("post", "/crud/keys", {}, gas_info: gas_info)
       res["keys"]
     end
 
-    def tx_key_values()
-      res = send_transaction("post", "/crud/keyvalues", {})
+    def tx_key_values(gas_info: nil)
+      res = send_transaction("post", "/crud/keyvalues", {}, gas_info: gas_info)
       res["keyvalues"]
     end
 
-    def tx_get_lease(key)
-      res = send_transaction("post", "/crud/getlease", {"Key" => key})
-      res["lease"].to_i
+    def tx_get_lease(key, gas_info: nil)
+      res = send_transaction("post", "/crud/getlease", {"Key" => key}, gas_info: gas_info)
+      Bluzelle::lease_blocks_to_seconds res["lease"].to_i
     end
 
-    def tx_get_n_shortest_leases(n)
-      res = send_transaction("post", "/crud/getnshortestlease", {"N" => n.to_s})
-      res["keyleases"]
+    def tx_get_n_shortest_leases(n, gas_info: nil)
+      res = send_transaction("post", "/crud/getnshortestleases", {"N" => n.to_s}, gas_info: gas_info)
+      kls = res["keyleases"]
+      kls.each do |kl|
+        kl["lease"] = Bluzelle::lease_blocks_to_seconds kl["lease"]
+      end
+      kls
     end
 
     #
@@ -268,10 +304,10 @@ module Bluzelle
       data
     end
 
-    def send_transaction(method, endpoint, payload)
+    def send_transaction(method, endpoint, payload, gas_info: nil)
       @broadcast_retries = 0
       txn = validate_transaction(method, endpoint, payload)
-      broadcast_transaction(txn)
+      broadcast_transaction(txn, gas_info: gas_info)
     end
 
     def validate_transaction(method, endpoint, payload)
@@ -287,11 +323,17 @@ module Bluzelle
       api_mutate(method, endpoint, payload)['value']
     end
 
-    def broadcast_transaction(data)
+    def broadcast_transaction(data, gas_info: nil)
       # fee
       fee = data['fee']
       fee_gas = fee['gas'].to_i
-      gas_info = @options['gas_info']
+      if gas_info == nil
+        gas_info = @options['gas_info']
+      end
+      if gas_info == nil
+        raise OptionsError, 'please provide gas_info when initializing the client or in the transaction'
+      end
+      Bluzelle::validate_gas_info gas_info
       if gas_info['max_gas'] != 0 && fee_gas > gas_info['max_gas']
         fee['gas'] = gas_info['max_gas'].to_s
       end
@@ -346,7 +388,7 @@ module Bluzelle
 
         sleep BROADCAST_RETRY_INTERVAL_SECONDS
         set_account()
-        broadcast_transaction(txn)
+        broadcast_transaction(txn, gas_info: gas_info)
         return
       end
 
@@ -422,7 +464,7 @@ module Bluzelle
 
   def self.hex_to_ascii(h)
     [h].pack('H*')
-   end
+  end
 
   def self.make_random_string(size)
     SecureRandom.alphanumeric size
@@ -433,4 +475,65 @@ module Bluzelle
     # h.to_json
     # Hash[*h.sort.flatten].to_json
   end
+
+  def self.lease_info_to_blocks(lease_info)
+    if !lease_info
+      raise OptionsError, 'provided lease info is nil'
+    end
+    unless lease_info.class.equal?(Hash)
+      raise OptionsError, 'lease_info should be a hash of {days, hours, minutes, seconds}'
+    end
+
+    days = lease_info.fetch('days', 0)
+    hours = lease_info.fetch('hours', 0)
+    minutes = lease_info.fetch('minutes', 0)
+    seconds = lease_info.fetch('seconds', 0)
+
+    if seconds
+      unless seconds.class.equal?(Integer)
+        raise OptionsError, 'lease_info[seconds] should be an int'
+      end
+    end
+    if minutes
+      unless minutes.class.equal?(Integer)
+        raise OptionsError, 'lease_info[minutes] should be an int'
+      end
+    end
+    if hours
+      unless hours.class.equal?(Integer)
+        raise OptionsError, 'lease_info[hours] should be an int'
+      end
+    end
+    if days
+      unless days.class.equal?(Integer)
+        raise OptionsError, 'lease_info[days] should be an int'
+      end
+    end
+
+    seconds += days * 24 * 60 * 60
+  	seconds += hours * 60 * 60
+  	seconds += minutes * 60
+    seconds / BLOCK_TIME_IN_SECONDS # rounded down
+  end
+
+  def self.lease_blocks_to_seconds(blocks)
+    blocks * BLOCK_TIME_IN_SECONDS
+  end
+
+  def self.validate_gas_info gas_info
+    unless gas_info.class.equal?(Hash)
+      raise OptionsError, 'gas_info should be a hash of {gas_price, max_fee, max_gas}'
+    end
+
+    gas_info_keys = %w[gas_price max_fee max_gas]
+    gas_info_keys.each do |k|
+      v = gas_info.fetch(k, 0)
+      unless v.class.equal?(Integer)
+        raise OptionsError, "gas_info[#{k}] should be an int"
+      end
+
+      gas_info[k] = v
+    end
+    gas_info
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bluzelle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - vbstreetz