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.

Sign up for GitHub

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

Support admin txpool_content method #1178

Merged
merged 3 commits into from
Apr 8, 2020
Merged

Support admin txpool_content method #1178

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc6bd80
Adds support for txpool content
josh-richardson Apr 1, 2020
b8cdf66
Merge branch 'master' into support-txqueue
josh-richardson Apr 1, 2020
11990e8
Small fixes
josh-richardson Apr 1, 2020
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
3 changes: 3 additions & 0 deletions core/src/main/java/org/web3j/protocol/admin/Admin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.web3j.protocol.admin.methods.response.NewAccountIdentifier;
import org.web3j.protocol.admin.methods.response.PersonalListAccounts;
import org.web3j.protocol.admin.methods.response.PersonalUnlockAccount;
import org.web3j.protocol.admin.methods.response.TxPoolContent;
import org.web3j.protocol.core.Request;
import org.web3j.protocol.core.methods.request.Transaction;
import org.web3j.protocol.core.methods.response.EthSendTransaction;
Expand Down Expand Up @@ -50,4 +51,6 @@ public Request<?, PersonalUnlockAccount> personalUnlockAccount(

public Request<?, EthSendTransaction> personalSendTransaction(
Transaction transaction, String password);

public Request<?, TxPoolContent> txPoolContent();
}
10 changes: 10 additions & 0 deletions core/src/main/java/org/web3j/protocol/admin/JsonRpc2_0Admin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.web3j.protocol.admin.methods.response.NewAccountIdentifier;
import org.web3j.protocol.admin.methods.response.PersonalListAccounts;
import org.web3j.protocol.admin.methods.response.PersonalUnlockAccount;
import org.web3j.protocol.admin.methods.response.TxPoolContent;
import org.web3j.protocol.core.JsonRpc2_0Web3j;
import org.web3j.protocol.core.Request;
import org.web3j.protocol.core.methods.request.Transaction;
Expand Down Expand Up @@ -96,4 +97,13 @@ public Request<?, EthSendTransaction> personalSendTransaction(
web3jService,
EthSendTransaction.class);
}

@Override
public Request<?, TxPoolContent> txPoolContent() {
return new Request<>(
"txpool_content",
Collections.<String>emptyList(),
web3jService,
TxPoolContent.class);
}
}
80 changes: 80 additions & 0 deletions core/src/main/java/org/web3j/protocol/admin/methods/response/TxPoolContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/*
* Copyright 2020 Web3 Labs Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.web3j.protocol.admin.methods.response;

import java.math.BigInteger;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import org.web3j.protocol.core.Response;
import org.web3j.protocol.core.methods.response.Transaction;

/** txqueue_content */
public class TxPoolContent extends Response<TxPoolContent.TxPoolContentResult> {
public static class TxPoolContentResult {

private Map<String, Map<BigInteger, Transaction>> pending;
private Map<String, Map<BigInteger, Transaction>> queued;

public TxPoolContentResult() {}

public TxPoolContentResult(
Map<String, Map<BigInteger, Transaction>> pending,
Map<String, Map<BigInteger, Transaction>> queued) {
this.pending =
Collections.unmodifiableMap(
pending.entrySet().stream()
.collect(
Collectors.toMap(
(Map.Entry<String, Map<BigInteger, Transaction>>
i) -> i.getKey().toLowerCase(),
(Map.Entry<String, Map<BigInteger, Transaction>>
i) ->
Collections.unmodifiableMap(
i.getValue()))));
this.queued =
Collections.unmodifiableMap(
queued.entrySet().stream()
.collect(
Collectors.toMap(
(Map.Entry<String, Map<BigInteger, Transaction>>
i) -> i.getKey().toLowerCase(),
(Map.Entry<String, Map<BigInteger, Transaction>>
i) ->
Collections.unmodifiableMap(
i.getValue()))));
}

public Map<String, Map<BigInteger, Transaction>> getPending() {
return pending;
}

public Map<String, Map<BigInteger, Transaction>> getQueued() {
return queued;
}

public List<Transaction> getPendingTransactions() {
return pending.values().stream()
.flatMap(i -> i.values().stream())
.collect(Collectors.toList());
}

public List<Transaction> getQueuedTransactions() {
return queued.values().stream()
.flatMap(i -> i.values().stream())
.collect(Collectors.toList());
}
}
}
8 changes: 8 additions & 0 deletions core/src/test/java/org/web3j/protocol/admin/RequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,12 @@ public void testPersonalUnlockAccountNoDuration() throws Exception {
+ "\"params\":[\"0xfc390d8a8ddb591b010fda52f4db4945742c3809\",\"hunter2\",null],"
+ "\"id\":1}");
}

@Test
public void textTxPoolContent() throws Exception {
web3j.txPoolContent().send();

verifyResult(
"{\"jsonrpc\":\"2.0\",\"method\":\"txpool_content\"," + "\"params\":[],\"id\":1}");
}
}
66 changes: 61 additions & 5 deletions core/src/test/java/org/web3j/protocol/admin/ResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@
import org.junit.jupiter.api.Test;

import org.web3j.protocol.ResponseTester;
import org.web3j.protocol.admin.methods.response.BooleanResponse;
import org.web3j.protocol.admin.methods.response.NewAccountIdentifier;
import org.web3j.protocol.admin.methods.response.PersonalListAccounts;
import org.web3j.protocol.admin.methods.response.PersonalSign;
import org.web3j.protocol.admin.methods.response.PersonalUnlockAccount;
import org.web3j.protocol.admin.methods.response.*;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand Down Expand Up @@ -107,4 +103,64 @@ public void testPersonalUnlockAccount() {
deserialiseResponse(PersonalUnlockAccount.class);
assertTrue(personalUnlockAccount.accountUnlocked());
}

@Test
public void testTxPoolContent() {
buildResponse(
"{\n"
+ " \"jsonrpc\": \"2.0\",\n"
+ " \"id\": 1,\n"
+ " \"result\": {\n"
+ " \"pending\": {\n"
+ " \"0x0032D05F320fa74C871E892F48F0e6387c0Dfe95\": {\n"
+ " \"0\": {\n"
+ " \"blockHash\": null,\n"
+ " \"blockNumber\": null,\n"
+ " \"from\": \"0x0032d05f320fa74c871e892f48f0e6387c0dfe95\",\n"
+ " \"gas\": \"0x63cad\",\n"
+ " \"gasPrice\": \"0x1\",\n"
+ " \"hash\": \"0x56cf53cbd377535c14b28cd373fa43d129f501b1a20b36903fd14b747c3f6cf5\",\n"
+ " \"input\": \"0x608060405234801561001057600080fd5b5060405161060a38038061060a833981018060405281019080805190602001909291908051820192919060200180519060200190929190805190602001909291908051906020019092919050505084848160008173ffffffffffffffffffffffffffffffffffffffff1614151515610116576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260248152602001807f496e76616c6964206d617374657220636f707920616464726573732070726f7681526020017f696465640000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506000815111156101a35773ffffffffffffffffffffffffffffffffffffffff60005416600080835160208501846127105a03f46040513d6000823e600082141561019f573d81fd5b5050505b5050600081111561036d57600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614156102b7578273ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f1935050505015156102b2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f436f756c64206e6f74207061792073616665206372656174696f6e207769746881526020017f206574686572000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b61036c565b6102d1828483610377640100000000026401000000009004565b151561036b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f436f756c64206e6f74207061792073616665206372656174696f6e207769746881526020017f20746f6b656e000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b5b5b5050505050610490565b600060608383604051602401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001925050506040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505090506000808251602084016000896127105a03f16040513d6000823e3d60008114610473576020811461047b5760009450610485565b829450610485565b8151158315171594505b505050509392505050565b61016b8061049f6000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680634555d5c91461008b5780635c60da1b146100b6575b73ffffffffffffffffffffffffffffffffffffffff600054163660008037600080366000845af43d6000803e6000811415610086573d6000fd5b3d6000f35b34801561009757600080fd5b506100a061010d565b6040518082815260200191505060405180910390f35b3480156100c257600080fd5b506100cb610116565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b60006002905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050905600a165627a7a7230582007fffd557dfc8c4d2fdf56ba6381a6ce5b65b6260e1492d87f26c6d4f1d0410800290000000000000000000000008942595a2dc5181df0465af0d7be08c8f23c93af00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000004ba9692da667218aa968ced8cbe59fe193e0d7860000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006968500000000000000000000000000000000000000000000000000000000000001240ec78d9e00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000000200000000000000000000000006ea3e1c44f2ad3e54cf32a25eb9fab965fc010f0000000000000000000000009542597a73c7371f07b4532bda22d39cfc4912180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\",\n"
+ " \"nonce\": \"0x0\",\n"
+ " \"to\": null,\n"
+ " \"transactionIndex\": null,\n"
+ " \"value\": \"0x0\",\n"
+ " \"v\": \"0x1b\",\n"
+ " \"r\": \"0x1b53058de9ed675d8b6583c559d23013e941905dad28dfd95ba3ff4f38ace0\",\n"
+ " \"s\": \"0x8631cfd224ee69034f8040d2297a28229ee91cd5acdabc7f1de5be62220\"\n"
+ " }\n"
+ " }\n"
+ " },\n"
+ " \"queued\": {\n"
+ " \"0x00Bf700CeB382877F8bFa38b05fcC81126f4f228\": {\n"
+ " \"49\": {\n"
+ " \"blockHash\": null,\n"
+ " \"blockNumber\": null,\n"
+ " \"from\": \"0x00bf700ceb382877f8bfa38b05fcc81126f4f228\",\n"
+ " \"gas\": \"0xfa00\",\n"
+ " \"gasPrice\": \"0x3b9aca00\",\n"
+ " \"hash\": \"0xa87ab980c4d277de6c4faf2670a2ec1b6e577482e582c8082d208b7e630cf395\",\n"
+ " \"input\": \"0xa6ab36f2000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000009590f23a286dade6fbf778ca651ad560d4e02fdc\",\n"
+ " \"nonce\": \"0x31\",\n"
+ " \"to\": \"0x974d7219184a41d4f5e3664ddce808c7853d3ab4\",\n"
+ " \"transactionIndex\": null,\n"
+ " \"value\": \"0x0\",\n"
+ " \"v\": \"0x2b\",\n"
+ " \"r\": \"0xc747162f13dd24fd03dd00c66c5c3d222595908319333c2b08e7f7def8dad2e7\",\n"
+ " \"s\": \"0x8e6a2c4e3794d782d51f950e0ba546f44412e8c2409bd39149d78d7ca316e8a\"\n"
+ " }\n"
+ " }\n"
+ " }\n"
+ " }\n"
+ "}");

TxPoolContent content = deserialiseResponse(TxPoolContent.class);

assertEquals(
content.getResult().getPendingTransactions().get(0).getFrom(),
"0x0032d05f320fa74c871e892f48f0e6387c0dfe95");
assertEquals(
content.getResult().getQueuedTransactions().get(0).getFrom(),
"0x00bf700ceb382877f8bfa38b05fcc81126f4f228");
}
}
3 changes: 2 additions & 1 deletion integration-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ description 'web3j integration tests'
dependencies {
compile project(':core'),
project(':besu'),
project(':parity')
project(':parity'),
project(':geth')
testCompile "ch.qos.logback:logback-core:$logbackVersion",
"ch.qos.logback:logback-classic:$logbackVersion",
"com.carrotsearch:junit-benchmarks:$junitBenchmarkVersion"
Expand Down
39 changes: 39 additions & 0 deletions integration-tests/src/test/java/org/web3j/protocol/geth/GethIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* Copyright 2020 Web3 Labs Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.web3j.protocol.geth;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import org.web3j.protocol.admin.methods.response.TxPoolContent;
import org.web3j.protocol.http.HttpService;

import static org.junit.jupiter.api.Assertions.assertNotNull;

public class GethIT {

private Geth web3j;

public GethIT() {}

@BeforeEach
public void setUp() {
this.web3j = Geth.build(new HttpService());
}

@Test
public void testWeb3ClientVersion() throws Exception {
TxPoolContent content = web3j.txPoolContent().send();
assertNotNull(content.getResult());
}
}