erc20 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85e0628229d427776681b41f5937a4ac7259333c946866c6662ce6a6b9ac32d9
-  data.tar.gz: 217938bd8b36af8844f3f3fc7f4f4f44d06af596cef01e3de46f017349f633ff
+  metadata.gz: 9aaaf16c1cb37a5f676efbec190e3b707c34fa816e781d3119c43b5b2b44500b
+  data.tar.gz: a77d26b7f77b56f9a46f860b4a5e5104ed7239da40f16d14b056c96b8d05ca88
 SHA512:
-  metadata.gz: 7f9e60bab73c14a1ff6cacc2ef49b1ee7c615e0e36747b53540ef0988a7adbbb2482ce14eec32a393de56e853c4ae781b59a29df13fc4687fb4558e33f192d57
-  data.tar.gz: d472ce73882cf23a0a24f355961261cf03204c592eee0f8a439f2cb4e32ca76933e78cd563a4b2952c5050b1fe7eeef2ed2b9bceee7087ffda683a032abdeeaf
+  metadata.gz: edef3ec85bb02e73d8815907bf6f256b1a261b8051ada8a1280efde631d8faaa70e5533c4577e63843615a163e4115e383ce4d7d891592277fb71377d1eafffd
+  data.tar.gz: 484da28c8385d9a5b4ce18ca0cffd26e221144d641d1e9f777980a6394edcac0843a9f5e58e2243e7f858aea561ff8a39466934eefd01cfebced3071a029f24b

data/lib/erc20/erc20.rb

@@ -42,5 +42,5 @@
 # License:: MIT
 module ERC20
   # Current version of the gem (changed by the +.rultor.yml+ on every release)
-  VERSION = '0.0.13'
+  VERSION = '0.0.15'
 end

data/lib/erc20/wallet.rb

@@ -131,8 +131,7 @@ class ERC20::Wallet
     raise 'Address must be a String' unless hex.is_a?(String)
     raise 'Invalid format of the address' unless /^0x[0-9a-fA-F]{40}$/.match?(hex)
     func = '70a08231' # balanceOf
-    padded = "000000000000000000000000#{hex[2..].downcase}"
-    data = "0x#{func}#{padded}"
+    data = "0x#{func}000000000000000000000000#{hex[2..].downcase}"
     r = jsonrpc.eth_call({ to: @contract, data: data }, 'latest')
     b = r[2..].to_i(16)
     @log.debug("Balance of #{hex} is #{b}")
@@ -172,7 +171,7 @@ class ERC20::Wallet
     amt_padded = ('0' * (64 - amt_hex.size)) + amt_hex
     data = "0x#{func}#{to_padded}#{amt_padded}"
     key = Eth::Key.new(priv: priv)
-    from = key.address
+    from = key.address.to_s
     tnx =
       @mutex.synchronize do
         nonce = jsonrpc.eth_getTransactionCount(from, 'pending').to_i(16)
@@ -214,24 +213,27 @@ class ERC20::Wallet
   # @param [Array] active List of addresses that we are actually listening to
   # @param [Boolean] raw TRUE if you need to get JSON events as they arrive from Websockets
   # @param [Integer] delay How many seconds to wait between +eth_subscribe+ calls
-  def accept(addresses, active = [], raw: false, delay: 1)
+  # @param [Integer] subscription_id Unique ID of the subscription
+  def accept(addresses, active = [], raw: false, delay: 1, subscription_id: rand(99_999))
     raise 'Addresses can\'t be nil' unless addresses
     raise 'Addresses must respond to .to_a()' unless addresses.respond_to?(:to_a)
     raise 'Active can\'t be nil' unless active
-    raise 'Active must respond to .append()' unless addresses.respond_to?(:append)
+    raise 'Active must respond to .append()' unless active.respond_to?(:append)
     raise 'Amount must be an Integer' unless delay.is_a?(Integer)
     raise 'Amount must be a positive Integer' unless delay.positive?
+    raise 'Subscription ID must be an Integer' unless subscription_id.is_a?(Integer)
+    raise 'Subscription ID must be a positive Integer' unless subscription_id.positive?
     EventMachine.run do
       u = url(http: false)
       @log.debug("Connecting to #{u.hostname}:#{u.port}...")
       ws = Faye::WebSocket::Client.new(u.to_s, [], proxy: @proxy ? { origin: @proxy } : {})
       log = @log
       contract = @contract
-      id = rand(99_999)
       attempt = []
+      log_url = "ws#{@ssl ? 's' : ''}://#{u.hostname}:#{u.port}"
       ws.on(:open) do
         verbose do
-          log.debug("Connected to ws://#{u.hostname}:#{u.port}")
+          log.debug("Connected to #{log_url}")
         end
       end
       ws.on(:message) do |msg|
@@ -243,7 +245,7 @@ class ERC20::Wallet
               active.append(a) unless before.include?(a)
             end
             log.debug(
-              "Subscribed ##{id} to #{active.to_a.size} addresses: " \
+              "Subscribed ##{subscription_id} to #{active.to_a.size} addresses at #{log_url}: " \
               "#{active.to_a.map { |a| a[0..6] }.join(', ')}"
             )
           elsif data['method'] == 'eth_subscription' && data.dig('params', 'result')
@@ -257,7 +259,10 @@ class ERC20::Wallet
                 to: "0x#{event['topics'][2][26..].downcase}",
                 txn: event['transactionHash'].downcase
               }
-              log.debug("Payment of #{event[:amount]} tokens arrived from #{event[:from]} to #{event[:to]}")
+              log.debug(
+                "Payment of #{event[:amount]} tokens arrived" \
+                "from #{event[:from]} to #{event[:to]} in #{event[:txn]}"
+              )
             end
             yield event
           end
@@ -265,12 +270,12 @@ class ERC20::Wallet
       end
       ws.on(:close) do
         verbose do
-          log.debug("Disconnected from ws://#{u.hostname}:#{u.port}")
+          log.debug("Disconnected from #{log_url}")
         end
       end
       ws.on(:error) do |e|
         verbose do
-          log.debug("Error at #{u.hostname}: #{e.message}")
+          log.debug("Error at #{log_url}: #{e.message}")
         end
       end
       EventMachine.add_periodic_timer(delay) do
@@ -279,7 +284,7 @@ class ERC20::Wallet
         ws.send(
           {
             jsonrpc: '2.0',
-            id:,
+            id: subscription_id,
             method: 'eth_subscribe',
             params: [
               'logs',
@@ -295,7 +300,7 @@ class ERC20::Wallet
           }.to_json
         )
         log.debug(
-          "Requested to subscribe ##{id} to #{addresses.to_a.size} addresses: " \
+          "Requested to subscribe ##{subscription_id} to #{addresses.to_a.size} addresses at #{log_url}: " \
           "#{addresses.to_a.map { |a| a[0..6] }.join(', ')}"
         )
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erc20
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Yegor Bugayenko