zold 0.20.2 → 0.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d066e22fce978f4fdee5ebf56c935c3f05a09a1c7ad57c6da8ed6388db63eb84
-  data.tar.gz: e505ab03aafc00413ba0f71513fb4bd0f5e06794da6704a2ea335275285222cb
+  metadata.gz: 894d41fc051b31c71d31c13d24e288cc73186e4f01c43bc495765fca9254c5a2
+  data.tar.gz: e0d8367e208dd8cf78960a617f5d24ff4ff281e91401c312696e8c4dd6904db7
 SHA512:
-  metadata.gz: 4313b16d11fb3226c35a0db9b3e7367b9550b008c2be560c3281ae05c8bae9f5249f53b5a7fbd8cd429f3f8207db098e6dada0ed3af68cb1bff927a1f45ce804
-  data.tar.gz: e2a483f2eff040a1429e96c0a515a00c8a7566ab200ed23ab18b6d6d5dc89c6fecda4d107ef0c21f3481df4759cf0ae6f70ca0c94b5f9270f798ee211854f737
+  metadata.gz: 065e309f3cb221272695ca5a963fe2814b1c17498a0f7c70c368d9b4c281e9faafee6fe6ffbbe182791ea27bb327854540be9c711ac1ca6fcbebcaf199212419
+  data.tar.gz: 54ba0d26ab73db4c09d23bbd36b6074a107ae2c5c9a3b3ecc38b67d09a5be7b670a1b3406989e26eeee0195ac7278deb3f8ee18cc91a33dba4a6cb7b9184252b

data/lib/zold/commands/fetch.rb

@@ -149,8 +149,7 @@ run 'zold remote update' or use --tolerate-quorum=1"
       r.assert_score_ownership(score)
       r.assert_score_strength(score) unless opts['ignore-score-weakness']
       Tempfile.open(['', Wallet::EXT]) do |f|
-        body = json['body']
-        IO.write(f, body)
+        IO.write(f, json['body'])
         wallet = Wallet.new(f.path)
         wallet.refurbish
         if wallet.protocol != Zold::PROTOCOL

data/lib/zold/copies.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'time'
+require 'openssl'
 require 'csv'
 require 'futex'
 require 'backtrace'
@@ -97,12 +98,13 @@ module Zold
       raise "Time must be in the past: #{time}" if time > Time.now
       raise 'Score must be Integer' unless score.is_a?(Integer)
       raise "Score can't be negative: #{score}" if score.negative?
+      FileUtils.mkdir_p(@dir)
       Futex.new(file, log: @log).open do
-        FileUtils.mkdir_p(@dir)
         list = load
         target = list.find do |s|
           f = File.join(@dir, "#{s[:name]}#{Copies::EXT}")
-          File.exist?(f) && IO.read(f) == content
+          digest = OpenSSL::Digest::SHA256.new(content).hexdigest
+          File.exist?(f) && OpenSSL::Digest::SHA256.file(f).hexdigest == digest
         end
         if target.nil?
           max = DirItems.new(@dir).fetch

data/lib/zold/head.rb

@@ -39,10 +39,9 @@ module Zold
 
     def fetch
       raise "Wallet file '#{@file}' is absent" unless File.exist?(@file)
-      lines = IO.read(@file).split(/\n/)
-      # lines = ['', '', '0123456701234567', '']
+      lines = IO.readlines(@file, "\n").take(4)
       raise "Not enough lines in #{@file}, just #{lines.count}" if lines.count < 4
-      lines.take(4)
+      lines
     end
   end
 

data/lib/zold/node/farm.rb

@@ -204,8 +204,7 @@ at #{host}:#{port}, strength is #{@strength}")
 
     def load
       return [] unless File.exist?(@cache)
-      body = Futex.new(@cache).open(false) { |f| IO.read(f) }
-      body.split(/\n/).reject(&:empty?).map do |t|
+      Futex.new(@cache).open(false) { |f| IO.readlines(f, "\n") }.reject(&:empty?).map do |t|
         Score.parse(t)
       rescue StandardError => e
         @log.error(Backtrace.new(e).to_s)

data/lib/zold/patch.rb

@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'openssl'
 require_relative 'log'
 require_relative 'wallet'
 require_relative 'signature'
@@ -132,7 +133,7 @@ doesn't have this transaction: \"#{txn.to_text}\"")
     def save(file, overwrite: false)
       raise 'You have to join at least one wallet in' if empty?
       before = ''
-      before = IO.read(file) if File.exist?(file)
+      before = OpenSSL::Digest::SHA256.file(file).hexdigest if File.exist?(file)
       wallet = Wallet.new(file)
       wallet.init(@id, @key, overwrite: overwrite, network: @network)
       File.open(file, 'a') do |f|
@@ -141,7 +142,7 @@ doesn't have this transaction: \"#{txn.to_text}\"")
         end
       end
       wallet.refurbish
-      after = IO.read(file)
+      after = OpenSSL::Digest::SHA256.file(file).hexdigest
       before != after
     end
   end

data/lib/zold/txn.rb

@@ -154,7 +154,7 @@ module Zold
     def self.parse(line, idx = 0)
       clean = line.strip
       parts = PTN.match(clean)
-      raise "Invalid line ##{idx}: #{line.inspect} #{regex}" unless parts
+      raise "Invalid line ##{idx}: #{line.inspect} (doesn't match #{PTN})" unless parts
       txn = Txn.new(
         Hexnum.parse(parts[:id]).to_i,
         parse_time(parts[:date]),

data/lib/zold/txns.rb

@@ -39,9 +39,10 @@ module Zold
 
     def fetch
       raise "Wallet file '#{@file}' is absent" unless File.exist?(@file)
-      lines = IO.read(@file).split(/\n/)
+      lines = IO.readlines(@file, "\n")
       raise "Not enough lines in #{@file}, just #{lines.count}" if lines.count < 4
       lines.drop(5)
+        .reject { |t| t.strip.empty? }
         .each_with_index
         .map { |line, i| Txn.parse(line, i + 6) }
         .sort

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.20.2'
+  VERSION = '0.20.3'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

data/lib/zold/wallet.rb

@@ -186,7 +186,7 @@ module Zold
     end
 
     def digest
-      OpenSSL::Digest::SHA256.new(IO.read(@file)).hexdigest
+      OpenSSL::Digest::SHA256.file(@file).hexdigest
     end
 
     # Age of wallet in hours

data/test/node/test_farm.rb

@@ -150,8 +150,8 @@ class FarmTest < Zold::Test
     Dir.mktmpdir do |dir|
       file = File.join(dir, 'corrupted_farm')
       [
-        '0/6: 2018-06-26ABCT00:32:43Z 178.128.165.12 4096 MIRhypo1@c13620484b46caa4',
-        'some garbage'
+        'some garbage',
+        'some other garbage'
       ].each do |score_garbage_line|
         valid_score = Zold::Score.new(
           time: Time.parse('2017-07-19T21:24:51Z'),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.20.3
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -692,7 +692,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.20.2!
+  Thanks for installing Zold 0.20.3!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try online wallet at: https://wts.zold.io