erc20 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf1f0dbee9d090079bd263a79eeafc0093866fc5503d7a1130b26e7b77ca8630
-  data.tar.gz: 105f04b7df7e9b8f45a3c34acb739fb6b74238e9f7180b624ceb724f8a4c1570
+  metadata.gz: 9b1ea9500a3c12a4b5f84d2aa2101e16c3cfcf1fef9f0d8ccb95433aba9798cb
+  data.tar.gz: dcd57712fa1fd1adb99511cbc42cb1c2315e7178b9d90862bddfb632ec83b0fc
 SHA512:
-  metadata.gz: e86283d48937fca5b956c0963b19c6b25b25226d6a60bd737e37d6201cc5dc82879d33ab79ff3ef919728762da601aa9d1bc56aaa85b94532f7edcafd29f04eb
-  data.tar.gz: f11fd8b7d8b017c4fbdc70b4442aa054344fee9451fd029e7826da8fe12961ac60447522945e83b941ab7ccf28a67299a9077c47b114f8736336d42c6b16088f
+  metadata.gz: dada085699673561fff510ba8d2071d983c36634b7a7bdf0232536ee4319469a4cd19d7f6b5b48ec6572ec974eeaa5fe192052210b985fb3a094bfbf5b97c8be
+  data.tar.gz: 306828e368f07f87274eeaf1439075bc11a7b858260997419df4620b94682156b3d77000d9d5245aba5397507a0de107339f4d13b354cf3291cf592437884a69

data/.rubocop.yml

@@ -44,7 +44,7 @@ Layout/MultilineMethodCallIndentation:
 Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
-  Max: 50
+  Max: 100
 Metrics/CyclomaticComplexity:
   Max: 25
 Metrics/PerceivedComplexity:

data/Gemfile.lock

@@ -6,7 +6,6 @@ PATH
       eth (~> 0.4)
       jsonrpc-client (> 0)
       loog (> 0)
-      tago (> 0)
       websocket-client-simple (> 0)
 
 GEM

data/README.md

@@ -11,13 +11,15 @@
 [![Hits-of-Code](https://hitsofcode.com/github/yegor256/erc20)](https://hitsofcode.com/view/github/yegor256/erc20)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/erc20/blob/master/LICENSE.txt)
 
-This small Ruby library makes manipulations with [Etherium] [ERC20] tokens
+This small Ruby [gem](https://rubygems.org/gems/erc20)
+makes manipulations with [Etherium] [ERC20] tokens
 as simple as they can be, if you have a provider of
 [JSON-RPC] and [WebSocket] Etherium APIs, for example
 [Infura], [GetBlock], or [Alchemy]:
 
 ```ruby
 # Create a wallet:
+require 'erc20'
 w = ERC20::Wallet.new(
   contract: ERC20::Wallet.USDT, # hex of it
   rpc: 'https://mainnet.infura.io/v3/<your-key>',
@@ -34,9 +36,9 @@ txn = w.pay(private_key, to_address, amount)
 # Stay waiting, and trigger the block when transactions arrive:
 addresses = ['0x...', '0x...']
 w.accept(addresses) do |event|
-  puts event['data'].to_i(16)) # how much
-  puts "0x#{event['topics'][1][26..]}" # who sent the payment
-  puts "0x#{event['topics'][2][26..]}" # who was the receiver
+  puts event[:amount] # how much
+  puts event[:from] # who sent the payment
+  puts event[:to] # who was the receiver
 end
 ```
 

data/erc20.gemspec

@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'eth', '~>0.4'
   s.add_dependency 'jsonrpc-client', '>0'
   s.add_dependency 'loog', '>0'
-  s.add_dependency 'tago', '>0'
   s.add_dependency 'websocket-client-simple', '>0'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/erc20/wallet.rb

@@ -59,7 +59,9 @@ class ERC20::Wallet
     padded = "000000000000000000000000#{hex[2..].downcase}"
     data = "0x#{func}#{padded}"
     r = jsonrpc.eth_call({ to: @contract, data: data }, 'latest')
-    r[2..].to_i(16)
+    b = r[2..].to_i(16)
+    @log.debug("Balance of #{hex} is #{b}")
+    b
   end
 
   # Send a single payment from a private address to a public one.
@@ -92,7 +94,10 @@ class ERC20::Wallet
       }
     )
     tx.sign(key)
-    jsonrpc.eth_sendRawTransaction("0x#{tx.hex}")
+    hex = "0x#{tx.hex}"
+    jsonrpc.eth_sendRawTransaction(hex)
+    @log.debug("Sent #{amount} from #{from} to #{address}: #{hex}")
+    hex
   end
 
   # Wait for incoming transactions and let the block know when they
@@ -101,7 +106,8 @@ class ERC20::Wallet
   #
   # @param [Array<String>] addresses Addresses to monitor
   # @param [Array] ready When connected, TRUE will be added to this array
-  def accept(addresses, connected: [])
+  # @param [Boolean] raw TRUE if you need to get JSON events as they arrive from Websockets
+  def accept(addresses, connected: [], raw: false)
     WebSocket::Client::Simple.connect(@wss) do |ws|
       log = @log
       contract = @contract
@@ -126,6 +132,7 @@ class ERC20::Wallet
         }
         ws.send(msg.to_json)
         connected.append(1)
+        log.debug("Subscribed to #{addresses.count} addresses")
       end
       ws.on(:message) do |msg|
         data =
@@ -136,7 +143,14 @@ class ERC20::Wallet
           end
         if data['method'] == 'eth_subscription' && data.dig('params', 'result')
           event = data['params']['result']
-          log.debug("New transaction from: #{event['address']}")
+          unless raw
+            event = {
+              amount: event['data'].to_i(16),
+              from: "0x#{event['topics'][1][26..].downcase}",
+              to: "0x#{event['topics'][2][26..].downcase}"
+            }
+          end
+          log.debug("New event arrived from #{event['address']}")
           yield event
         end
       end

data/lib/erc20.rb

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

data/test/erc20/test_wallet.rb

@@ -113,11 +113,9 @@ class TestWallet < Minitest::Test
       wait_for { !event.nil? }
       daemon.kill
       daemon.join(30)
-      assert_equal(sum, event['data'].to_i(16))
-      from = "0x#{event['topics'][1][26..].downcase}"
-      assert_equal(jeff, from)
-      to = "0x#{event['topics'][2][26..].downcase}"
-      assert_equal(walter, to)
+      assert_equal(sum, event[:amount])
+      assert_equal(jeff, event[:from])
+      assert_equal(walter, event[:to])
     end
   end
 
@@ -128,7 +126,7 @@ class TestWallet < Minitest::Test
     loop do
       sleep(0.1)
       break if yield
-      raise 'timeout' if Time.now - start > 15
+      raise 'timeout' if Time.now - start > 60
     rescue Errno::ECONNREFUSED
       retry
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erc20
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -66,20 +66,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: tago
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement