Skip to content

Commit 090d072

Browse files
committed
fix review
1 parent cd5159c commit 090d072

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

chainbase/src/main/java/org/tron/core/db2/core/Chainbase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public enum Cursor {
3535
//true:fullnode, false:soliditynode
3636
private ThreadLocal<Cursor> cursor = new ThreadLocal<>();
3737
private ThreadLocal<Long> offset = new ThreadLocal<>();
38-
private Snapshot head;
38+
private volatile Snapshot head;
3939

4040
public Chainbase(Snapshot head) {
4141
this.head = head;

framework/src/main/java/org/tron/core/services/jsonrpc/TronJsonRpcImpl.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ public String web3Sha3(String data) throws JsonRpcInvalidParamsException {
297297
@Override
298298
public String ethGetBlockTransactionCountByHash(String blockHash)
299299
throws JsonRpcInvalidParamsException {
300+
validateBlockNumOrHashOrTag(blockHash);
300301
Block b = getBlockByJsonHash(blockHash);
301302
if (b == null) {
302303
return null;
@@ -535,6 +536,7 @@ private String call(byte[] ownerAddressByte, byte[] contractAddressByte, long va
535536
@Override
536537
public String getStorageAt(String address, String storageIdx, String blockNumOrTag)
537538
throws JsonRpcInvalidParamsException {
539+
validateBlockNumOrHashOrTag(blockNumOrTag);
538540
if (EARLIEST_STR.equalsIgnoreCase(blockNumOrTag)
539541
|| PENDING_STR.equalsIgnoreCase(blockNumOrTag)
540542
|| FINALIZED_STR.equalsIgnoreCase(blockNumOrTag)) {
@@ -565,6 +567,7 @@ public String getStorageAt(String address, String storageIdx, String blockNumOrT
565567
@Override
566568
public String getABIOfSmartContract(String contractAddress, String blockNumOrTag)
567569
throws JsonRpcInvalidParamsException {
570+
validateBlockNumOrHashOrTag(blockNumOrTag);
568571
if (EARLIEST_STR.equalsIgnoreCase(blockNumOrTag)
569572
|| PENDING_STR.equalsIgnoreCase(blockNumOrTag)
570573
|| FINALIZED_STR.equalsIgnoreCase(blockNumOrTag)) {
@@ -779,6 +782,7 @@ private TransactionResult getTransactionByBlockAndIndex(Block block, String inde
779782
@Override
780783
public TransactionResult getTransactionByBlockHashAndIndex(String blockHash, String index)
781784
throws JsonRpcInvalidParamsException {
785+
validateBlockNumOrHashOrTag(blockHash);
782786
final Block block = getBlockByJsonHash(blockHash);
783787

784788
if (block == null) {

0 commit comments

Comments
 (0)