Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating my fork #3

Open
wants to merge 177 commits into
base: upnp_support
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
177 commits
Select commit Hold shift + click to select a range
be8cb71
Network vs node configuration (#1223)
MadelineMurray Apr 7, 2019
e337369
Make contract size limit configurable. (#1227)
rojotek Apr 7, 2019
54c6381
custom deserializer for TopicsParameter (#1235)
macfarla Apr 7, 2019
97a749c
Updated eea_getTransactionReceipt to include extra parameter
MadelineMurray Apr 7, 2019
62616be
Updated Permissions Configuration File for new CLI options (#1234)
MadelineMurray Apr 8, 2019
f174e74
[PIE-1224] Different request limits for different request types (#1224)
AbdelStark Apr 8, 2019
079d3d4
Enable pipeline chain downloader for fast sync. (#1232)
ajsutton Apr 8, 2019
8959489
[PRIV-45] Improve eea_sendRawTransaction error messages (#1238)
Puneetha17 Apr 9, 2019
00fd18d
Added permissioning overview (#1242)
MadelineMurray Apr 9, 2019
5629570
Update PantheonCommand.java (#1245)
AbdelStark Apr 9, 2019
7dabc53
[PRIV-41] Refactor PrivacyParameters config to use builder pattern (#…
antonydenyer Apr 9, 2019
0014cc0
Reduce memory usage in import (#1239)
shemnon Apr 9, 2019
504ddf2
Feature/pie 1502 ewp options cli (#1246)
AbdelStark Apr 9, 2019
bbeb5b3
added note (#1244)
MadelineMurray Apr 10, 2019
5f3f298
Fixed link (#1249)
MadelineMurray Apr 10, 2019
49df646
Added note about using node permissioning only (#1243)
MadelineMurray Apr 10, 2019
2b9c371
Feature/pie 1502 ewp options cli (#1255)
AbdelStark Apr 10, 2019
b38e260
Choose sync target based on td rather than height (#1256)
mbaxter Apr 10, 2019
ef60bc3
Added 1.0.3 updates (#1250)
MadelineMurray Apr 10, 2019
94ea4b2
added content on free gas (#1252)
MadelineMurray Apr 10, 2019
77ec5c2
[PAN-2433] Fix netty pipeline (#1257)
mbaxter Apr 10, 2019
9bb43a4
[Gradle Release Plugin] - pre tag commit: '1.0.3'.
pegasys-admin Apr 10, 2019
30ba781
[Gradle Release Plugin] - new version commit: '1.1.0-SNAPSHOT'.
pegasys-admin Apr 10, 2019
a18bbcf
[PAN-2529] subscribing to sync events should receive false when in sy…
Errorific Apr 11, 2019
0a19d49
[Minor] Ignore extra json rpc params (#1261)
mbaxter Apr 11, 2019
f8016d2
[PRIV-44] Use single instance of Rocksdb for privacy (#1247)
Puneetha17 Apr 11, 2019
8477392
[PAN-2499] debug trace transaction (#1258)
AbdelStark Apr 11, 2019
516c995
Added fast sync options (#1241)
MadelineMurray Apr 11, 2019
6e577d5
PAN-2404 - Make PeerDiscovertAgentTest less flakey. (#1262)
shemnon Apr 11, 2019
8daaa4e
PIE-1505 - Build broken in Java 12 (#1263)
shemnon Apr 11, 2019
89755f8
RocksDB Statistics in Metrics (#1169)
shemnon Apr 11, 2019
1416524
Allow use of / in branch name when using the branch from tag release …
jframe Apr 12, 2019
a6c4e65
Normalize EnodeURLs (#1264)
mbaxter Apr 12, 2019
03e00dc
Expose sync mode option (#1270)
AbdelStark Apr 12, 2019
19b5443
Feature/move subclass in pantheon command (#1272)
AbdelStark Apr 12, 2019
6eca39e
[PRIV-46] Use labelled timer to differentiate between rocks db metric…
Puneetha17 Apr 12, 2019
dcce589
Keep enode nodeId stored as a BytesValue (#1274)
mbaxter Apr 12, 2019
d64aa2e
Refactor RocksDBStats (#1266)
shemnon Apr 13, 2019
902045a
Create EnodeURL Builder (#1275)
mbaxter Apr 14, 2019
142bd1a
Add block trace RPC methods (#1088)
kziemianek Apr 15, 2019
a3145eb
Log error when a JSON decode problem is encountered (#1278)
CjHare Apr 15, 2019
6afc022
[MINOR] migrate TransactionPool (& affiliated test) from 'core' to 'e…
smatthewenglish Apr 15, 2019
8c8ebe8
fetch local transactions in isolation (#1259)
smatthewenglish Apr 15, 2019
1d6bfe3
Rollback to rocksdb 5.15.10 (#1279)
shemnon Apr 15, 2019
0f1c70d
[PAN-2560] Cleanup PeerConnection interface (#1282)
mbaxter Apr 15, 2019
b80c523
[PIE-7] Ignore transactions from the network while behind chain head …
smatthewenglish Apr 15, 2019
90fef9b
Fix running ATs with in-process node runner (#1285)
ajsutton Apr 15, 2019
af8345e
Simplify enode construction (#1283)
mbaxter Apr 16, 2019
41fce79
[PRIV-54] Use default enclave public key to generate eea_getTransacti…
Puneetha17 Apr 16, 2019
bd19d60
Update permissioning smart contract interface to match updated EEA pr…
Errorific Apr 16, 2019
233bf7b
[PAN-2560] Consolidate p2p node info methods (#1288)
mbaxter Apr 16, 2019
06f2405
Undo changes to PendingTransactions method visibility (#1281)
mbaxter Apr 16, 2019
62cbad4
Switch to new sync target if it exceeds the td threshold (#1286)
ajsutton Apr 16, 2019
4eee7d0
Better errors for when permissioning contract is set up wrong (#1296)
Errorific Apr 17, 2019
33c0794
Remove --fast-sync-wait-time option (#1297)
ajsutton Apr 17, 2019
318c41b
PAN-2485#Add net_services json rpc endpoint (#1295)
usmananwar Apr 17, 2019
2035e81
Fix RunnerBuilder method names (#1284)
mbaxter Apr 17, 2019
6ca4d6f
Updated eth_getTransactionCount
MadelineMurray Apr 17, 2019
c76078e
Added 1.1 RC changes (#1298)
MadelineMurray Apr 17, 2019
b12d9ad
Implement max message size rather than limiting with fixed number of …
AbdelStark Apr 17, 2019
0bcc0e5
Pipeline based full sync (#1291)
ajsutton Apr 17, 2019
22fa765
Removed available in 1.1 notes and added links from CLI options (#1294)
MadelineMurray Apr 17, 2019
73235fc
Added txpool pantheon statistics endpoint. (#1293)
rojotek Apr 17, 2019
f8cd3a0
[Gradle Release Plugin] - pre tag commit: '1.1.0-RC1'.
pegasys-admin Apr 17, 2019
c0d4729
[Gradle Release Plugin] - new version commit: '1.1.1-SNAPSHOT'.
pegasys-admin Apr 17, 2019
1508367
Removing 'all' from the help wording for host-whitelist (as that no l…
CjHare Apr 18, 2019
36a2294
Remove remnants of the old dev mode. (#1307)
ajsutton Apr 20, 2019
fbfe1bb
Stop synchronizer prior to stopping the network (#1302)
ajsutton Apr 21, 2019
c2e12d8
PAN-2577 - missing p2p info when queried live (#1310)
shemnon Apr 22, 2019
bca6397
tx limit size send peers follow up (#1308)
AbdelStark Apr 22, 2019
5e790e4
Configure RocksDb max background compaction and thread count (#1312)
ajsutton Apr 23, 2019
41838f9
Remove duplicate init code from PantheonController instances (#1305)
ajsutton Apr 23, 2019
9788119
PIE-1526: Fix account permissioning check case matching (#1314)
lucassaldanha Apr 23, 2019
79f06a7
[PAN-1339] Send local transactions to new peers (#1253)
smatthewenglish Apr 23, 2019
c3e7dfc
Update Enclave executePost method (#1317)
AbdelStark Apr 23, 2019
d6148f3
Use header validation mode for ommers (#1313)
ajsutton Apr 23, 2019
cfa9401
PIE-1526: Normalize account permissioning addresses in whitelist (#1320)
lucassaldanha Apr 23, 2019
bfb6ce5
Require block numbers for debug_traceBlockByNumber to be in hex (#1326)
ajsutton Apr 24, 2019
2871e92
Ensure eth scheduler is stopped in tests (#1324)
ajsutton Apr 24, 2019
baccba9
Improve logging of chain download errors in the pipeline chain downlo…
ajsutton Apr 24, 2019
a728654
[PAN-1878] Provide error message when invalid key specified in key fi…
AbdelStark Apr 24, 2019
1752a87
Allow use of large chain ids (#1289)
jframe Apr 24, 2019
27701de
[PAN-2576] Allow whitespace in path (#1327)
AbdelStark Apr 24, 2019
ad7e26b
[PIE-1531] Allow whitespace in file paths loaded from resources direc…
AbdelStark Apr 24, 2019
062ea7a
[PAN-2574] Fix failed tests on Windows (#1332)
AbdelStark Apr 25, 2019
c0bf672
[PAN-1062] Evict old transactions (1 of 2) (#1299)
smatthewenglish Apr 25, 2019
039ec47
Ensured that the transaction statistics endpoint is exposed. (#1330)
rojotek Apr 26, 2019
fc246ff
JsonRpcError decoding to include message (#1336)
CjHare Apr 26, 2019
bed68a5
[PRIV-55] Allow private contract invocations in multiple privacy grou…
iikirilov Apr 26, 2019
513cd89
removed unstable fast sync note in documentation (#1341)
NicolasMassart Apr 26, 2019
53c2c05
Cache current chain head info (#1335)
ajsutton Apr 26, 2019
560efab
Added net_services (#1306)
MadelineMurray Apr 27, 2019
bd79af8
Updated for returning false (#1309)
MadelineMurray Apr 27, 2019
95431a6
Added sending private transactions initial content (#1301)
MadelineMurray Apr 27, 2019
35018cd
Upated Docker image to indicate it doesn't run on Windows (#1346)
MadelineMurray Apr 28, 2019
eaf5692
[PAN-2573] include static nodes in permissioning logic (#1339)
macfarla Apr 28, 2019
2dc0c1a
Removed all option for host-whitelist (#1347)
MadelineMurray Apr 28, 2019
d89b2a4
Added content on using multinode example (#1345)
MadelineMurray Apr 28, 2019
e935536
Don't abort in-progress master builds when a new commit is added. (#1…
ajsutton Apr 29, 2019
c88fbe1
Updating Orion to 0.9.0 (#1359)
lucassaldanha Apr 29, 2019
6e383f9
Added txpool_pantheonStatistics (#1354)
MadelineMurray Apr 29, 2019
3cbe131
Removed privacy quickstart reference (#1361)
MadelineMurray Apr 29, 2019
b67c058
Updated overview (#1362)
MadelineMurray Apr 29, 2019
2b04d7f
Onchain permissioning (#1300)
MadelineMurray Apr 29, 2019
d923981
Update Private-Transaction-Processing.md (#1352)
jacobhackman Apr 29, 2019
0723e5b
Update Using-Configuration-File.md (#1351)
jacobhackman Apr 29, 2019
b1357a8
[PAN-2588] Create P2PNetwork Builder (#1343)
mbaxter Apr 29, 2019
f7f2a70
[PRIV-65] eea_getTransactionCount fails if account has not interacted…
iikirilov Apr 29, 2019
bfb760e
Added requirement to enable JSON-RPC (#1365)
MadelineMurray Apr 29, 2019
44561d8
Request open ended headers from sync target (#1355)
ajsutton Apr 29, 2019
527131b
Increase RocksDB max-background-compactions and background-thread-cou…
ajsutton Apr 29, 2019
0b159d3
Added 1.1 changes (#1356)
MadelineMurray Apr 29, 2019
9fe4e98
Update roadmap (#1371)
arash009 Apr 29, 2019
9975195
[PAN-1062] Specify pending transaction retention period (2 of 2) (#1333)
smatthewenglish Apr 30, 2019
c80ea8a
Handle the pipeline being aborted while finalizing an async operation…
ajsutton Apr 30, 2019
5e3d768
Enable the pipeline chain downloader by default (#1344)
ajsutton Apr 30, 2019
6c1426b
[MINOR] Rename rocksdDbConfiguration to rocksDbConfiguration (#1375)
smatthewenglish Apr 30, 2019
dd1f236
[PAN-2595] Consolidate local enode representation (#1376)
mbaxter May 1, 2019
de49103
Use execute instead of submit so unhandled exceptions get logged (#1379)
ajsutton May 1, 2019
b4dad69
[PAN-2585] Prefer EnodeURL over Endpoint (#1378)
mbaxter May 1, 2019
dbdd10e
[PAN-2605] Add getPeer method to PeerConnection (#1383)
mbaxter May 1, 2019
1795f76
Remove EthTaskChainDownloader and supporting code (#1373)
ajsutton May 1, 2019
6e0334b
Remove unnecessary field (#1384)
mbaxter May 1, 2019
5351ef3
Use streams and avoid iterating child nodes multiple times (#1380)
ajsutton May 1, 2019
52b20bd
Removing smart quotes (#1381)
jmcnevin May 2, 2019
5d15eb1
Update Log message in IBFT Controller (#1387)
rain-on May 2, 2019
b9384c3
Fixed typo (#1388)
MadelineMurray May 2, 2019
fbe2656
update python mkdocs requirements versions (#1374)
NicolasMassart May 2, 2019
45f618e
Handle case where peers advertise a listening port of 0 (#1391)
mbaxter May 2, 2019
00cca89
Add explanatory comment about default port (#1392)
mbaxter May 2, 2019
378f098
Added privacy roadmap (#1386)
MadelineMurray May 2, 2019
1361a6d
Queue pending requests when all peers are busy (#1331)
ajsutton May 2, 2019
6e6a7bb
Wait for next message to be sent in FullSyncChainDownloaderTest. (#1394)
ajsutton May 2, 2019
f792228
Update Create-Permissioned-Network.md (#1353)
jacobhackman May 3, 2019
cd868c9
Update Transactions.md (#1350)
jacobhackman May 3, 2019
b30ad2f
Update Bootnodes.md (#1349)
jacobhackman May 3, 2019
3eeef1a
fixes PIE-1499 remove hotjar tag as we can manage all tags with Googl…
NicolasMassart May 3, 2019
7105f70
Fix non-deterministic test caused by variable size of generated trans…
AbdelStark May 6, 2019
c40387f
[PAN-2586] Reference tests fail on Windows (#1401)
smatthewenglish May 6, 2019
f095f5f
[Minor] Start BlockPropagationManager immediately - don't wait for fu…
mbaxter May 6, 2019
4c9b1c0
Add flat file based task collection (#1377)
ajsutton May 7, 2019
1bbc685
Add constantinople fix block for Rinkeby (#1404)
ajsutton May 7, 2019
e15c5fc
Avoid recomputing the logs bloom filter when reading receipts from RL…
ajsutton May 7, 2019
66c6a81
added error message for RPC method disabled (#1396)
macfarla May 7, 2019
634f1db
PAN-2449: Remove NodePermissioningLocalConfig external references (#1…
lucassaldanha May 8, 2019
7f1b748
Fix clique miner to respect changes to vanity data made via JSON-RPC.…
ajsutton May 8, 2019
9c52391
Support including the transaction details in the pending transactions…
rojotek May 8, 2019
8c414f8
[PIE-1500] windows jdk smoke tests (#1413)
May 8, 2019
25242c5
Use port 0 when starting a websocket server in tests (#1416)
ajsutton May 8, 2019
12bd55f
Updated block size limit configuration (#1414)
MadelineMurray May 8, 2019
02b390d
Privacy quickstart (#1400)
MadelineMurray May 8, 2019
be53313
Added perm and privacy webinars (#1385)
MadelineMurray May 8, 2019
667e0d4
[Ethereal Hackathon] GraphQL EIP-1767 Implementation for Pantheon (#1…
zyfrank May 8, 2019
db79f69
PAN-2592: Rename methods that create and return streams away from get…
May 8, 2019
b3557d7
[PAN-2624] Start listening for p2p connections after start() is invok…
mbaxter May 8, 2019
c1a023a
Troubleshooting doc (#1405)
MadelineMurray May 8, 2019
bf01596
[PIE-1500] Get all our smoke tests for all platforms in 1 jenkins job…
May 8, 2019
b213e1c
Deleting unused windows jenkinsfile (#1421)
May 8, 2019
633a323
[PAN-2590] Improved JSON-RPC responses when EnodeURI parameter has in…
mark-terry May 9, 2019
ba63c29
BlockCreator does not delete transactions with invalid nonce
rain-on May 9, 2019
1d96899
Unwrap DelegatingBytes32 and prevent Hash from wrapping other Hash in…
ajsutton May 9, 2019
7bd413e
simple account permissioning (#1409)
macfarla May 9, 2019
0e5b38f
renamed AccountWhitelistController (#1424)
macfarla May 9, 2019
83dfa95
[PAN-2601] Refactorings and additions to add Account based Smart Cont…
mark-terry May 10, 2019
3b46571
Change AT discard RPC tests to check votes are discarded using propos…
jframe May 10, 2019
4af536c
[PAN-2601] Renamed AccountPermissioningProver to TransactionPermissio…
mark-terry May 10, 2019
9d1e4de
Fix p2p PeerInfo handling (#1428)
mbaxter May 10, 2019
329d50f
Ensure failed Txns are deleted when detected during mining (#1436)
rain-on May 12, 2019
fc7ff51
[PAN-2612] Transaction smart contract permissioning controller (#1433)
May 13, 2019
0a8b5c7
Capture all logs and errors in the Pantheon log output (#1437)
ajsutton May 13, 2019
505028f
IbftProcessor logs when a throwable terminates mining (#1427)
rain-on May 13, 2019
427272a
Allow config files to specify no bootnodes (#1438)
ajsutton May 13, 2019
8ee5f7f
Added Genesis file support for specifying the maximum stack size. (#1…
rojotek May 13, 2019
32b587e
Update EnodeURL to support enodes with listening disabled (#1403)
mbaxter May 13, 2019
bdbabc9
Equals cleanup (#1434)
May 13, 2019
a7a364e
Decode devp2p packets off the event thread (#1439)
ajsutton May 13, 2019
2e5833d
Reorganised API docs (#1441)
MadelineMurray May 14, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Minor] Ignore extra json rpc params (PegaSysEng#1261)
mbaxter authored and notlesh committed Apr 24, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 0a19d49d3a3a6b3478e4afb6498b6cb3828535a4
Original file line number Diff line number Diff line change
@@ -19,12 +19,14 @@
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonGetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonSetter;
import com.google.common.base.Objects;

@JsonIgnoreProperties(ignoreUnknown = true)
public class JsonRpcRequest {

private JsonRpcRequestId id;
Original file line number Diff line number Diff line change
@@ -202,6 +202,28 @@ public void handleEmptyRequest() throws Exception {
}
}

@Test
public void handleUnknownRequestFields() throws Exception {
final String id = "123";
// Create a request with an extra "beta" param
final RequestBody body =
RequestBody.create(
JSON,
"{\"jsonrpc\":\"2.0\",\"id\":"
+ Json.encode(id)
+ ",\"method\":\"net_version\", \"beta\":true}");

try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
assertThat(resp.code()).isEqualTo(200);
// Check general format of result
final JsonObject json = new JsonObject(resp.body().string());
testHelper.assertValidJsonRpcResult(json, id);
// Check result
final String result = json.getString("result");
assertThat(result).isEqualTo(String.valueOf(CHAIN_ID));
}
}

@Test
public void getSocketAddressWhenActive() {
final InetSocketAddress socketAddress = service.socketAddress();