Skip to content

Commit 83ceb45

Browse files
karalabekaralabe
authored
Merge pull request ethereum#20511 from karalabe/docs-fix-txpool-apis-2
docs: fix txpool APIs to get rid of lists-per-nonces
2 parents 49995dc + 10ab23c commit 83ceb45

File tree

1 file changed

+41
-53
lines changed

1 file changed

+41
-53
lines changed

‎docs/_rpc/ns-txpool.md

Lines changed: 41 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ Please note, there may be multiple transactions associated with the same account
2424
happen if the user broadcast mutliple ones with varying gas allowances (or even complerely different
2525
transactions).
2626

27-
| Client | Method invocation |
28-
|:--------|-------------------------------------------------------------------------|
29-
| Go | `txpool.Content() (map[string]map[string]map[string][]*RPCTransaction)` |
30-
| Console | `txpool.content` |
31-
| RPC | `{"method": "txpool_content"}` |
27+
| Client | Method invocation |
28+
|:-------:|-----------------------------------------------------------------------|
29+
| Go | `txpool.Content() (map[string]map[string]map[string]*RPCTransaction)` |
30+
| Console | `txpool.content` |
31+
| RPC | `{"method": "txpool_content"}` |
3232

3333
#### Example
3434

@@ -37,7 +37,7 @@ transactions).
3737
{
3838
pending: {
3939
0x0216d5032f356960cd3749c31ab34eeff21b3395: {
40-
806: [{
40+
806: {
4141
blockHash: "0x0000000000000000000000000000000000000000000000000000000000000000",
4242
blockNumber: null,
4343
from: "0x0216d5032f356960cd3749c31ab34eeff21b3395",
@@ -49,10 +49,10 @@ transactions).
4949
to: "0x7f69a91a3cf4be60020fb58b893b7cbb65376db8",
5050
transactionIndex: null,
5151
value: "0x19a99f0cf456000"
52-
}]
52+
}
5353
},
5454
0x24d407e5a0b506e1cb2fae163100b5de01f5193c: {
55-
34: [{
55+
34: {
5656
blockHash: "0x0000000000000000000000000000000000000000000000000000000000000000",
5757
blockNumber: null,
5858
from: "0x24d407e5a0b506e1cb2fae163100b5de01f5193c",
@@ -64,12 +64,12 @@ transactions).
6464
to: "0x7320785200f74861b69c49e4ab32399a71b34f1a",
6565
transactionIndex: null,
6666
value: "0x0"
67-
}]
67+
}
6868
}
6969
},
7070
queued: {
7171
0x976a3fc5d6f7d259ebfb4cc2ae75115475e9867c: {
72-
3: [{
72+
3: {
7373
blockHash: "0x0000000000000000000000000000000000000000000000000000000000000000",
7474
blockNumber: null,
7575
from: "0x976a3fc5d6f7d259ebfb4cc2ae75115475e9867c",
@@ -81,10 +81,10 @@ transactions).
8181
to: "0x346fb27de7e7370008f5da379f74dd49f5f2f80f",
8282
transactionIndex: null,
8383
value: "0x1f161421c8e0000"
84-
}]
84+
}
8585
},
8686
0x9b11bf0459b0c4b2f87f8cebca4cfc26f294b63a: {
87-
2: [{
87+
2: {
8888
blockHash: "0x0000000000000000000000000000000000000000000000000000000000000000",
8989
blockNumber: null,
9090
from: "0x9b11bf0459b0c4b2f87f8cebca4cfc26f294b63a",
@@ -96,8 +96,8 @@ transactions).
9696
to: "0x24a461f25ee6a318bdef7f33de634a67bb67ac9d",
9797
transactionIndex: null,
9898
value: "0xebec21ee1da40000"
99-
}],
100-
6: [{
99+
},
100+
6: {
101101
blockHash: "0x0000000000000000000000000000000000000000000000000000000000000000",
102102
blockNumber: null,
103103
from: "0x9b11bf0459b0c4b2f87f8cebca4cfc26f294b63a",
@@ -109,19 +109,7 @@ transactions).
109109
to: "0x6368f3f8c2b42435d6c136757382e4a59436a681",
110110
transactionIndex: null,
111111
value: "0xf9a951af55470000"
112-
}, {
113-
blockHash: "0x0000000000000000000000000000000000000000000000000000000000000000",
114-
blockNumber: null,
115-
from: "0x9b11bf0459b0c4b2f87f8cebca4cfc26f294b63a",
116-
gas: "0x15f90",
117-
gasPrice: "0x4a817c800",
118-
hash: "0x60803251d43f072904dc3a2d6a084701cd35b4985790baaf8a8f76696041b272",
119-
input: "0x",
120-
nonce: "0x6",
121-
to: "0x8db7b4e0ecb095fbd01dffa62010801296a9ac78",
122-
transactionIndex: null,
123-
value: "0xebe866f5f0a06000"
124-
}],
112+
}
125113
}
126114
}
127115
}
@@ -142,11 +130,11 @@ Please note, there may be multiple transactions associated with the same account
142130
happen if the user broadcast mutliple ones with varying gas allowances (or even complerely different
143131
transactions).
144132

145-
| Client | Method invocation |
146-
|:--------|----------------------------------------------------------------|
147-
| Go | `txpool.Inspect() (map[string]map[string]map[string][]string)` |
148-
| Console | `txpool.inspect` |
149-
| RPC | `{"method": "txpool_inspect"}` |
133+
| Client | Method invocation |
134+
|:-------:|--------------------------------------------------------------|
135+
| Go | `txpool.Inspect() (map[string]map[string]map[string]string)` |
136+
| Console | `txpool.inspect` |
137+
| RPC | `{"method": "txpool_inspect"}` |
150138

151139
#### Example
152140

@@ -155,49 +143,49 @@ transactions).
155143
{
156144
pending: {
157145
0x26588a9301b0428d95e6fc3a5024fce8bec12d51: {
158-
31813: ["0x3375ee30428b2a71c428afa5e89e427905f95f7e: 0 wei + 500000 × 20000000000 gas"]
146+
31813: "0x3375ee30428b2a71c428afa5e89e427905f95f7e: 0 wei + 500000 × 20000000000 gas"
159147
},
160148
0x2a65aca4d5fc5b5c859090a6c34d164135398226: {
161-
563662: ["0x958c1fa64b34db746925c6f8a3dd81128e40355e: 1051546810000000000 wei + 90000 × 20000000000 gas"],
162-
563663: ["0x77517b1491a0299a44d668473411676f94e97e34: 1051190740000000000 wei + 90000 × 20000000000 gas"],
163-
563664: ["0x3e2a7fe169c8f8eee251bb00d9fb6d304ce07d3a: 1050828950000000000 wei + 90000 × 20000000000 gas"],
164-
563665: ["0xaf6c4695da477f8c663ea2d8b768ad82cb6a8522: 1050544770000000000 wei + 90000 × 20000000000 gas"],
165-
563666: ["0x139b148094c50f4d20b01caf21b85edb711574db: 1048598530000000000 wei + 90000 × 20000000000 gas"],
166-
563667: ["0x48b3bd66770b0d1eecefce090dafee36257538ae: 1048367260000000000 wei + 90000 × 20000000000 gas"],
167-
563668: ["0x468569500925d53e06dd0993014ad166fd7dd381: 1048126690000000000 wei + 90000 × 20000000000 gas"],
168-
563669: ["0x3dcb4c90477a4b8ff7190b79b524773cbe3be661: 1047965690000000000 wei + 90000 × 20000000000 gas"],
169-
563670: ["0x6dfef5bc94b031407ffe71ae8076ca0fbf190963: 1047859050000000000 wei + 90000 × 20000000000 gas"]
149+
563662: "0x958c1fa64b34db746925c6f8a3dd81128e40355e: 1051546810000000000 wei + 90000 × 20000000000 gas",
150+
563663: "0x77517b1491a0299a44d668473411676f94e97e34: 1051190740000000000 wei + 90000 × 20000000000 gas",
151+
563664: "0x3e2a7fe169c8f8eee251bb00d9fb6d304ce07d3a: 1050828950000000000 wei + 90000 × 20000000000 gas",
152+
563665: "0xaf6c4695da477f8c663ea2d8b768ad82cb6a8522: 1050544770000000000 wei + 90000 × 20000000000 gas",
153+
563666: "0x139b148094c50f4d20b01caf21b85edb711574db: 1048598530000000000 wei + 90000 × 20000000000 gas",
154+
563667: "0x48b3bd66770b0d1eecefce090dafee36257538ae: 1048367260000000000 wei + 90000 × 20000000000 gas",
155+
563668: "0x468569500925d53e06dd0993014ad166fd7dd381: 1048126690000000000 wei + 90000 × 20000000000 gas",
156+
563669: "0x3dcb4c90477a4b8ff7190b79b524773cbe3be661: 1047965690000000000 wei + 90000 × 20000000000 gas",
157+
563670: "0x6dfef5bc94b031407ffe71ae8076ca0fbf190963: 1047859050000000000 wei + 90000 × 20000000000 gas"
170158
},
171159
0x9174e688d7de157c5c0583df424eaab2676ac162: {
172-
3: ["0xbb9bc244d798123fde783fcc1c72d3bb8c189413: 30000000000000000000 wei + 85000 × 21000000000 gas"]
160+
3: "0xbb9bc244d798123fde783fcc1c72d3bb8c189413: 30000000000000000000 wei + 85000 × 21000000000 gas"
173161
},
174162
0xb18f9d01323e150096650ab989cfecd39d757aec: {
175-
777: ["0xcd79c72690750f079ae6ab6ccd7e7aedc03c7720: 0 wei + 1000000 × 20000000000 gas"]
163+
777: "0xcd79c72690750f079ae6ab6ccd7e7aedc03c7720: 0 wei + 1000000 × 20000000000 gas"
176164
},
177165
0xb2916c870cf66967b6510b76c07e9d13a5d23514: {
178-
2: ["0x576f25199d60982a8f31a8dff4da8acb982e6aba: 26000000000000000000 wei + 90000 × 20000000000 gas"]
166+
2: "0x576f25199d60982a8f31a8dff4da8acb982e6aba: 26000000000000000000 wei + 90000 × 20000000000 gas"
179167
},
180168
0xbc0ca4f217e052753614d6b019948824d0d8688b: {
181-
0: ["0x2910543af39aba0cd09dbb2d50200b3e800a63d2: 1000000000000000000 wei + 50000 × 1171602790622 gas"]
169+
0: "0x2910543af39aba0cd09dbb2d50200b3e800a63d2: 1000000000000000000 wei + 50000 × 1171602790622 gas"
182170
},
183171
0xea674fdde714fd979de3edf0f56aa9716b898ec8: {
184-
70148: ["0xe39c55ead9f997f7fa20ebe40fb4649943d7db66: 1000767667434026200 wei + 90000 × 20000000000 gas"]
172+
70148: "0xe39c55ead9f997f7fa20ebe40fb4649943d7db66: 1000767667434026200 wei + 90000 × 20000000000 gas"
185173
}
186174
},
187175
queued: {
188176
0x0f6000de1578619320aba5e392706b131fb1de6f: {
189-
6: ["0x8383534d0bcd0186d326c993031311c0ac0d9b2d: 9000000000000000000 wei + 21000 × 20000000000 gas"]
177+
6: "0x8383534d0bcd0186d326c993031311c0ac0d9b2d: 9000000000000000000 wei + 21000 × 20000000000 gas"
190178
},
191179
0x5b30608c678e1ac464a8994c3b33e5cdf3497112: {
192-
6: ["0x9773547e27f8303c87089dc42d9288aa2b9d8f06: 50000000000000000000 wei + 90000 × 50000000000 gas"]
180+
6: "0x9773547e27f8303c87089dc42d9288aa2b9d8f06: 50000000000000000000 wei + 90000 × 50000000000 gas"
193181
},
194182
0x976a3fc5d6f7d259ebfb4cc2ae75115475e9867c: {
195-
3: ["0x346fb27de7e7370008f5da379f74dd49f5f2f80f: 140000000000000000 wei + 90000 × 20000000000 gas"]
183+
3: "0x346fb27de7e7370008f5da379f74dd49f5f2f80f: 140000000000000000 wei + 90000 × 20000000000 gas"
196184
},
197185
0x9b11bf0459b0c4b2f87f8cebca4cfc26f294b63a: {
198-
2: ["0x24a461f25ee6a318bdef7f33de634a67bb67ac9d: 17000000000000000000 wei + 90000 × 50000000000 gas"],
199-
6: ["0x6368f3f8c2b42435d6c136757382e4a59436a681: 17990000000000000000 wei + 90000 × 20000000000 gas", "0x8db7b4e0ecb095fbd01dffa62010801296a9ac78: 16998950000000000000 wei + 90000 × 20000000000 gas"],
200-
7: ["0x6368f3f8c2b42435d6c136757382e4a59436a681: 17900000000000000000 wei + 90000 × 20000000000 gas"]
186+
2: "0x24a461f25ee6a318bdef7f33de634a67bb67ac9d: 17000000000000000000 wei + 90000 × 50000000000 gas",
187+
6: "0x6368f3f8c2b42435d6c136757382e4a59436a681: 17990000000000000000 wei + 90000 × 20000000000 gas",
188+
7: "0x6368f3f8c2b42435d6c136757382e4a59436a681: 17900000000000000000 wei + 90000 × 20000000000 gas"
201189
}
202190
}
203191
}

0 commit comments

Comments
 (0)