istox 0.1.157.6 → 0.1.157.10
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +7 -9
- data/lib/istox/consumers/blockchain_status_handler.rb +6 -1
- data/lib/istox/helpers/blockchain_service.rb +4 -3
- data/lib/istox/helpers/messaging.rb +25 -2
- data/lib/istox/version.rb +1 -1
- metadata +6 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a5af3e2ac5a41df94c44bcd69906e0f899d65dce0e8ace04047e5608e7fff7a5
|
4
|
+
data.tar.gz: d3bbc3ca010630857d1e34452b9077bf1756ffb89568166c3137791494928e8f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8cf2995a32fc10c9bd282f4fe216ad0e3f4f7632d21d581493e103bc73287584390c12061ecbb3ad104124aa2b7330e880fc182ab2e9f6cabec2345250386b58
|
7
|
+
data.tar.gz: 8b924b2988c1b63884aac20f7853edb28d188461d9e942d0d776abd1c5c76c624de5667ad42addeed8e467d54dc1fdc2cf6b782195cc4651f802ae3faa2f67cc
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
istox (0.1.157.
|
4
|
+
istox (0.1.157.9)
|
5
5
|
amazing_print
|
6
6
|
awesome_print
|
7
7
|
aws-sdk-sns (~> 1)
|
@@ -86,14 +86,13 @@ GEM
|
|
86
86
|
aws-xray-sdk (0.11.4)
|
87
87
|
aws-sdk-xray (~> 1.4.0)
|
88
88
|
multi_json (~> 1)
|
89
|
-
bigdecimal (2.0.0)
|
90
89
|
binding_of_caller (0.8.0)
|
91
90
|
debug_inspector (>= 0.0.1)
|
92
91
|
builder (3.2.4)
|
93
92
|
bullet (5.7.6)
|
94
93
|
activesupport (>= 3.0.0)
|
95
94
|
uniform_notifier (~> 1.11.0)
|
96
|
-
bunny (2.
|
95
|
+
bunny (2.17.0)
|
97
96
|
amq-protocol (~> 2.3, >= 2.3.1)
|
98
97
|
byebug (11.1.3)
|
99
98
|
coderay (1.1.2)
|
@@ -127,14 +126,14 @@ GEM
|
|
127
126
|
faraday (>= 1.0)
|
128
127
|
faraday_middleware
|
129
128
|
graphql-client
|
130
|
-
graphql (1.11.
|
129
|
+
graphql (1.11.4)
|
131
130
|
graphql-client (0.16.0)
|
132
131
|
activesupport (>= 3.0)
|
133
132
|
graphql (~> 1.8)
|
134
|
-
grpc (1.
|
135
|
-
google-protobuf (~> 3.
|
133
|
+
grpc (1.32.0-universal-darwin)
|
134
|
+
google-protobuf (~> 3.13)
|
136
135
|
googleapis-common-protos-types (~> 1.0)
|
137
|
-
grpc-tools (1.
|
136
|
+
grpc-tools (1.32.0)
|
138
137
|
gruf (2.8.1)
|
139
138
|
activesupport (> 4)
|
140
139
|
concurrent-ruby (> 1)
|
@@ -171,8 +170,7 @@ GEM
|
|
171
170
|
nio4r (2.3.1)
|
172
171
|
nokogiri (1.10.9)
|
173
172
|
mini_portile2 (~> 2.4.0)
|
174
|
-
oj (3.10.
|
175
|
-
bigdecimal (~> 2.0)
|
173
|
+
oj (3.10.14)
|
176
174
|
ougai (1.8.5)
|
177
175
|
oj (~> 3.10)
|
178
176
|
paranoia (2.4.2)
|
@@ -26,7 +26,12 @@ module Istox
|
|
26
26
|
txhash: transaction.txn_hashes.present? ? transaction.txn_hashes.join(',') : nil)
|
27
27
|
|
28
28
|
resource = begin
|
29
|
-
class_eval("::#{receipt.resource_name}", __FILE__, __LINE__)
|
29
|
+
cls = class_eval("::#{receipt.resource_name}", __FILE__, __LINE__)
|
30
|
+
if cls.respond_to?('with_deleted')
|
31
|
+
cls.with_deleted.find(receipt.resource_id)
|
32
|
+
else
|
33
|
+
cls.find(receipt.resource_id)
|
34
|
+
end
|
30
35
|
rescue NameError
|
31
36
|
log.warn "Transaction bind to #{receipt.resource_name} with id #{receipt.resource_id} class not found, skipping..."
|
32
37
|
return
|
@@ -8,8 +8,8 @@ module Istox
|
|
8
8
|
@@blockchain_receipt_klass
|
9
9
|
end
|
10
10
|
|
11
|
-
def self.request(sid:, action:, before:, execute:)
|
12
|
-
start(sid: sid, action: action, before: before, execute: execute, is_request: true)
|
11
|
+
def self.request(sid:, action:, before:, execute:, request_reason: nil)
|
12
|
+
start(sid: sid, action: action, before: before, execute: execute, is_request: true, request_reason: request_reason)
|
13
13
|
end
|
14
14
|
|
15
15
|
def self.run(sid:, action:, before:, execute:)
|
@@ -19,7 +19,7 @@ module Istox
|
|
19
19
|
private
|
20
20
|
|
21
21
|
# before is the proc that will be executed before, must return the main model blockchain receipt will bind to
|
22
|
-
def start(sid:, action:, before:, execute:, is_request: false)
|
22
|
+
def start(sid:, action:, before:, execute:, is_request: false, request_reason: nil)
|
23
23
|
# create blockchain receipt first
|
24
24
|
klass = blockchain_receipt_class
|
25
25
|
uuid = ::SecureRandom.uuid
|
@@ -27,6 +27,7 @@ module Istox
|
|
27
27
|
txid: uuid,
|
28
28
|
sid: sid,
|
29
29
|
is_request: is_request,
|
30
|
+
request_reason: request_reason,
|
30
31
|
resource_action: action
|
31
32
|
)
|
32
33
|
|
@@ -127,10 +127,33 @@ module Istox
|
|
127
127
|
next unless email_data[:copy_emails].present?
|
128
128
|
|
129
129
|
email_data[:copy_emails].each do |ce|
|
130
|
-
|
131
|
-
|
130
|
+
next unless ce.present?
|
131
|
+
|
132
|
+
copy_email_data = email_data.clone
|
133
|
+
|
134
|
+
# if it is just email to cc
|
135
|
+
if ce.is_a? String
|
136
|
+
copy_email_data[:email] = ce
|
137
|
+
else
|
138
|
+
# if it is a object hash
|
139
|
+
# {
|
140
|
+
# email: xxxx
|
141
|
+
# params: {
|
142
|
+
# istoxP1: xxxx,
|
143
|
+
# istoxP2: xxxx
|
144
|
+
# }
|
145
|
+
# }
|
146
|
+
next unless ce[:email].present?
|
147
|
+
|
148
|
+
copy_email_data[:email] = ce[:email]
|
149
|
+
copy_email_data = copy_email_data.merge(ce[:params])
|
150
|
+
end
|
151
|
+
|
152
|
+
copy_email_data.delete(:copy_emails)
|
132
153
|
copy_email_data_arr << copy_email_data
|
133
154
|
end
|
155
|
+
|
156
|
+
email_data.delete(:copy_emails)
|
134
157
|
end
|
135
158
|
template_data_arr.concat(copy_email_data_arr)
|
136
159
|
end
|
data/lib/istox/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: istox
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.157.
|
4
|
+
version: 0.1.157.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Siong Leng
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-10-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: amazing_print
|
@@ -539,7 +539,7 @@ files:
|
|
539
539
|
homepage: http://www.abc.com
|
540
540
|
licenses: []
|
541
541
|
metadata: {}
|
542
|
-
post_install_message:
|
542
|
+
post_install_message:
|
543
543
|
rdoc_options: []
|
544
544
|
require_paths:
|
545
545
|
- lib
|
@@ -554,9 +554,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
554
554
|
- !ruby/object:Gem::Version
|
555
555
|
version: '0'
|
556
556
|
requirements: []
|
557
|
-
|
558
|
-
|
559
|
-
signing_key:
|
557
|
+
rubygems_version: 3.0.6
|
558
|
+
signing_key:
|
560
559
|
specification_version: 4
|
561
560
|
summary: istox backend shared gem
|
562
561
|
test_files: []
|