zold 0.26.13 → 0.26.14

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9fea2bb24b6779c8bcf92b092ccdf770165f0dd26fabe8381c67428e8ed8c6b3
4
- data.tar.gz: 2daa71cade79a0a8c6b047a5eab74ee58222da232fdc3fe465c625c21effa194
3
+ metadata.gz: 1ecdc52989dd9d8ebaccf6c02649ac87608d5e4a40dd256b621c837da8e7e1c1
4
+ data.tar.gz: 19d1ccfdf22e140d06845a7af69d80cea00a3d45a1d8ad8a8347c12429e9126f
5
5
  SHA512:
6
- metadata.gz: 487269eca1122c24548464355049b8507baf71a759e30f8063b4f4f629c47d563658233ac86c8feb30fc55f66b9e69fffce34d3f38683541c9f1ea1f30394f50
7
- data.tar.gz: 1361b2c745f127b73f7b871808ebf1f13a3b17fa96f835703ea242775b134a62e7ff55f4b450746ff28d97f1c47ec4e11faf8cc5ad4270644e866c2d29eded3c
6
+ metadata.gz: 2b95ee04747345f6ebe4494c31ce71e65ae8a48d4c2bea7ceadcc43156dfeade64408ba6aa47630620b240103ba7f7355c78629eb5ddcce25bad2d46ddec47d9
7
+ data.tar.gz: fc80522d49c0494deb793ef9b25f2fc6881739eb9be134b52b006ad8fedf0801e90f74652edbf80e4063d470ae35ce648c2855fe050600e5283a468606da175c
@@ -109,7 +109,7 @@ module Zold
109
109
  Tempfile.open do |f|
110
110
  modified = Merge.new(
111
111
  wallets: @wallets, remotes: @remotes, copies: copies.root, log: @log
112
- ).run(['merge', id.to_s, "--ledger=#{f.path}"])
112
+ ).run(['merge', id.to_s, "--ledger=#{f.path}", "--network=#{@network}"])
113
113
  @mutex.synchronize do
114
114
  txns = File.exist?(@ledger) ? IO.read(@ledger).strip.split("\n") : []
115
115
  txns += IO.read(f.path).strip.split("\n")
data/lib/zold/version.rb CHANGED
@@ -25,7 +25,7 @@
25
25
  # Copyright:: Copyright (c) 2018 Yegor Bugayenko
26
26
  # License:: MIT
27
27
  module Zold
28
- VERSION = '0.26.13'
28
+ VERSION = '0.26.14'
29
29
  PROTOCOL = 2
30
30
  REPO = 'zold-io/zold'
31
31
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zold
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.26.13
4
+ version: 0.26.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yegor Bugayenko
@@ -773,7 +773,7 @@ licenses:
773
773
  - MIT
774
774
  metadata: {}
775
775
  post_install_message: |-
776
- Thanks for installing Zold 0.26.13!
776
+ Thanks for installing Zold 0.26.14!
777
777
  Study our White Paper: https://papers.zold.io/wp.pdf
778
778
  Read our blog posts: https://blog.zold.io
779
779
  Try ZLD online wallet at: https://wts.zold.io