erc20 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96f0b876fa43c7c6ca87ebd998987fce27fa8a3c1923d906e71d674265083e7a
-  data.tar.gz: 9b43b005266bb003a086b4457a0d31f1dcd7eba08b82d6301ae5a93f9bfd32d3
+  metadata.gz: 429ad43c63c2126e8f57d5adcbe391c573f34f0a4d1174d19427f7f0b121aab2
+  data.tar.gz: e354d3bc37396d2c1b35da5ca1800ce01ce90905b9ad9bd64e0617c71e1350b1
 SHA512:
-  metadata.gz: 1d3e51d047763a3139c77286b41af1fdfeb40c2d10ed0c86dbfe1f1443d328957a1b37fc27a147ffcfcbb2c40f1071144a781292cf71e58dd5858045740cefd4
-  data.tar.gz: d4baf3bd795940d5daad717ec0b8b182bc849fc000fd402ae3906d93ad31d371c1ed5aaf82e02af2ccc4ff051bd24b83104c73316c34eeb917c094e747f1f9f0
+  metadata.gz: fc5eb0f95f5269cd94b848a05839ac4939b60efef2b0036a2ab693d6f16cc6a1c0d025d5ba580c2f5ce47232c494a64de224b66a47a155464b1401ac022d82f3
+  data.tar.gz: 83b0d56783372f8a90eb0e9d89f6eed15101eb7eb0787882833baa73b1d97163b08b175f80c350d1f236e74e363ee9c1ffd4412437baa9630bfa4ee87196d8e2

data/lib/erc20/erc20.rb

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

data/lib/erc20/wallet.rb

@@ -326,54 +326,58 @@ class ERC20::Wallet
       attempt = []
       log_url = "ws#{@ssl ? 's' : ''}://#{u.hostname}:#{u.port}"
       ws.on(:open) do
-        verbose do
-          log.debug("Connected to #{log_url}")
+        safe do
+          verbose do
+            log.debug("Connected to #{log_url}")
+          end
         end
       end
       ws.on(:message) do |msg|
-        verbose do
-          data = to_json(msg)
-          if data['id']
-            before = active.to_a
-            attempt.each do |a|
-              active.append(a) unless before.include?(a)
-            end
-            log.debug(
-              "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')
-            event = data['params']['result']
-            if raw
-              log.debug("New event arrived from #{event['address']}")
-            else
-              event = {
-                amount: event['data'].to_i(16),
-                from: "0x#{event['topics'][1][26..].downcase}",
-                to: "0x#{event['topics'][2][26..].downcase}",
-                txn: event['transactionHash'].downcase
-              }
+        safe do
+          verbose do
+            data = to_json(msg)
+            if data['id']
+              before = active.to_a
+              attempt.each do |a|
+                active.append(a) unless before.include?(a)
+              end
               log.debug(
-                "Payment of #{event[:amount]} tokens arrived " \
-                "from #{event[:from]} to #{event[:to]} in #{event[:txn]}"
+                "Subscribed ##{subscription_id} to #{active.to_a.size} addresses at #{log_url}: " \
+                "#{active.to_a.map { |a| a[0..6] }.join(', ')}"
               )
-            end
-            begin
+            elsif data['method'] == 'eth_subscription' && data.dig('params', 'result')
+              event = data['params']['result']
+              if raw
+                log.debug("New event arrived from #{event['address']}")
+              else
+                event = {
+                  amount: event['data'].to_i(16),
+                  from: "0x#{event['topics'][1][26..].downcase}",
+                  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]} in #{event[:txn]}"
+                )
+              end
               yield event
-            rescue StandardError => e
-              @log.error(Backtrace.new(e).to_s)
             end
           end
         end
       end
       ws.on(:close) do
-        verbose do
-          log.debug("Disconnected from #{log_url}")
+        safe do
+          verbose do
+            log.debug("Disconnected from #{log_url}")
+          end
         end
       end
       ws.on(:error) do |e|
-        verbose do
-          log.debug("Error at #{log_url}: #{e.message}")
+        safe do
+          verbose do
+            log.debug("Error at #{log_url}: #{e.message}")
+          end
         end
       end
       EventMachine.add_periodic_timer(delay) do
@@ -420,15 +424,22 @@ class ERC20::Wallet
     raise e
   end
 
+  def safe
+    yield
+  rescue StandardError
+    # ignore it
+  end
+
   def url(http: true)
     URI.parse("#{http ? 'http' : 'ws'}#{@ssl ? 's' : ''}://#{@host}:#{@port}#{http ? @http_path : @ws_path}")
   end
 
   def jsonrpc
     JSONRPC.logger = Loog::NULL
-    connection =
-      if @proxy
-        uri = URI.parse(@proxy)
+    opts = {}
+    if @proxy
+      uri = URI.parse(@proxy)
+      opts[:connection] =
         Faraday.new do |f|
           f.adapter(Faraday.default_adapter)
           f.proxy = {
@@ -437,8 +448,8 @@ class ERC20::Wallet
             password: uri.password
           }
         end
-      end
-    JSONRPC::Client.new(url, connection:)
+    end
+    JSONRPC::Client.new(url.to_s, opts)
   end
 
   def to_pay_data(address, amount)

data/test/erc20/test_wallet.rb

@@ -331,13 +331,14 @@ class TestWallet < ERC20::Test
   end
 
   def test_checks_balance_via_proxy
+    b = nil
     via_proxy do |proxy|
       on_hardhat do |w|
         wallet = through_proxy(w, proxy)
         b = wallet.balance(Eth::Key.new(priv: JEFF).address.to_s)
-        assert_equal(123_000_100_000, b)
       end
     end
+    assert_equal(123_000_100_000, b)
   end
 
   def test_checks_balance_via_proxy_on_mainnet

metadata

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