cita-sdk-ruby 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ea59119ebcab716aa5c329e63aee5a25bcdd93705240ff623925b9447bb25e4
-  data.tar.gz: e29755492412d1dd392d77918e76194622538096dc65ef6db341d6bffae31866
+  metadata.gz: 6bf77ee83aea26ee7e2f49e4350724c11e2109dde6a8180aa2f85a2530840356
+  data.tar.gz: 0a6f2346c1bdc19895e8f0e02546e8072b159fcf433ae079277f01fb9acccd24
 SHA512:
-  metadata.gz: d47ca1bfe3369010cba48fe50ac53026cd7a3cb8ace96778ed0718441181a6a062e0101a3162aea0d87858e25de59d1e23143629fcc8403c3859d6c6c7528008
-  data.tar.gz: 1aff39ad3732460b827b3260c01d5cd28cef74533f79066b2d411ca3187c35fb054534349aaa402ce6923fa0289659344a11ea1b05d201293958b30fb9f14937
+  metadata.gz: 692ce2c43900030e44f15d2ec6481aa01d1f5cac6557428128cc258207ea64065b22a459db1da85bbafdc564914e699a3711658ccb5f46e331c8e6fb0a2d3bc0
+  data.tar.gz: 01d28daf64b56add72372a1790f96042d0fd1ef3193070a10c07a014f4ecdfa92e3dbcd06aad37f4b6d86e950a6a6ef6463656bd0472be254008d156eeb0e0b1

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    cita-sdk-ruby (0.23.0)
+    cita-sdk-ruby (0.24.0)
       activesupport (~> 5.2.1)
       ciri-crypto (= 0.1.1)
       faraday (~> 0.15.3)
       google-protobuf (~> 3.7)
-      web3-eth (~> 0.2.16)
+      web3-eth (= 0.2.18)
 
 GEM
   remote: https://rubygems.org/
@@ -31,14 +31,14 @@ GEM
     digest-sha3 (1.1.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
+    ffi (1.11.1)
     google-protobuf (3.7.1)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.1)
     method_source (0.9.0)
     minitest (5.11.3)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     parallel (1.12.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)

data/README.md

@@ -79,6 +79,11 @@ response = contract.send_func(tx: tx, private_key: private_key, method: :transfe
 
 ## CHANGELOG
 
+### v0.24.0
+
+* support transaction version = 2
+* set default transaction version to 2
+
 ### v0.23.0
 
 * add `getVersion` and `peersInfo` RPC methods

data/cita.gemspec

@@ -43,5 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ciri-crypto", "0.1.1"
   spec.add_dependency "faraday", "~> 0.15.3"
   spec.add_dependency "activesupport", "~> 5.2.1"
-  spec.add_dependency "web3-eth", "~> 0.2.16"
+  spec.add_dependency "web3-eth", "0.2.18"
 end

data/lib/cita/rpc.rb

@@ -74,11 +74,14 @@ module CITA
       valid_until_block = block_number["result"].hex + 88
       meta_data = get_meta_data("latest")["result"]
       version = meta_data["version"]
-      chain_id = if version.zero?
+
+      chain_id = case version
+                 when 0
                    meta_data["chainId"]
-                 elsif version == 1
+                 when 1, 2
                    meta_data["chainIdV1"]
                  end
+
       transaction = Transaction.new(nonce: Utils.nonce, valid_until_block: valid_until_block, chain_id: chain_id, to: to, value: value, quota: quota, version: version)
       send_transaction(transaction, private_key)
     end

data/lib/cita/transaction.rb

@@ -18,8 +18,8 @@ module CITA
     # @param quota [Integer]
     #
     # @return [void]
-    def initialize(valid_until_block:, chain_id:, nonce: nil, version: 1, to: nil, data: nil, value: "0", quota: 1_000_000) # rubocop:disable Metrics/ParameterLists
-      raise VersionError, "transaction version error, expected 0 or 1, got #{version}" unless [0, 1].include?(version)
+    def initialize(valid_until_block:, chain_id:, nonce: nil, version: 1, to: nil, data: nil, value: "2", quota: 1_000_000) # rubocop:disable Metrics/ParameterLists
+      raise VersionError, "transaction version error, expected 0, 1 or 2, got #{version}" unless [0, 1, 2].include?(version)
 
       @to = to
       @nonce = nonce.blank? ? SecureRandom.hex : nonce

data/lib/cita/transaction_signer.rb

@@ -25,7 +25,7 @@ module CITA
         if transaction.version.zero?
           tx.to = to unless to.nil?
           tx.chain_id = transaction.chain_id
-        elsif transaction.version == 1
+        elsif transaction.version == 1 || transaction.version == 2
           tx.to_v1 = Utils.to_bytes(to) unless to.nil?
           tx.chain_id_v1 = hex_to_bytes(transaction.chain_id)
         end
@@ -102,11 +102,11 @@ module CITA
         if version == 0 # rubocop:disable Style/NumericPredicate
           tx.delete(:to_v1)
           tx.delete(:chain_id_v1)
-        elsif version == 1
+        elsif version == 1 || version == 2
           tx[:to] = tx.delete(:to_v1)
           tx[:chain_id] = tx.delete(:chain_id_v1)
         else
-          raise Transaction::VersionError, "transaction version error, expected 0 or 1, got #{version}"
+          raise Transaction::VersionError, "transaction version error, expected 0, 1 or 2, got #{version}"
         end
 
         data
@@ -132,7 +132,7 @@ module CITA
           tx.delete(:to_v1)
           tx.delete(:chain_id_v1)
           tx[:to] = Utils.add_prefix_for_not_blank(tx[:to])
-        elsif version == 1
+        elsif version == 1 || version == 2
           tx[:to] = Utils.from_bytes(tx[:to])
           tx[:chain_id] = Utils.from_bytes(tx[:chain_id])
         end

data/lib/cita/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CITA
-  VERSION = "0.23.0"
+  VERSION = "0.24.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cita-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - classicalliu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,16 +154,16 @@ dependencies:
   name: web3-eth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.16
+        version: 0.2.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.16
+        version: 0.2.18
 description: Ruby CITA SDK for signature and rpc call
 email:
 - classicalliu@gmail.com
@@ -218,8 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby CITA SDK