zold 0.26.9 → 0.26.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85d9fc57dbc5cf31bd7385e08c64d8b16332a52a0daf40c937eafdea24486178
-  data.tar.gz: 1a88657cb0fec082013f4755f268bfe6bae02cc4528a4c5cc619449efca6c557
+  metadata.gz: c0eb2f544daa848545dbc287811d8bf14a3d691dbcb63bdf947c53660be7c7f0
+  data.tar.gz: 6126407c380aaf900613521f39feb4ae3af39e1badb6824aed3691fbcabbe800
 SHA512:
-  metadata.gz: e009c0adc7c03edb2bb4abc707376ff22bd32a67cf4396e37a382e7e88ff0feab5cc2cd2a3890b7fb39e24853fe2079d2a42c0cb74652f11df735cd6c01400e1
-  data.tar.gz: 8d79089a31eaa999510c1be34d0fa22adcc80b6fe35b95772a07f7c265b097b9af0b154888c314fb9ba19cabf75aba689db1fc5d913cf3111f3899d775fc9df5
+  metadata.gz: 07e2cf7c0014c54bdacbf31b7efe09d71224e4305953f24282b8568e8b8a0b3dcb748fb3ff14dfe4a8b7152d150a44903b18976f4aff19bfebc011d043860d22
+  data.tar.gz: 5a8f701777875c91cb072ff8d97eee4790365d0338a0c5760780d8d6e5e873681db6e78212b8ef07b990cca4b56b7c3f5b02f065d9045aa82f388aa242060749

data/bin/zold

@@ -168,7 +168,11 @@ log.debug("Home directory: #{home}")
 zdata = File.join(home, '.zoldata')
 
 unless opts['skip-upgrades']
-  Zold::Upgrades.new(Zold::VersionFile.new(File.join(zdata, 'version')), 'upgrades', { command: command, network: opts['network']}).run
+  Zold::Upgrades.new(
+    Zold::VersionFile.new(File.join(zdata, 'version')),
+    'upgrades',
+    { command: command, network: opts['network']}
+  ).run
 end
 
 locks = File.join(zdata, 'locks')

data/lib/zold/upgrades.rb

@@ -37,17 +37,18 @@ module Zold
       Dir.glob("#{@directory}/*.rb").select { |f| f =~ /^(\d+)\.rb$/ }.sort.each do |script|
         @version.apply(script)
       end
-
       command = @opts[:command]
+      require_relative '../../upgrades/delete_banned_wallets'
+      DeleteBannedWallets.new(Dir.pwd, @log).exec
       require_relative '../../upgrades/2'
-      Zold::UpgradeTo2.new(Dir.pwd, @log).exec
+      UpgradeTo2.new(Dir.pwd, @log).exec
       require_relative '../../upgrades/protocol_up'
-      Zold::ProtocolUp.new(Dir.pwd, @log).exec
+      ProtocolUp.new(Dir.pwd, @log).exec
       require_relative '../../upgrades/rename_foreign_wallets'
-      Zold::RenameForeignWallets.new(Dir.pwd, @opts[:network], @log).exec
+      RenameForeignWallets.new(Dir.pwd, @opts[:network], @log).exec
       return unless command == 'node'
       require_relative '../../upgrades/move_wallets_into_tree'
-      Zold::MoveWalletsIntoTree.new(Dir.pwd, @log).exec
+      MoveWalletsIntoTree.new(Dir.pwd, @log).exec
     end
   end
 end

data/lib/zold/version.rb

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

data/test/upgrades/test_delete_banned_wallets.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018-2019 Zerocracy, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require_relative '../test__helper'
+require_relative '../../lib/zold/id'
+require_relative '../../upgrades/delete_banned_wallets'
+require_relative '../fake_home'
+
+# Delete banned wallets.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestDeleteBannedWallets < Zold::Test
+  def test_delete_them
+    id = Zold::Id.new(CSV.read(File.join(__dir__, '../../resources/banned-wallets.csv'))[0][0])
+    FakeHome.new(log: test_log).run do |home|
+      home.create_wallet(id)
+      FileUtils.mkdir_p(File.join(home.dir, 'a/b/c'))
+      File.rename(
+        File.join(home.dir, "#{id}#{Zold::Wallet::EXT}"),
+        File.join(home.dir, "a/b/c/#{id}#{Zold::Wallet::EXT}")
+      )
+      Zold::DeleteBannedWallets.new(home.dir, test_log).exec
+      assert(File.exist?(File.join(home.dir, "a/b/c/#{id}#{Zold::Wallet::EXT}-banned")))
+    end
+  end
+end

data/upgrades/delete_banned_wallets.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018-2019 Zerocracy, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'rainbow'
+require_relative '../lib/zold/version'
+require_relative '../lib/zold/wallet'
+
+module Zold
+  # Delete wallets which are in the banned-wallets.csv file
+  class DeleteBannedWallets
+    def initialize(home, log)
+      @home = home
+      @log = log
+    end
+
+    def exec
+      banned = IO.read(File.join(__dir__, '../resources/banned-wallets.csv'))
+      DirItems.new(@home).fetch.each do |path|
+        name = File.basename(path)
+        next unless name =~ /^[a-f0-9]{16}#{Wallet::EXT}$/
+        id = name[0..15]
+        next unless banned.include?("\"#{id}\"")
+        path = File.join(@home, path)
+        File.rename(path, path + '-banned')
+        @log.info("Wallet file #{path} renamed, since wallet #{id} is banned")
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.26.9
+  version: 0.26.10
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -759,8 +759,10 @@ files:
 - test/test_wallet.rb
 - test/test_wallets.rb
 - test/test_zold.rb
+- test/upgrades/test_delete_banned_wallets.rb
 - test/upgrades/test_protocol_up.rb
 - upgrades/2.rb
+- upgrades/delete_banned_wallets.rb
 - upgrades/move_wallets_into_tree.rb
 - upgrades/protocol_up.rb
 - upgrades/rename_foreign_wallets.rb
@@ -770,7 +772,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.26.9!
+  Thanks for installing Zold 0.26.10!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try ZLD online wallet at: https://wts.zold.io
@@ -869,4 +871,5 @@ test_files:
 - test/test_wallet.rb
 - test/test_wallets.rb
 - test/test_zold.rb
+- test/upgrades/test_delete_banned_wallets.rb
 - test/upgrades/test_protocol_up.rb