Skip to content

fix(jsonrpc): correct TransactionResult.nonce per JSON-RPC spec #6709

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

Open
waynercheung wants to merge 1 commit into
base: develop
Choose a base branch
from
+14 −3
Open

fix(jsonrpc): correct TransactionResult.nonce per JSON-RPC spec #6709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions framework/src/main/java/org/tron/core/services/jsonrpc/types/TransactionResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public TransactionResult(BlockCapsule blockCapsule, int index, Protocol.Transact
TransactionCapsule capsule = new TransactionCapsule(tx);
byte[] txId = capsule.getTransactionId().getBytes();
hash = ByteArray.toJsonHex(txId);
nonce = ByteArray.toJsonHex(new byte[8]); // no value
nonce = "0x0"; // no value, QUANTITY type per Ethereum JSON-RPC spec
blockHash = ByteArray.toJsonHex(blockCapsule.getBlockId().getBytes());
blockNumber = ByteArray.toJsonHex(blockCapsule.getNum());
transactionIndex = ByteArray.toJsonHex(index);
Expand Down Expand Up @@ -133,7 +133,7 @@ public TransactionResult(Transaction tx, Wallet wallet) {
TransactionCapsule capsule = new TransactionCapsule(tx);
byte[] txId = capsule.getTransactionId().getBytes();
hash = ByteArray.toJsonHex(txId);
nonce = ByteArray.toJsonHex(new byte[8]); // no value
nonce = "0x0"; // no value, QUANTITY type per Ethereum JSON-RPC spec
blockHash = "0x";
blockNumber = "0x";
transactionIndex = "0x";
Expand Down
13 changes: 12 additions & 1 deletion framework/src/test/java/org/tron/core/services/jsonrpc/TransactionResultTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,18 @@ public class TransactionResultTest extends BaseTest {
private static final String OWNER_ADDRESS = "41548794500882809695a8a687866e76d4271a1abc";
private static final String CONTRACT_ADDRESS = "A0B4750E2CD76E19DCA331BF5D089B71C3C2798548";

// QUANTITY pattern from ethereum/execution-apis base-types schema (uint).
private static final String QUANTITY_PATTERN = "^0x(0|[1-9a-f][0-9a-f]*)$";

static {
Args.setParam(new String[] {"-d", dbPath()}, TestConstants.TEST_CONF);
}

private static void assertQuantity(String value) {
Assert.assertNotNull(value);
Assert.assertTrue("not a valid QUANTITY: " + value, value.matches(QUANTITY_PATTERN));
}

@Test
public void testBuildTransactionResultWithBlock() {
SmartContractOuterClass.TriggerSmartContract.Builder builder2 =
Expand All @@ -49,6 +57,8 @@ public void testBuildTransactionResultWithBlock() {
transactionResult.getHash());
Assert.assertEquals(transactionResult.getGasPrice(), "0x1");
Assert.assertEquals(transactionResult.getGas(), "0x64");
Assert.assertEquals("0x0", transactionResult.getNonce());
assertQuantity(transactionResult.getNonce());
}

@Test
Expand All @@ -65,7 +75,8 @@ public void testBuildTransactionResult() {
Assert.assertEquals("0x5691531881bc44adbc722060d85fdf29265823db8e884b0d104fcfbba253cf11",
transactionResult.getHash());
Assert.assertEquals(transactionResult.getGasPrice(), "0x");
Assert.assertEquals(transactionResult.getNonce(), "0x0000000000000000");
Assert.assertEquals("0x0", transactionResult.getNonce());
assertQuantity(transactionResult.getNonce());
}

}
Loading