erc20 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5b9458add234faedc7e3827c363cf16b083b2c409b13577a7b30ac601d0ddef
-  data.tar.gz: 4593c178c97685ec74c1c2bc0855daddf19082c6b9eead27254d79d644c2a0e2
+  metadata.gz: 7cd7942c943defda491f59fa29cc3f5aa05fef9afa2291172f9d52f60881fba3
+  data.tar.gz: 0ccd463b7c6799d800983dc10bbafbcd4220c79578790863f6fa031dd09d07ad
 SHA512:
-  metadata.gz: 7c2459cfdc15924c674852a078116ad91e0c78fa38e522f4bf1075fb409a8756c7f73f9931206c6f3e16c98119ca278c04a6cd0f2ed7470cb765ab1a35284a87
-  data.tar.gz: 8ad83464049ed10ec9d261b8ffbd2b1a889d56fc376c2c79fa159fc95f4bba48786fbbab54ab855461f81e10bc551c494a61cd1907f3b5b1636084e9bd04b34e
+  metadata.gz: 7e0b97b3c470965c061ce1680303083311c37d22b96b766fbb761ced8844558864eff8603fb0dc804c180f04d9155c79112f7c82b2c575b539fbdd6e6b214a0b
+  data.tar.gz: 98752411eb97107ea8a1d2dd2c70b14161c8e788bdc0d5508e3fe94d43037737d5174d301fdf17f233e77c24dac44d06830385275d28a2d3581ef61219173672

data/Gemfile

@@ -18,7 +18,7 @@ gem 'minitest-retry', '~>0.2', require: false
 gem 'qbash', '~>0.4', require: false
 gem 'rake', '~>13.2', require: false
 gem 'random-port', '~>0.7', require: false
-gem 'rdoc', '~>6.17', require: false
+gem 'rdoc', '~>7.0', require: false
 gem 'rubocop', '~>1.75', require: false
 gem 'rubocop-minitest', '~>0.38', require: false
 gem 'rubocop-performance', '~>1.25', require: false

data/Gemfile.lock

@@ -38,26 +38,26 @@ GEM
       multi_test (~> 1.1)
       sys-uname (~> 1.3)
     cucumber-ci-environment (11.0.0)
-    cucumber-core (16.0.0)
-      cucumber-gherkin (> 33, < 40)
-      cucumber-messages (> 28, < 33)
+    cucumber-core (16.1.1)
+      cucumber-gherkin (> 36, < 40)
+      cucumber-messages (> 31, < 33)
       cucumber-tag-expressions (> 6, < 9)
     cucumber-cucumber-expressions (18.0.1)
       bigdecimal
-    cucumber-gherkin (36.1.0)
-      cucumber-messages (> 25, < 30)
-    cucumber-html-formatter (22.2.0)
-      cucumber-messages (> 19, < 31)
-    cucumber-messages (29.0.1)
+    cucumber-gherkin (37.0.1)
+      cucumber-messages (>= 31, < 32)
+    cucumber-html-formatter (22.3.0)
+      cucumber-messages (> 23, < 33)
+    cucumber-messages (31.2.0)
     cucumber-tag-expressions (8.1.0)
     date (3.5.1)
     diff-lcs (1.6.2)
     docile (1.4.1)
-    donce (0.2.4)
+    donce (0.4.0)
       backtrace (~> 0.3)
       os (~> 1.1)
       qbash (~> 0.3)
-    elapsed (0.2.1)
+    elapsed (0.2.2)
       loog (~> 0.6)
       tago (~> 0.1)
     erb (6.0.1)
@@ -80,10 +80,10 @@ GEM
     faye-websocket (0.12.0)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.8.0)
-    ffi (1.17.2-arm64-darwin)
-    ffi (1.17.2-x64-mingw-ucrt)
-    ffi (1.17.2-x86_64-darwin)
-    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.3-arm64-darwin)
+    ffi (1.17.3-x64-mingw-ucrt)
+    ffi (1.17.3-x86_64-darwin)
+    ffi (1.17.3-x86_64-linux-gnu)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
@@ -103,32 +103,32 @@ GEM
     memoist3 (1.0.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (6.0.0)
+    minitest (6.0.1)
       prism (~> 1.5)
     minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    minitest-retry (0.2.5)
+    minitest-retry (0.3.1)
       minitest (>= 5.0)
-    multi_json (1.18.0)
+    multi_json (1.19.1)
     multi_test (1.1.0)
     net-http (0.9.1)
       uri (>= 0.11.1)
     openssl (3.3.2)
     os (1.1.4)
     parallel (1.27.0)
-    parser (3.3.10.0)
+    parser (3.3.10.1)
       ast (~> 2.4.1)
       racc
     pkg-config (1.6.5)
-    prism (1.6.0)
+    prism (1.8.0)
     psych (5.3.1)
       date
       stringio
-    public_suffix (7.0.0)
-    qbash (0.4.8)
+    public_suffix (7.0.2)
+    qbash (0.5.0)
       backtrace (> 0)
       elapsed (> 0)
       loog (> 0)
@@ -142,13 +142,13 @@ GEM
       mini_portile2 (~> 2.8)
       pkg-config (~> 1.5)
       rubyzip (~> 2.3)
-    rdoc (6.17.0)
+    rdoc (7.1.0)
       erb
       psych (>= 4.0.0)
       tsort
     regexp_parser (2.11.3)
     rexml (3.4.4)
-    rubocop (1.82.0)
+    rubocop (1.82.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -159,9 +159,9 @@ GEM
       rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.48.0)
+    rubocop-ast (1.49.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     rubocop-minitest (0.38.2)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
@@ -236,7 +236,7 @@ DEPENDENCIES
   qbash (~> 0.4)
   rake (~> 13.2)
   random-port (~> 0.7)
-  rdoc (~> 6.17)
+  rdoc (~> 7.0)
   rubocop (~> 1.75)
   rubocop-minitest (~> 0.38)
   rubocop-performance (~> 1.25)

data/bin/erc20

@@ -156,10 +156,17 @@ Options are:"
     amount = opts.arguments[3]
     raise 'Amount argument is required' if amount.nil?
     raise "Amount #{amount.inspect} is not valid" unless /^[0-9]+(\.[0-9]+)?(eth|wei|gwei)?$/.match?(amount)
-    amount = amount.to_i if /^[0-9]+$/.match?(amount)
-    amount = amount.gsub(/wei^/, '').to_i if /[0-9]wei+$/.match?(amount)
-    amount = (amount.gsub(/gwei^/, '').to_f * 1_000_000_000).to_i if /[0-9]gwei+$/.match?(amount)
-    amount = (amount.gsub(/eth^/, '').to_f * 1_000_000_000_000_000_000).to_i if /[0-9]eth+$/.match?(amount)
+    if /^[0-9]+$/.match?(amount)
+      amount = amount.to_i
+    elsif /[0-9]wei+$/.match?(amount)
+      amount = amount.gsub(/wei^/, '').to_i
+    elsif /[0-9]gwei+$/.match?(amount)
+      amount = (amount.gsub(/gwei^/, '').to_f * 1_000_000_000).to_i
+    elsif /[0-9]eth+$/.match?(amount)
+      amount = (amount.gsub(/eth^/, '').to_f * 1_000_000_000_000_000_000).to_i
+    else
+      raise "Can't understand amount: #{amount.inspect}"
+    end
     log.debug("Sending #{amount} wei...")
     puts wallet.eth_pay(priv.private_hex, address, amount)
   else

data/features/dry.feature

@@ -16,6 +16,22 @@ Feature: Command Line Processing, in Dry Mode
     When I run bin/erc20 with "eth_balance 0x7232148927F8a580053792f44D4d59d40Fd00ABD --verbose --dry"
     Then Exit code is zero
 
-  Scenario: ERC20 payment can be sent
+  Scenario: ERC20 payment can be sent in tokens
+    When I run bin/erc20 with "pay --dry --verbose 46feba063e9b59a8ae0dba68abd39a3cb8f52089e776576d6eb1bb5bfec123d1 0x7232148927F8a580053792f44D4d59d40Fd00ABD 10"
+    Then Exit code is zero
+
+  Scenario: ERC20 payment can be sent in dollars
     When I run bin/erc20 with "pay --dry --verbose 46feba063e9b59a8ae0dba68abd39a3cb8f52089e776576d6eb1bb5bfec123d1 0x7232148927F8a580053792f44D4d59d40Fd00ABD $10"
     Then Exit code is zero
+
+  Scenario: ERC20 payment can be sent in USDT
+    When I run bin/erc20 with "pay --dry --verbose 46feba063e9b59a8ae0dba68abd39a3cb8f52089e776576d6eb1bb5bfec123d1 0x7232148927F8a580053792f44D4d59d40Fd00ABD 10usdt"
+    Then Exit code is zero
+
+  Scenario: ETH payment can be sent in wei
+    When I run bin/erc20 with "eth_pay --dry --verbose 46feba063e9b59a8ae0dba68abd39a3cb8f52089e776576d6eb1bb5bfec123d1 0x7232148927F8a580053792f44D4d59d40Fd00ABD 10000000"
+    Then Exit code is zero
+
+  Scenario: ETH payment can be sent in ETH
+    When I run bin/erc20 with "eth_pay --dry --verbose 46feba063e9b59a8ae0dba68abd39a3cb8f52089e776576d6eb1bb5bfec123d1 0x7232148927F8a580053792f44D4d59d40Fd00ABD 1eth"
+    Then Exit code is zero

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.2.4'
+  VERSION = '0.2.6'
 end

data/lib/erc20/fake_wallet.rb

@@ -102,12 +102,12 @@ class ERC20::FakeWallet
   # @param [String] priv Private key, in hex
   # @param [String] address Public key, in hex
   # @param [Integer] amount The amount of ERC20 tokens to send
-  # @param [Integer] gas_limit Optional gas limit
-  # @param [Integer] gas_price Optional gas price in gwei
+  # @param [Integer] limit Optional gas limit
+  # @param [Integer] price Optional gas price in gwei
   # @return [String] Transaction hash
-  def pay(priv, address, amount, gas_limit: nil, gas_price: nil)
+  def pay(priv, address, amount, limit: nil, price: nil)
     hex = TXN_HASH
-    @history << { method: :pay, priv:, address:, amount:, gas_limit:, gas_price:, result: hex }
+    @history << { method: :pay, priv:, address:, amount:, limit:, price:, result: hex }
     hex
   end
 
@@ -116,11 +116,11 @@ class ERC20::FakeWallet
   # @param [String] priv Private key, in hex
   # @param [String] address Public key, in hex
   # @param [Integer] amount The amount of ETHs to send
-  # @param [Integer] gas_price Optional gas price in gwei
+  # @param [Integer] price Optional gas price in gwei
   # @return [String] Transaction hash
-  def eth_pay(priv, address, amount, gas_price: nil)
+  def eth_pay(priv, address, amount, price: nil)
     hex = TXN_HASH
-    @history << { method: :eth_pay, priv:, address:, amount:, gas_price:, result: hex }
+    @history << { method: :eth_pay, priv:, address:, amount:, price:, result: hex }
     hex
   end
 

metadata

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