Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfffd463

Browse files
committed
Proxy provider fixes
Model fixes & refactoringTest improvements & fixes
1 parentd8a7865 commitfffd463

File tree

19 files changed

+129
-252
lines changed

19 files changed

+129
-252
lines changed
Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
packageio.api.etherscan;
22

33
importio.api.etherscan.core.impl.EtherScanApi;
4-
importio.api.etherscan.model.*;
5-
6-
importjava.util.List;
7-
importjava.util.Optional;
4+
importio.api.etherscan.model.Balance;
85

96
/**
107
*
@@ -13,16 +10,6 @@ public class App {
1310
publicstaticvoidmain(String[]args) {
1411
EtherScanApiapi =newEtherScanApi();
1512
Balancebalance =api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
16-
Balancebalance1 =api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
17-
Balancebalance2 =api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
18-
Balancebalance3 =api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
19-
Balancebalance4 =api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
20-
Balancebalance5 =api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
21-
List<Tx>txs =api.account().txs("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
22-
List<TxToken>txTokens =api.account().txsToken("0xf261B3A60Ef40eE0B369B0705c1a2c58B02799DF");
23-
List<TxInternal>txInternals =api.account().txsInternal("0x2c1ba59d6f58433fb1eaee7d20b26ed83bda51a3");
24-
Optional<UncleBlock>uncles =api.block().uncles(2165403);
25-
Optional<UncleBlock>uncleEmpty =api.block().uncles(999965403);
2613
System.out.println("Test");
2714
}
2815
}

‎src/main/java/io/api/etherscan/core/IProxyApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
importio.api.etherscan.error.ApiException;
44
importio.api.etherscan.model.proxy.BlockProxy;
5-
importio.api.etherscan.model.proxy.TxInfoProxy;
5+
importio.api.etherscan.model.proxy.ReceiptProxy;
66
importio.api.etherscan.model.proxy.TxProxy;
77
importorg.jetbrains.annotations.NotNull;
88

@@ -70,7 +70,7 @@ public interface IProxyApi {
7070
* Returns the receipt of a transaction by transaction hash
7171
* eth_getTransactionReceipt
7272
*/
73-
@NotNullOptional<TxInfoProxy>txReceipt(Stringtxhash)throwsApiException;
73+
@NotNullOptional<ReceiptProxy>txReceipt(Stringtxhash)throwsApiException;
7474

7575
/**
7676
* Executes a new message call immediately without creating a transaction on the block chain

‎src/main/java/io/api/etherscan/core/impl/ProxyApiProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
importio.api.etherscan.executor.IHttpExecutor;
88
importio.api.etherscan.manager.IQueueManager;
99
importio.api.etherscan.model.proxy.BlockProxy;
10-
importio.api.etherscan.model.proxy.TxInfoProxy;
10+
importio.api.etherscan.model.proxy.ReceiptProxy;
1111
importio.api.etherscan.model.proxy.TxProxy;
1212
importio.api.etherscan.model.proxy.utility.BlockProxyTO;
1313
importio.api.etherscan.model.proxy.utility.StringProxyTO;
@@ -148,7 +148,7 @@ public Optional<String> txSendRaw(final String hexEncodedTx) throws ApiException
148148

149149
@NotNull
150150
@Override
151-
publicOptional<TxInfoProxy>txReceipt(finalStringtxhash)throwsApiException {
151+
publicOptional<ReceiptProxy>txReceipt(finalStringtxhash)throwsApiException {
152152
BasicUtils.validateTxHash(txhash);
153153

154154
finalStringurlParams =ACT_TX_RECEIPT_PARAM +TXHASH_PARAM +txhash;

‎src/main/java/io/api/etherscan/error/ConnectionException.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
*/
99
publicclassConnectionExceptionextendsApiException {
1010

11-
publicConnectionException(Stringmessage) {
12-
super(message);
13-
}
14-
1511
publicConnectionException(Stringmessage,Throwablecause) {
1612
super(message,cause);
1713
}

‎src/main/java/io/api/etherscan/model/BaseTx.java‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,8 @@ abstract class BaseTx {
2323
privateBigIntegervalue;
2424
privateStringcontractAddress;
2525
privateStringinput;
26-
privatelonggas;
27-
privatelonggasUsed;
28-
29-
BaseTx() { }
30-
31-
publicBaseTx(longblockNumber,LocalDateTime_timeStamp,Stringhash,
32-
Stringfrom,Stringto,BigIntegervalue,StringcontractAddress,
33-
Stringinput,longgas,longgasUsed) {
34-
this.blockNumber =blockNumber;
35-
this._timeStamp =_timeStamp;
36-
this.hash =hash;
37-
this.from =from;
38-
this.to =to;
39-
this.value =value;
40-
this.contractAddress =contractAddress;
41-
this.input =input;
42-
this.gas =gas;
43-
this.gasUsed =gasUsed;
44-
}
26+
privateBigIntegergas;
27+
privateBigIntegergasUsed;
4528

4629
//<editor-fold desc="Getter">
4730
publiclonggetBlockNumber() {
@@ -78,11 +61,11 @@ public String getInput() {
7861
returninput;
7962
}
8063

81-
publiclonggetGas() {
64+
publicBigIntegergetGas() {
8265
returngas;
8366
}
8467

85-
publiclonggetGasUsed() {
68+
publicBigIntegergetGasUsed() {
8669
returngasUsed;
8770
}
8871
//</editor-fold>
Lines changed: 43 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
packageio.api.etherscan.model;
22

3+
importio.api.etherscan.util.BasicUtils;
4+
5+
importjava.math.BigInteger;
36
importjava.time.LocalDateTime;
7+
importjava.time.ZoneOffset;
48
importjava.util.List;
59

610
/**
@@ -12,37 +16,28 @@
1216
publicclassLog {
1317

1418
privateStringblockNumber;
19+
privatelong_blockNumber;
1520
privateStringaddress;
1621
privateStringtransactionHash;
1722
privateStringtransactionIndex;
23+
privatelong_transactionIndex;
1824
privateStringtimeStamp;
1925
privateLocalDateTime_timeStamp;
2026
privateStringdata;
2127
privateStringgasPrice;
28+
privateBigInteger_gasPrice;
2229
privateStringgasUsed;
30+
privateBigInteger_gasUsed;
2331
privateList<String>topics;
2432
privateStringlogIndex;
25-
26-
publicLog() { }
27-
28-
publicLog(StringblockNumber,Stringaddress,StringtransactionHash,StringtransactionIndex,
29-
LocalDateTime_timeStamp,Stringdata,StringgasPrice,StringgasUsed,
30-
List<String>topics,StringlogIndex) {
31-
this.blockNumber =blockNumber;
32-
this.address =address;
33-
this.transactionHash =transactionHash;
34-
this.transactionIndex =transactionIndex;
35-
this._timeStamp =_timeStamp;
36-
this.data =data;
37-
this.gasPrice =gasPrice;
38-
this.gasUsed =gasUsed;
39-
this.topics =topics;
40-
this.logIndex =logIndex;
41-
}
33+
privatelong_logIndex;
4234

4335
//<editor-fold desc="Getters">
44-
publicStringgetBlockNumber() {
45-
returnblockNumber;
36+
publiclonggetBlockNumber() {
37+
if(!BasicUtils.isEmpty(blockNumber)){
38+
_blockNumber =BasicUtils.parseHex(blockNumber).longValue();
39+
}
40+
return_blockNumber;
4641
}
4742

4843
publicStringgetAddress() {
@@ -53,36 +48,53 @@ public String getTransactionHash() {
5348
returntransactionHash;
5449
}
5550

56-
publicStringgetTransactionIndex() {
57-
returntransactionIndex;
58-
}
51+
publiclonggetTransactionIndex() {
52+
if(!BasicUtils.isEmpty(transactionIndex)){
53+
_transactionIndex =BasicUtils.parseHex(transactionIndex).longValue();
54+
}
5955

60-
publicStringgetTimeStamp() {
61-
returntimeStamp;
56+
return_transactionIndex;
6257
}
6358

64-
publicLocalDateTimeget_timeStamp() {
59+
publicLocalDateTimegetTimeStamp() {
60+
if(_timeStamp ==null && !BasicUtils.isEmpty(timeStamp)) {
61+
longformatted = (timeStamp.charAt(0) =='0' &&timeStamp.charAt(1) =='x')
62+
?BasicUtils.parseHex(timeStamp).longValue()
63+
:Long.valueOf(timeStamp);
64+
_timeStamp =LocalDateTime.ofEpochSecond(formatted,0,ZoneOffset.UTC);
65+
}
6566
return_timeStamp;
6667
}
6768

6869
publicStringgetData() {
6970
returndata;
7071
}
7172

72-
publicStringgetGasPrice() {
73-
returngasPrice;
73+
publicBigIntegergetGasPrice() {
74+
if(!BasicUtils.isEmpty(gasPrice)){
75+
_gasPrice =BasicUtils.parseHex(gasPrice);
76+
}
77+
78+
return_gasPrice;
7479
}
7580

76-
publicStringgetGasUsed() {
77-
returngasUsed;
81+
publicBigIntegergetGasUsed() {
82+
if(!BasicUtils.isEmpty(gasUsed)){
83+
_gasUsed =BasicUtils.parseHex(gasUsed);
84+
}
85+
86+
return_gasUsed;
7887
}
7988

8089
publicList<String>getTopics() {
8190
returntopics;
8291
}
8392

84-
publicStringgetLogIndex() {
85-
returnlogIndex;
93+
publiclonggetLogIndex() {
94+
if(!BasicUtils.isEmpty(logIndex)){
95+
_logIndex =BasicUtils.parseHex(logIndex).longValue();
96+
}
97+
return_logIndex;
8698
}
8799
//</editor-fold>
88100
}

‎src/main/java/io/api/etherscan/model/Tx.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
importio.api.etherscan.util.BasicUtils;
44

5+
importjava.math.BigInteger;
6+
57
/**
68
* ! NO DESCRIPTION !
79
*
@@ -13,8 +15,8 @@ public class Tx extends BaseTx {
1315
privatelongnonce;
1416
privateStringblockHash;
1517
privateinttransactionIndex;
16-
privatelonggasPrice;
17-
privatelongcumulativeGasUsed;
18+
privateBigIntegergasPrice;
19+
privateBigIntegercumulativeGasUsed;
1820
privatelongconfirmations;
1921
privateStringisError;
2022
privateStringtxreceipt_status;
@@ -32,7 +34,7 @@ public int getTransactionIndex() {
3234
returntransactionIndex;
3335
}
3436

35-
publiclonggetGasPrice() {
37+
publicBigIntegergetGasPrice() {
3638
returngasPrice;
3739
}
3840

@@ -44,7 +46,7 @@ public String getTxreceipt_status() {
4446
returntxreceipt_status;
4547
}
4648

47-
publiclonggetCumulativeGasUsed() {
49+
publicBigIntegergetCumulativeGasUsed() {
4850
returncumulativeGasUsed;
4951
}
5052

‎src/main/java/io/api/etherscan/model/Uncle.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@ public class Uncle {
1414
privateBigIntegerblockreward;
1515
privateintunclePosition;
1616

17-
publicUncle() {}
18-
19-
publicUncle(Stringminer,BigIntegerblockreward,intunclePosition) {
20-
this.miner =miner;
21-
this.blockreward =blockreward;
22-
this.unclePosition =unclePosition;
23-
}
24-
2517
//<editor-fold desc="Getters">
2618
publicStringgetMiner() {
2719
returnminer;

‎src/main/java/io/api/etherscan/model/proxy/LogProxy.java‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp