Skip to content

Commit 71f03cf

Browse files
tjayrushtjayrush
committed
Bumps to 6.1.0
1 parent c1fe7b7 commit 71f03cf

File tree

143 files changed

+8895
-3008
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+8895
-3008
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.0.3
1+
6.1.0

‎docs/content/api/openapi.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ info:
77
license:
88
name: GPL 3.0
99
url: http://www.gnu.org/licenses/
10-
version: 6.0.3
10+
version: 6.1.0
1111
description: >
1212
A REST layer over the TrueBlocks chifra command line. With `chifra daemon`, you can
1313
run this on your own machine, and make calls to `localhost`.

‎examples‎

‎src/apps/chifra/pkg/version/string.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
package version
99

10-
const LibraryVersion = "GHC-TrueBlocks//6.0.3"
10+
const LibraryVersion = "GHC-TrueBlocks//6.1.0"

‎tests/gold/apps/acctExport/acctExport_export_approvals.txt‎

Lines changed: 102 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,52 +8,124 @@ TEST[DATE|TIME] Format: json
88
{
99
"data": [
1010
{
11-
"address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
1211
"blockHash": "0x4b2f8717f83b21a44e5c4076c8fc9573bfd26aaffcf859e7472c6af7e820eaec",
1312
"blockNumber": 8860511,
14-
"data": "0x00000000000000000000000000000000000000000000001b1ae4d6e2ef500000",
1513
"date": "2019-11-02 18:41:43 UTC",
16-
"logIndex": 39,
14+
"ether": "0",
15+
"from": "0xf503017d7baf7fbc0fff7492b751025c6a78179b",
16+
"gas": 68977,
17+
"gasCost": 45985000000000,
18+
"gasPrice": 1000000000,
19+
"gasUsed": 45985,
20+
"hasToken": true,
21+
"hash": "0xc36909ffb8335811e5b92d662f39c5e5c0e75394bb9638d7136ab4a4bb2b6951",
22+
"input": "0x095ea7b300000000000000000000000030f938fed5de6e06a9a7cd2ac3517131c317b1e700000000000000000000000000000000000000000000001b1ae4d6e2ef500000",
23+
"nonce": 1,
24+
"receipt": {
25+
"contractAddress": "0x0",
26+
"effectiveGasPrice": 1000000000,
27+
"gasUsed": 45985,
28+
"logs": [
29+
{
30+
"address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
31+
"data": "0x00000000000000000000000000000000000000000000001b1ae4d6e2ef500000",
32+
"date": "2019-11-02 18:41:43 UTC",
33+
"logIndex": 39,
34+
"timestamp": 1572720103,
35+
"topics": [
36+
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
37+
"0x000000000000000000000000f503017d7baf7fbc0fff7492b751025c6a78179b",
38+
"0x00000000000000000000000030f938fed5de6e06a9a7cd2ac3517131c317b1e7"
39+
]
40+
}
41+
],
42+
"status": 1
43+
},
1744
"timestamp": 1572720103,
18-
"topics": [
19-
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
20-
"0x000000000000000000000000f503017d7baf7fbc0fff7492b751025c6a78179b",
21-
"0x00000000000000000000000030f938fed5de6e06a9a7cd2ac3517131c317b1e7"
22-
],
23-
"transactionHash": "0xc36909ffb8335811e5b92d662f39c5e5c0e75394bb9638d7136ab4a4bb2b6951",
24-
"transactionIndex": 47
45+
"to": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
46+
"traces": [],
47+
"transactionIndex": 47,
48+
"value": "0"
2549
},
2650
{
27-
"address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
2851
"blockHash": "0xe384c13e7991bcda44d06295943a724bebf8126b3c521637e2aec171b99ea7d1",
2952
"blockNumber": 8860529,
30-
"data": "0x00000000000000000000000000000000000000000000017b7883c06916600000",
3153
"date": "2019-11-02 18:45:58 UTC",
32-
"logIndex": 114,
54+
"ether": "0",
55+
"from": "0xf503017d7baf7fbc0fff7492b751025c6a78179b",
56+
"gas": 69073,
57+
"gasCost": 46049000000000,
58+
"gasPrice": 1000000000,
59+
"gasUsed": 46049,
60+
"hasToken": true,
61+
"hash": "0x3af5419098b5510f39ec64d6eb8ee08f3fe5cb538469fa9ef263cf7ebd4b607d",
62+
"input": "0x095ea7b300000000000000000000000030f938fed5de6e06a9a7cd2ac3517131c317b1e700000000000000000000000000000000000000000000017b7883c06916600000",
63+
"nonce": 3,
64+
"receipt": {
65+
"contractAddress": "0x0",
66+
"effectiveGasPrice": 1000000000,
67+
"gasUsed": 46049,
68+
"logs": [
69+
{
70+
"address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
71+
"data": "0x00000000000000000000000000000000000000000000017b7883c06916600000",
72+
"date": "2019-11-02 18:45:58 UTC",
73+
"logIndex": 114,
74+
"timestamp": 1572720358,
75+
"topics": [
76+
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
77+
"0x000000000000000000000000f503017d7baf7fbc0fff7492b751025c6a78179b",
78+
"0x00000000000000000000000030f938fed5de6e06a9a7cd2ac3517131c317b1e7"
79+
]
80+
}
81+
],
82+
"status": 1
83+
},
3384
"timestamp": 1572720358,
34-
"topics": [
35-
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
36-
"0x000000000000000000000000f503017d7baf7fbc0fff7492b751025c6a78179b",
37-
"0x00000000000000000000000030f938fed5de6e06a9a7cd2ac3517131c317b1e7"
38-
],
39-
"transactionHash": "0x3af5419098b5510f39ec64d6eb8ee08f3fe5cb538469fa9ef263cf7ebd4b607d",
40-
"transactionIndex": 145
85+
"to": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
86+
"traces": [],
87+
"transactionIndex": 145,
88+
"value": "0"
4189
},
4290
{
43-
"address": "0x6b175474e89094c44da98b954eedeac495271d0f",
4491
"blockHash": "0xdbbdfb0aa27a09854fe88cb989caf7b2aece565b2e2155897dec18a1a6b43a26",
4592
"blockNumber": 9279447,
46-
"data": "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000",
4793
"date": "2020-01-14 13:26:24 UTC",
48-
"logIndex": 92,
94+
"ether": "0",
95+
"from": "0xf503017d7baf7fbc0fff7492b751025c6a78179b",
96+
"gas": 318730,
97+
"gasCost": 237848400000000,
98+
"gasPrice": 5400000000,
99+
"gasUsed": 44046,
100+
"hasToken": true,
101+
"hash": "0x2543e31e47284e3061cac63b383f39aee75cd83ece58fb1850430312a878c806",
102+
"input": "0x095ea7b3000000000000000000000000df869fad6db91f437b59f1edefab319493d4c4ce0000000000000000000000000000000000000000000000000de0b6b3a7640000",
103+
"nonce": 12,
104+
"receipt": {
105+
"contractAddress": "0x0",
106+
"effectiveGasPrice": 5400000000,
107+
"gasUsed": 44046,
108+
"logs": [
109+
{
110+
"address": "0x6b175474e89094c44da98b954eedeac495271d0f",
111+
"data": "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000",
112+
"date": "2020-01-14 13:26:24 UTC",
113+
"logIndex": 92,
114+
"timestamp": 1579008384,
115+
"topics": [
116+
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
117+
"0x000000000000000000000000f503017d7baf7fbc0fff7492b751025c6a78179b",
118+
"0x000000000000000000000000df869fad6db91f437b59f1edefab319493d4c4ce"
119+
]
120+
}
121+
],
122+
"status": 1
123+
},
49124
"timestamp": 1579008384,
50-
"topics": [
51-
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
52-
"0x000000000000000000000000f503017d7baf7fbc0fff7492b751025c6a78179b",
53-
"0x000000000000000000000000df869fad6db91f437b59f1edefab319493d4c4ce"
54-
],
55-
"transactionHash": "0x2543e31e47284e3061cac63b383f39aee75cd83ece58fb1850430312a878c806",
56-
"transactionIndex": 73
125+
"to": "0x6b175474e89094c44da98b954eedeac495271d0f",
126+
"traces": [],
127+
"transactionIndex": 73,
128+
"value": "0"
57129
}
58130
]
59131
}

‎tests/gold/apps/acctExport/acctExport_export_approvals_art.txt‎

Lines changed: 147 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,76 +8,178 @@ TEST[DATE|TIME] Format: json
88
{
99
"data": [
1010
{
11-
"address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
12-
"articulatedLog": {
11+
"articulatedTx": {
1312
"inputs": {
14-
"_amount": "500000000000000000000",
15-
"_owner": "0xf503017d7baf7fbc0fff7492b751025c6a78179b",
16-
"_spender": "0x30f938fed5de6e06a9a7cd2ac3517131c317b1e7"
13+
"guy": "0x30f938fed5de6e06a9a7cd2ac3517131c317b1e7",
14+
"wad": "500000000000000000000"
1715
},
18-
"name": "Approval"
16+
"name": "approve",
17+
"outputs": {
18+
"val_0": null
19+
}
1920
},
2021
"blockHash": "0x4b2f8717f83b21a44e5c4076c8fc9573bfd26aaffcf859e7472c6af7e820eaec",
2122
"blockNumber": 8860511,
22-
"data": "0x00000000000000000000000000000000000000000000001b1ae4d6e2ef500000",
2323
"date": "2019-11-02 18:41:43 UTC",
24-
"logIndex": 39,
24+
"ether": "0",
25+
"from": "0xf503017d7baf7fbc0fff7492b751025c6a78179b",
26+
"gas": 68977,
27+
"gasCost": 45985000000000,
28+
"gasPrice": 1000000000,
29+
"gasUsed": 45985,
30+
"hasToken": true,
31+
"hash": "0xc36909ffb8335811e5b92d662f39c5e5c0e75394bb9638d7136ab4a4bb2b6951",
32+
"input": "0x095ea7b300000000000000000000000030f938fed5de6e06a9a7cd2ac3517131c317b1e700000000000000000000000000000000000000000000001b1ae4d6e2ef500000",
33+
"nonce": 1,
34+
"receipt": {
35+
"contractAddress": "0x0",
36+
"effectiveGasPrice": 1000000000,
37+
"gasUsed": 45985,
38+
"logs": [
39+
{
40+
"address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
41+
"articulatedLog": {
42+
"inputs": {
43+
"_amount": "500000000000000000000",
44+
"_owner": "0xf503017d7baf7fbc0fff7492b751025c6a78179b",
45+
"_spender": "0x30f938fed5de6e06a9a7cd2ac3517131c317b1e7"
46+
},
47+
"name": "Approval"
48+
},
49+
"data": "0x00000000000000000000000000000000000000000000001b1ae4d6e2ef500000",
50+
"date": "2019-11-02 18:41:43 UTC",
51+
"logIndex": 39,
52+
"timestamp": 1572720103,
53+
"topics": [
54+
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
55+
"0x000000000000000000000000f503017d7baf7fbc0fff7492b751025c6a78179b",
56+
"0x00000000000000000000000030f938fed5de6e06a9a7cd2ac3517131c317b1e7"
57+
]
58+
}
59+
],
60+
"status": 1
61+
},
2562
"timestamp": 1572720103,
26-
"topics": [
27-
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
28-
"0x000000000000000000000000f503017d7baf7fbc0fff7492b751025c6a78179b",
29-
"0x00000000000000000000000030f938fed5de6e06a9a7cd2ac3517131c317b1e7"
30-
],
31-
"transactionHash": "0xc36909ffb8335811e5b92d662f39c5e5c0e75394bb9638d7136ab4a4bb2b6951",
32-
"transactionIndex": 47
63+
"to": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
64+
"traces": [],
65+
"transactionIndex": 47,
66+
"value": "0"
3367
},
3468
{
35-
"address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
36-
"articulatedLog": {
69+
"articulatedTx": {
3770
"inputs": {
38-
"_amount": "7000000000000000000000",
39-
"_owner": "0xf503017d7baf7fbc0fff7492b751025c6a78179b",
40-
"_spender": "0x30f938fed5de6e06a9a7cd2ac3517131c317b1e7"
71+
"guy": "0x30f938fed5de6e06a9a7cd2ac3517131c317b1e7",
72+
"wad": "7000000000000000000000"
4173
},
42-
"name": "Approval"
74+
"name": "approve",
75+
"outputs": {
76+
"val_0": null
77+
}
4378
},
4479
"blockHash": "0xe384c13e7991bcda44d06295943a724bebf8126b3c521637e2aec171b99ea7d1",
4580
"blockNumber": 8860529,
46-
"data": "0x00000000000000000000000000000000000000000000017b7883c06916600000",
4781
"date": "2019-11-02 18:45:58 UTC",
48-
"logIndex": 114,
82+
"ether": "0",
83+
"from": "0xf503017d7baf7fbc0fff7492b751025c6a78179b",
84+
"gas": 69073,
85+
"gasCost": 46049000000000,
86+
"gasPrice": 1000000000,
87+
"gasUsed": 46049,
88+
"hasToken": true,
89+
"hash": "0x3af5419098b5510f39ec64d6eb8ee08f3fe5cb538469fa9ef263cf7ebd4b607d",
90+
"input": "0x095ea7b300000000000000000000000030f938fed5de6e06a9a7cd2ac3517131c317b1e700000000000000000000000000000000000000000000017b7883c06916600000",
91+
"nonce": 3,
92+
"receipt": {
93+
"contractAddress": "0x0",
94+
"effectiveGasPrice": 1000000000,
95+
"gasUsed": 46049,
96+
"logs": [
97+
{
98+
"address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
99+
"articulatedLog": {
100+
"inputs": {
101+
"_amount": "7000000000000000000000",
102+
"_owner": "0xf503017d7baf7fbc0fff7492b751025c6a78179b",
103+
"_spender": "0x30f938fed5de6e06a9a7cd2ac3517131c317b1e7"
104+
},
105+
"name": "Approval"
106+
},
107+
"data": "0x00000000000000000000000000000000000000000000017b7883c06916600000",
108+
"date": "2019-11-02 18:45:58 UTC",
109+
"logIndex": 114,
110+
"timestamp": 1572720358,
111+
"topics": [
112+
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
113+
"0x000000000000000000000000f503017d7baf7fbc0fff7492b751025c6a78179b",
114+
"0x00000000000000000000000030f938fed5de6e06a9a7cd2ac3517131c317b1e7"
115+
]
116+
}
117+
],
118+
"status": 1
119+
},
49120
"timestamp": 1572720358,
50-
"topics": [
51-
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
52-
"0x000000000000000000000000f503017d7baf7fbc0fff7492b751025c6a78179b",
53-
"0x00000000000000000000000030f938fed5de6e06a9a7cd2ac3517131c317b1e7"
54-
],
55-
"transactionHash": "0x3af5419098b5510f39ec64d6eb8ee08f3fe5cb538469fa9ef263cf7ebd4b607d",
56-
"transactionIndex": 145
121+
"to": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
122+
"traces": [],
123+
"transactionIndex": 145,
124+
"value": "0"
57125
},
58126
{
59-
"address": "0x6b175474e89094c44da98b954eedeac495271d0f",
60-
"articulatedLog": {
127+
"articulatedTx": {
61128
"inputs": {
62-
"_amount": "1000000000000000000",
63-
"_owner": "0xf503017d7baf7fbc0fff7492b751025c6a78179b",
64-
"_spender": "0xdf869fad6db91f437b59f1edefab319493d4c4ce"
129+
"guy": "0xdf869fad6db91f437b59f1edefab319493d4c4ce",
130+
"wad": "1000000000000000000"
65131
},
66-
"name": "Approval"
132+
"name": "approve",
133+
"outputs": {
134+
"val_0": null
135+
}
67136
},
68137
"blockHash": "0xdbbdfb0aa27a09854fe88cb989caf7b2aece565b2e2155897dec18a1a6b43a26",
69138
"blockNumber": 9279447,
70-
"data": "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000",
71139
"date": "2020-01-14 13:26:24 UTC",
72-
"logIndex": 92,
140+
"ether": "0",
141+
"from": "0xf503017d7baf7fbc0fff7492b751025c6a78179b",
142+
"gas": 318730,
143+
"gasCost": 237848400000000,
144+
"gasPrice": 5400000000,
145+
"gasUsed": 44046,
146+
"hasToken": true,
147+
"hash": "0x2543e31e47284e3061cac63b383f39aee75cd83ece58fb1850430312a878c806",
148+
"input": "0x095ea7b3000000000000000000000000df869fad6db91f437b59f1edefab319493d4c4ce0000000000000000000000000000000000000000000000000de0b6b3a7640000",
149+
"nonce": 12,
150+
"receipt": {
151+
"contractAddress": "0x0",
152+
"effectiveGasPrice": 5400000000,
153+
"gasUsed": 44046,
154+
"logs": [
155+
{
156+
"address": "0x6b175474e89094c44da98b954eedeac495271d0f",
157+
"articulatedLog": {
158+
"inputs": {
159+
"_amount": "1000000000000000000",
160+
"_owner": "0xf503017d7baf7fbc0fff7492b751025c6a78179b",
161+
"_spender": "0xdf869fad6db91f437b59f1edefab319493d4c4ce"
162+
},
163+
"name": "Approval"
164+
},
165+
"data": "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000",
166+
"date": "2020-01-14 13:26:24 UTC",
167+
"logIndex": 92,
168+
"timestamp": 1579008384,
169+
"topics": [
170+
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
171+
"0x000000000000000000000000f503017d7baf7fbc0fff7492b751025c6a78179b",
172+
"0x000000000000000000000000df869fad6db91f437b59f1edefab319493d4c4ce"
173+
]
174+
}
175+
],
176+
"status": 1
177+
},
73178
"timestamp": 1579008384,
74-
"topics": [
75-
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
76-
"0x000000000000000000000000f503017d7baf7fbc0fff7492b751025c6a78179b",
77-
"0x000000000000000000000000df869fad6db91f437b59f1edefab319493d4c4ce"
78-
],
79-
"transactionHash": "0x2543e31e47284e3061cac63b383f39aee75cd83ece58fb1850430312a878c806",
80-
"transactionIndex": 73
179+
"to": "0x6b175474e89094c44da98b954eedeac495271d0f",
180+
"traces": [],
181+
"transactionIndex": 73,
182+
"value": "0"
81183
}
82184
]
83185
}

0 commit comments

Comments
 (0)