mastercoin-wallet 0.0.11 → 0.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Gemfile +1 -1
- data/Gemfile.lock +2 -2
- data/README.rdoc +1 -1
- data/VERSION +1 -1
- data/bin/{console → mastercoin-console} +0 -0
- data/lib/mastercoin-wallet.rb +1 -0
- data/lib/mastercoin-wallet/builder.rb +6 -0
- data/lib/mastercoin-wallet/gui/main_window.rb +3 -3
- data/mastercoin-wallet.gemspec +7 -7
- metadata +7 -7
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
@@ -49,7 +49,7 @@ GEM
|
|
49
49
|
json (1.8.1)
|
50
50
|
jwt (0.1.8)
|
51
51
|
multi_json (>= 1.5)
|
52
|
-
mastercoin-ruby (0.
|
52
|
+
mastercoin-ruby (0.2.5)
|
53
53
|
activesupport (>= 3.0.0)
|
54
54
|
bitcoin-ruby (~> 0.0.1)
|
55
55
|
sequel (~> 4.1.1)
|
@@ -85,6 +85,6 @@ DEPENDENCIES
|
|
85
85
|
httparty
|
86
86
|
i18n
|
87
87
|
jeweler (~> 1.8.8)
|
88
|
-
mastercoin-ruby (~> 0.
|
88
|
+
mastercoin-ruby (~> 0.2.5)
|
89
89
|
qtbindings
|
90
90
|
releasy!
|
data/README.rdoc
CHANGED
@@ -19,7 +19,7 @@ Install {homebrew}[http://brew.sh/] if you haven't got it yet.
|
|
19
19
|
=== Debian/Ubuntu
|
20
20
|
These instructions might not be complete. Additional instructions welcome.
|
21
21
|
|
22
|
-
* apt-get install libqt4-gui libqt4-dev
|
22
|
+
* apt-get install libqt4-gui libqt4-dev cmake ruby-dev libssl-dev
|
23
23
|
|
24
24
|
=== Windows
|
25
25
|
These instructions might also not be complete.
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.0.
|
1
|
+
0.0.12
|
File without changes
|
data/lib/mastercoin-wallet.rb
CHANGED
@@ -110,6 +110,12 @@ module MastercoinWallet
|
|
110
110
|
used_outputs = MastercoinWallet.config.created_transactions.collect{|x| x["in"][0]["prev_out"] }
|
111
111
|
usuable_outputs = MastercoinWallet.config.spendable_outputs.find{|x| BigDecimal.new(x[:value]) > BigDecimal.new(required_amount.to_s) }
|
112
112
|
|
113
|
+
unless usuable_outputs
|
114
|
+
Qt::MessageBox.critical(self, tr("Could not send transaction"),
|
115
|
+
tr("It appears there are no spendable outputs for this address that are big enough to transmit this transaction. Please consolidate some coins and send them to your Mastercoin address."))
|
116
|
+
return
|
117
|
+
end
|
118
|
+
|
113
119
|
usuable_outputs = [usuable_outputs] if usuable_outputs.is_a?(Hash)
|
114
120
|
usuable_outputs.reject!{|x| puts x; used_outputs.include?(x["prev_out"])}
|
115
121
|
|
@@ -28,7 +28,7 @@ module MastercoinWallet
|
|
28
28
|
@ui = Ui_MainWindow.new
|
29
29
|
@ui.setupUi(self)
|
30
30
|
|
31
|
-
setWindowTitle(tr("Mastercoin wallet - v0.0.
|
31
|
+
setWindowTitle(tr("Mastercoin wallet - v0.0.12"))
|
32
32
|
|
33
33
|
@rows = []
|
34
34
|
|
@@ -142,8 +142,8 @@ module MastercoinWallet
|
|
142
142
|
def add_purchase_row(item)
|
143
143
|
row = Qt::TreeWidgetItem.new
|
144
144
|
row.setText(0, item["selling_offer"]["address"])
|
145
|
-
row.setText(1, item["accepted_amount"])
|
146
|
-
row.setText(2, item["bitcoins_required"])
|
145
|
+
row.setText(1, item["accepted_amount"].to_s)
|
146
|
+
row.setText(2, item["bitcoins_required"].to_s)
|
147
147
|
row.setText(3, coin_name(item["currency_id"]))
|
148
148
|
row.setText(4, item["status_text"])
|
149
149
|
row.setText(5, get_date(item["tx_date"]))
|
data/mastercoin-wallet.gemspec
CHANGED
@@ -5,14 +5,14 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "mastercoin-wallet"
|
8
|
-
s.version = "0.0.
|
8
|
+
s.version = "0.0.12"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Maran"]
|
12
|
-
s.date = "2013-
|
12
|
+
s.date = "2013-12-30"
|
13
13
|
s.description = "Mastercoin wallet using QT bindings to create a useful gui wallet"
|
14
14
|
s.email = "maran.hidskes@gmail.com"
|
15
|
-
s.executables = ["console", "mastercoin-wallet"]
|
15
|
+
s.executables = ["mastercoin-console", "mastercoin-wallet"]
|
16
16
|
s.extra_rdoc_files = [
|
17
17
|
"LICENSE.txt",
|
18
18
|
"README.rdoc"
|
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
|
|
26
26
|
"README.rdoc",
|
27
27
|
"Rakefile",
|
28
28
|
"VERSION",
|
29
|
-
"bin/console",
|
29
|
+
"bin/mastercoin-console",
|
30
30
|
"bin/mastercoin-wallet",
|
31
31
|
"lib/.DS_Store",
|
32
32
|
"lib/mastercoin-wallet.rb",
|
@@ -74,7 +74,7 @@ Gem::Specification.new do |s|
|
|
74
74
|
s.specification_version = 3
|
75
75
|
|
76
76
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
77
|
-
s.add_runtime_dependency(%q<mastercoin-ruby>, ["~> 0.
|
77
|
+
s.add_runtime_dependency(%q<mastercoin-ruby>, ["~> 0.2.5"])
|
78
78
|
s.add_runtime_dependency(%q<qtbindings>, [">= 0"])
|
79
79
|
s.add_runtime_dependency(%q<httparty>, [">= 0"])
|
80
80
|
s.add_runtime_dependency(%q<active_support>, [">= 0"])
|
@@ -85,7 +85,7 @@ Gem::Specification.new do |s|
|
|
85
85
|
s.add_development_dependency(%q<bundler>, ["~> 1.0"])
|
86
86
|
s.add_development_dependency(%q<jeweler>, ["~> 1.8.8"])
|
87
87
|
else
|
88
|
-
s.add_dependency(%q<mastercoin-ruby>, ["~> 0.
|
88
|
+
s.add_dependency(%q<mastercoin-ruby>, ["~> 0.2.5"])
|
89
89
|
s.add_dependency(%q<qtbindings>, [">= 0"])
|
90
90
|
s.add_dependency(%q<httparty>, [">= 0"])
|
91
91
|
s.add_dependency(%q<active_support>, [">= 0"])
|
@@ -97,7 +97,7 @@ Gem::Specification.new do |s|
|
|
97
97
|
s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
|
98
98
|
end
|
99
99
|
else
|
100
|
-
s.add_dependency(%q<mastercoin-ruby>, ["~> 0.
|
100
|
+
s.add_dependency(%q<mastercoin-ruby>, ["~> 0.2.5"])
|
101
101
|
s.add_dependency(%q<qtbindings>, [">= 0"])
|
102
102
|
s.add_dependency(%q<httparty>, [">= 0"])
|
103
103
|
s.add_dependency(%q<active_support>, [">= 0"])
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mastercoin-wallet
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.12
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-
|
12
|
+
date: 2013-12-30 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: mastercoin-ruby
|
@@ -18,7 +18,7 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 0.
|
21
|
+
version: 0.2.5
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -26,7 +26,7 @@ dependencies:
|
|
26
26
|
requirements:
|
27
27
|
- - ~>
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 0.
|
29
|
+
version: 0.2.5
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: qtbindings
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
@@ -174,7 +174,7 @@ dependencies:
|
|
174
174
|
description: Mastercoin wallet using QT bindings to create a useful gui wallet
|
175
175
|
email: maran.hidskes@gmail.com
|
176
176
|
executables:
|
177
|
-
- console
|
177
|
+
- mastercoin-console
|
178
178
|
- mastercoin-wallet
|
179
179
|
extensions: []
|
180
180
|
extra_rdoc_files:
|
@@ -189,7 +189,7 @@ files:
|
|
189
189
|
- README.rdoc
|
190
190
|
- Rakefile
|
191
191
|
- VERSION
|
192
|
-
- bin/console
|
192
|
+
- bin/mastercoin-console
|
193
193
|
- bin/mastercoin-wallet
|
194
194
|
- lib/.DS_Store
|
195
195
|
- lib/mastercoin-wallet.rb
|
@@ -241,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
241
241
|
version: '0'
|
242
242
|
segments:
|
243
243
|
- 0
|
244
|
-
hash: -
|
244
|
+
hash: -1309528844309535868
|
245
245
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
246
246
|
none: false
|
247
247
|
requirements:
|