erc20 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71eb4c1f0b7e6778be6d2b121792c20aa190cdfdfc62948ce39e1c4ea1cb288f
-  data.tar.gz: 9dbb23249587fe95bf6681ab9b87a131b4f946343c515df036c1fa1c7f45b200
+  metadata.gz: 01ef1fcd61cd21540d932e28c65ed8afa08891e0cc20b498202eb146809d4993
+  data.tar.gz: c8e4593fb968dcfbad8e27d24aa974a37946b444eb42b4022139c48c51ffc5ca
 SHA512:
-  metadata.gz: aeb83a009f276a4ead1a30e1d1cb052816067fb1571cca6cb20cc39a7840422342cbf246b498932be850c2330663d7e08356c2b3f35f2365acc933511462a4ab
-  data.tar.gz: '08b280c073e3d8bd1cc7b335b8d520e1808e190b50aaa227ee5fed17ae78ebc622637cd28c037e5991ea2dd8356cddb4f794ba240313f441cde0e79c3e7163d3'
+  metadata.gz: 38e4e84ea00f176c34a9f3f15ff0e77473f31fb29196b72d7e7b70af38e7aa8877015ff3249822b55665dfadac2cecb909a46d4c62554bcf5c85d8e1a1d30744
+  data.tar.gz: ffc78c5dfe3817bb59481f6e27e5e5fe7539ffca1e931fe8752fa31e98fee9e4c1880a2d3ce40496549c16b764524c0fad70c147d6f8a7467d8f1ba9c990d6dc

data/.rubocop.yml

@@ -11,7 +11,6 @@ AllCops:
   SuggestExtensions: false
   NewCops: enable
 plugins:
-  - rubocop-rspec
   - rubocop-performance
   - rubocop-rake
   - rubocop-minitest

data/Gemfile

@@ -9,12 +9,13 @@ gemspec
 gem 'backtrace', '>0', require: false
 gem 'concurrent-ruby', '~>1.2', require: false
 gem 'cucumber', '~>9.2', require: false
-gem 'donce', '>0', require: false
+gem 'donce', '>=0.2.3', require: false
 gem 'faraday', '>0', require: false
 gem 'loog', '>0', require: false
 gem 'minitest', '~>5.25', require: false
 gem 'minitest-reporters', '~>1.7', require: false
 gem 'minitest-retry', '~>0.2', require: false
+gem 'os', '>0', require: false
 gem 'qbash', '>0', require: false
 gem 'rake', '~>13.2', require: false
 gem 'random-port', '>0', require: false
@@ -22,7 +23,6 @@ gem 'rubocop', '~>1.75', require: false
 gem 'rubocop-minitest', '>0', require: false
 gem 'rubocop-performance', '>0', require: false
 gem 'rubocop-rake', '>0', require: false
-gem 'rubocop-rspec', '>0', require: false
 gem 'simplecov', '~>0.22', require: false
 gem 'simplecov-cobertura', '~>2.1', require: false
 gem 'threads', '~>0.4', require: false

data/Gemfile.lock

@@ -51,7 +51,7 @@ GEM
     cucumber-tag-expressions (6.1.2)
     diff-lcs (1.6.1)
     docile (1.4.1)
-    donce (0.2.0)
+    donce (0.2.3)
       backtrace (~> 0.3)
       os (~> 1.1)
       qbash (~> 0.3)
@@ -136,7 +136,7 @@ GEM
       rubyzip (~> 2.3)
     regexp_parser (2.10.0)
     rexml (3.4.1)
-    rubocop (1.75.2)
+    rubocop (1.75.3)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -161,9 +161,6 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.6.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
     rubyzip (2.4.1)
     scrypt (3.0.8)
@@ -214,13 +211,14 @@ DEPENDENCIES
   backtrace (> 0)
   concurrent-ruby (~> 1.2)
   cucumber (~> 9.2)
-  donce (> 0)
+  donce (>= 0.2.3)
   erc20!
   faraday (> 0)
   loog (> 0)
   minitest (~> 5.25)
   minitest-reporters (~> 1.7)
   minitest-retry (~> 0.2)
+  os (> 0)
   qbash (> 0)
   rake (~> 13.2)
   random-port (> 0)
@@ -228,7 +226,6 @@ DEPENDENCIES
   rubocop-minitest (> 0)
   rubocop-performance (> 0)
   rubocop-rake (> 0)
-  rubocop-rspec (> 0)
   simplecov (~> 0.22)
   simplecov-cobertura (~> 2.1)
   threads (~> 0.4)

data/Rakefile

@@ -39,7 +39,6 @@ require 'rubocop/rake_task'
 desc 'Run RuboCop on all directories'
 RuboCop::RakeTask.new(:rubocop) do |task|
   task.fail_on_error = true
-  task.requires << 'rubocop-rspec'
 end
 
 require 'cucumber/rake/task'

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.4'
+  VERSION = '0.1.5'
 end

data/lib/erc20/wallet.rb

@@ -308,7 +308,7 @@ class ERC20::Wallet
   # @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
   # @param [Integer] subscription_id Unique ID of the subscription
-  def accept(addresses, active = [], raw: false, delay: 1, subscription_id: rand(99_999))
+  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
@@ -318,72 +318,27 @@ class ERC20::Wallet
     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_it(:debug, "Connecting to #{u.hostname}:#{u.port}...")
-      ws = Faye::WebSocket::Client.new(u.to_s, [], proxy: @proxy ? { origin: @proxy } : {})
-      contract = @contract
-      attempt = []
-      log_url = "ws#{@ssl ? 's' : ''}://#{u.hostname}:#{u.port}"
-      ws.on(:open) do
-        safe do
-          verbose do
-            log_it(:debug, "Connected to #{log_url}")
-          end
-        end
-      end
-      ws.on(:message) do |msg|
-        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_it(
-                :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_it(: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_it(
-                  :debug,
-                  "Payment of #{event[:amount]} tokens arrived " \
-                  "from #{event[:from]} to #{event[:to]} in #{event[:txn]}"
-                )
-              end
-              yield event
-            end
-          end
-        end
-      end
-      ws.on(:close) do
-        safe do
-          verbose do
-            log_it(:debug, "Disconnected from #{log_url}")
-          end
-        end
-      end
-      ws.on(:error) do |e|
-        safe do
-          verbose do
-            log_it(:debug, "Error at #{log_url}: #{e.message}")
-          end
-        end
-      end
+      reaccept(addresses, active, raw:, delay:, subscription_id:, &)
+    end
+  end
+
+  private
+
+  # @param [Array<String>] addresses Addresses to monitor
+  # @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
+  # @param [Integer] subscription_id Unique ID of the subscription
+  # @return [Websocket]
+  def reaccept(addresses, active, raw:, delay:, subscription_id:, &)
+    u = url(http: false)
+    log_it(:debug, "Connecting ##{subscription_id} to #{u.hostname}:#{u.port}...")
+    contract = @contract
+    log_url = "ws#{@ssl ? 's' : ''}://#{u.hostname}:#{u.port}"
+    ws = Faye::WebSocket::Client.new(u.to_s, [], proxy: @proxy ? { origin: @proxy } : {}, ping: 60)
+    timer =
       EventMachine.add_periodic_timer(delay) do
         next if active.to_a.sort == addresses.to_a.sort
-        attempt = addresses.to_a
         ws.send(
           {
             jsonrpc: '2.0',
@@ -404,15 +359,74 @@ class ERC20::Wallet
         )
         log_it(
           :debug,
-          "Requested to subscribe ##{subscription_id} to #{addresses.to_a.size} addresses at #{log_url}: " \
+          "Requested to subscribe ##{subscription_id} to #{addresses.to_a.size} addresses: " \
           "#{addresses.to_a.map { |a| a[0..6] }.join(', ')}"
         )
       end
+    ws.on(:open) do
+      safe do
+        verbose do
+          log_it(:debug, "Connected ##{subscription_id} to #{log_url}")
+        end
+      end
+    end
+    ws.on(:message) do |msg|
+      safe do
+        verbose do
+          data = to_json(msg)
+          if data['id']
+            before = active.to_a.uniq
+            addresses.to_a.each do |a|
+              next if before.include?(a)
+              active.append(a)
+            end
+            log_it(
+              :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_it(: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_it(
+                :debug,
+                "Payment of #{event[:amount]} tokens arrived at ##{subscription_id} " \
+                "from #{event[:from]} to #{event[:to]} in #{event[:txn]}"
+              )
+            end
+            yield event
+          end
+        end
+      end
+    end
+    ws.on(:close) do
+      safe do
+        verbose do
+          log_it(:debug, "Disconnected ##{subscription_id} from #{log_url}")
+          sleep(delay)
+          active.clear
+          timer.cancel
+          reaccept(addresses, active, raw:, delay:, subscription_id: subscription_id + 1, &)
+        end
+      end
+    end
+    ws.on(:error) do |e|
+      safe do
+        verbose do
+          log_it(:debug, "Failed ##{subscription_id} at #{log_url}: #{e.message}")
+        end
+      end
     end
   end
 
-  private
-
   def to_json(msg)
     JSON.parse(msg.data)
   rescue StandardError

data/test/erc20/test_wallet.rb

@@ -7,7 +7,9 @@ require 'backtrace'
 require 'donce'
 require 'eth'
 require 'faraday'
+require 'fileutils'
 require 'json'
+require 'os'
 require 'random-port'
 require 'shellwords'
 require 'threads'
@@ -231,6 +233,38 @@ class TestWallet < ERC20::Test
     end
   end
 
+  def test_accepts_payments_on_hardhat_after_disconnect
+    skip('Works only on macOS') unless OS.mac?
+    WebMock.enable_net_connect!
+    walter = Eth::Key.new(priv: WALTER).address.to_s.downcase
+    Dir.mktmpdir do |home|
+      die = File.join(home, 'die.txt')
+      on_hardhat(die:) do |wallet|
+        active = []
+        events = []
+        daemon =
+          Thread.new do
+            wallet.accept([walter], active, subscription_id: 42) do |e|
+              events.append(e)
+            end
+          rescue StandardError => e
+            fake_loog.error(Backtrace.new(e))
+          end
+        wait_for { !active.empty? }
+        wallet.pay(JEFF, walter, 4_567)
+        wait_for { events.size == 1 }
+        FileUtils.touch(die)
+        on_hardhat(port: wallet.port) do
+          wallet.pay(JEFF, walter, 3_456)
+          wait_for { events.size > 1 }
+          daemon.kill
+          daemon.join(30)
+          assert_equal(3, events.size)
+        end
+      end
+    end
+  end
+
   def test_accepts_many_payments_on_hardhat
     WebMock.enable_net_connect!
     walter = Eth::Key.new(priv: WALTER).address.to_s.downcase
@@ -474,12 +508,30 @@ class TestWallet < ERC20::Test
     end
   end
 
-  def on_hardhat
-    RandomPort::Pool::SINGLETON.acquire do |port|
+  def on_hardhat(port: nil, die: nil)
+    RandomPort::Pool::SINGLETON.acquire do |rnd|
+      port = rnd if port.nil?
+      if die
+        killer = [
+          '&',
+          'HARDHAT_PID=$!;',
+          'export HARDHAT_PID;',
+          'while true; do',
+          "  if [ -e #{Shellwords.escape(File.join('/die', File.basename(die)))} ]; then",
+          '    kill -9 "${HARDHAT_PID}";',
+          '    break;',
+          '  else',
+          '    sleep 0.1;',
+          '  fi;',
+          'done'
+        ].join(' ')
+      end
+      cmd = "npx hardhat node #{killer if die}"
       donce(
         home: File.join(__dir__, '../../hardhat'),
         ports: { port => 8545 },
-        command: 'npx hardhat node',
+        volumes: die ? { File.dirname(die) => '/die' } : {},
+        command: "/bin/bash -c #{Shellwords.escape(cmd)}",
         log: fake_loog
       ) do
         wait_for_port(port)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: erc20
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Yegor Bugayenko
 bindir: bin
 cert_chain: []
-date: 2025-04-21 00:00:00.000000000 Z
+date: 2025-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eth