Skip to content

Commit 0cafb6d

Browse files
GoodforGodGoodforGod
committed
[2.0.0-SNAPSHOT]
TxErc1155 added AccountAPI#txsErc1155 added AccountAPI#txsErc721 with contract added
1 parent 192cb5b commit 0cafb6d

18 files changed

+577
-156
lines changed

‎src/main/java/io/goodforgod/api/etherscan/AccountAPI.java‎

Lines changed: 63 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ public interface AccountAPI {
101101
* @throws EtherScanException parent exception class
102102
*/
103103
@NotNull
104-
List<TxERC20> txsERC20(String address, long startBlock, long endBlock) throws EtherScanException;
104+
List<TxErc20> txsErc20(String address, long startBlock, long endBlock) throws EtherScanException;
105105

106106
@NotNull
107-
List<TxERC20> txsERC20(String address, long startBlock) throws EtherScanException;
107+
List<TxErc20> txsErc20(String address, long startBlock) throws EtherScanException;
108108

109109
@NotNull
110-
List<TxERC20> txsERC20(String address) throws EtherScanException;
110+
List<TxErc20> txsErc20(String address) throws EtherScanException;
111111

112112
/**
113113
* All ERC-20 token txs for given address and contract address
@@ -120,13 +120,13 @@ public interface AccountAPI {
120120
* @throws EtherScanException parent exception class
121121
*/
122122
@NotNull
123-
List<TxERC20> txsERC20(String address, String contractAddress, long startBlock, long endBlock) throws EtherScanException;
123+
List<TxErc20> txsErc20(String address, String contractAddress, long startBlock, long endBlock) throws EtherScanException;
124124

125125
@NotNull
126-
List<TxERC20> txsERC20(String address, String contractAddress, long startBlock) throws EtherScanException;
126+
List<TxErc20> txsErc20(String address, String contractAddress, long startBlock) throws EtherScanException;
127127

128128
@NotNull
129-
List<TxERC20> txsERC20(String address, String contractAddress) throws EtherScanException;
129+
List<TxErc20> txsErc20(String address, String contractAddress) throws EtherScanException;
130130

131131
/**
132132
* All ERC-721 (NFT) token txs for given address
@@ -138,13 +138,67 @@ public interface AccountAPI {
138138
* @throws EtherScanException parent exception class
139139
*/
140140
@NotNull
141-
List<TxERC721> txsERC721(String address, long startBlock, long endBlock) throws EtherScanException;
141+
List<TxErc721> txsErc721(String address, long startBlock, long endBlock) throws EtherScanException;
142142

143143
@NotNull
144-
List<TxERC721> txsERC721(String address, long startBlock) throws EtherScanException;
144+
List<TxErc721> txsErc721(String address, long startBlock) throws EtherScanException;
145145

146146
@NotNull
147-
List<TxERC721> txsERC721(String address) throws EtherScanException;
147+
List<TxErc721> txsErc721(String address) throws EtherScanException;
148+
149+
/**
150+
* All ERC-721 (NFT) token txs for given address
151+
*
152+
* @param address get txs for
153+
* @param startBlock tx from this blockNumber
154+
* @param endBlock tx to this blockNumber
155+
* @return txs for address
156+
* @throws EtherScanException parent exception class
157+
*/
158+
@NotNull
159+
List<TxErc721> txsErc721(String address, String contractAddress, long startBlock, long endBlock) throws EtherScanException;
160+
161+
@NotNull
162+
List<TxErc721> txsErc721(String address, String contractAddress, long startBlock) throws EtherScanException;
163+
164+
@NotNull
165+
List<TxErc721> txsErc721(String address, String contractAddress) throws EtherScanException;
166+
167+
/**
168+
* All ERC-721 (NFT) token txs for given address
169+
*
170+
* @param address get txs for
171+
* @param startBlock tx from this blockNumber
172+
* @param endBlock tx to this blockNumber
173+
* @return txs for address
174+
* @throws EtherScanException parent exception class
175+
*/
176+
@NotNull
177+
List<TxErc1155> txsErc1155(String address, long startBlock, long endBlock) throws EtherScanException;
178+
179+
@NotNull
180+
List<TxErc1155> txsErc1155(String address, long startBlock) throws EtherScanException;
181+
182+
@NotNull
183+
List<TxErc1155> txsErc1155(String address) throws EtherScanException;
184+
185+
/**
186+
* All ERC-721 (NFT) token txs for given address
187+
*
188+
* @param address get txs for
189+
* @param startBlock tx from this blockNumber
190+
* @param endBlock tx to this blockNumber
191+
* @return txs for address
192+
* @throws EtherScanException parent exception class
193+
*/
194+
@NotNull
195+
List<TxErc1155> txsErc1155(String address, String contractAddress, long startBlock, long endBlock) throws EtherScanException;
196+
197+
@NotNull
198+
List<TxErc1155> txsErc1155(String address, String contractAddress, long startBlock) throws EtherScanException;
199+
200+
@NotNull
201+
List<TxErc1155> txsErc1155(String address, String contractAddress) throws EtherScanException;
148202

149203
/**
150204
* All blocks mined by address

‎src/main/java/io/goodforgod/api/etherscan/AccountAPIProvider.java‎

Lines changed: 97 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ final class AccountAPIProvider extends BasicProvider implements AccountAPI {
3030
private static final String ACT_BALANCE_MULTI_ACTION = ACT_PREFIX + "balancemulti";
3131
private static final String ACT_TX_ACTION = ACT_PREFIX + "txlist";
3232
private static final String ACT_TX_INTERNAL_ACTION = ACT_PREFIX + "txlistinternal";
33-
private static final String ACT_TX_TOKEN_ACTION = ACT_PREFIX + "tokentx";
34-
private static final String ACT_TX_NFT_TOKEN_ACTION = ACT_PREFIX + "tokennfttx";
33+
private static final String ACT_TX_ERC20_ACTION = ACT_PREFIX + "tokentx";
34+
private static final String ACT_TX_ERC721_ACTION = ACT_PREFIX + "tokennfttx";
35+
private static final String ACT_TX_ERC1155_ACTION = ACT_PREFIX + "token1155tx";
3536
private static final String ACT_MINED_ACTION = ACT_PREFIX + "getminedblocks";
3637

3738
private static final String BLOCK_TYPE_PARAM = "&blocktype=blocks";
@@ -145,8 +146,7 @@ public List<Tx> txs(String address, long startBlock, long endBlock) throws Ether
145146
* @param <R> responseListTO type
146147
* @return List of T values
147148
*/
148-
private <T, R extends BaseListResponseTO> List<T> getRequestUsingOffset(final String urlParams,
149-
Class<R> tClass)
149+
private <T, R extends BaseListResponseTO<T>> List<T> getRequestUsingOffset(final String urlParams, Class<R> tClass)
150150
throws EtherScanException {
151151
final List<T> result = new ArrayList<>();
152152
int page = 1;
@@ -208,81 +208,153 @@ public List<TxInternal> txsInternalByHash(String txhash) throws EtherScanExcepti
208208

209209
@NotNull
210210
@Override
211-
public List<TxERC20> txsERC20(String address) throws EtherScanException {
212-
return txsERC20(address, MIN_START_BLOCK);
211+
public List<TxErc20> txsErc20(String address) throws EtherScanException {
212+
return txsErc20(address, MIN_START_BLOCK);
213213
}
214214

215215
@NotNull
216216
@Override
217-
public List<TxERC20> txsERC20(String address, long startBlock) throws EtherScanException {
218-
return txsERC20(address, startBlock, MAX_END_BLOCK);
217+
public List<TxErc20> txsErc20(String address, long startBlock) throws EtherScanException {
218+
return txsErc20(address, startBlock, MAX_END_BLOCK);
219219
}
220220

221221
@NotNull
222222
@Override
223-
public List<TxERC20> txsERC20(String address, long startBlock, long endBlock) throws EtherScanException {
223+
public List<TxErc20> txsErc20(String address, long startBlock, long endBlock) throws EtherScanException {
224224
BasicUtils.validateAddress(address);
225225
final BlockParam blocks = BasicUtils.compensateBlocks(startBlock, endBlock);
226226

227-
final String urlParams = ACT_TX_TOKEN_ACTION + PAGE_PARAM + "%s" + OFFSET_PARAM + OFFSET_MAX
227+
final String urlParams = ACT_TX_ERC20_ACTION + PAGE_PARAM + "%s" + OFFSET_PARAM + OFFSET_MAX
228228
+ ADDRESS_PARAM + address
229229
+ START_BLOCK_PARAM + blocks.start() + END_BLOCK_PARAM + blocks.end()
230230
+ SORT_ASC_PARAM;
231231

232-
return getRequestUsingOffset(urlParams, TxERC20ResponseTO.class);
232+
return getRequestUsingOffset(urlParams, TxErc20ResponseTO.class);
233233
}
234234

235235
@NotNull
236236
@Override
237-
public List<TxERC20> txsERC20(String address, String contractAddress) throws EtherScanException {
238-
return txsERC20(address, contractAddress, MIN_START_BLOCK);
237+
public List<TxErc20> txsErc20(String address, String contractAddress) throws EtherScanException {
238+
return txsErc20(address, contractAddress, MIN_START_BLOCK);
239239
}
240240

241241
@NotNull
242242
@Override
243-
public List<TxERC20> txsERC20(String address, String contractAddress, long startBlock) throws EtherScanException {
244-
return txsERC20(address, contractAddress, startBlock, MAX_END_BLOCK);
243+
public List<TxErc20> txsErc20(String address, String contractAddress, long startBlock) throws EtherScanException {
244+
return txsErc20(address, contractAddress, startBlock, MAX_END_BLOCK);
245245
}
246246

247247
@NotNull
248248
@Override
249-
public List<TxERC20> txsERC20(String address, String contractAddress, long startBlock, long endBlock)
249+
public List<TxErc20> txsErc20(String address, String contractAddress, long startBlock, long endBlock)
250250
throws EtherScanException {
251251
BasicUtils.validateAddress(address);
252252
final BlockParam blocks = BasicUtils.compensateBlocks(startBlock, endBlock);
253253

254254
final String offsetParam = PAGE_PARAM + "%s" + OFFSET_PARAM + OFFSET_MAX;
255255
final String blockParam = START_BLOCK_PARAM + blocks.start() + END_BLOCK_PARAM + blocks.end();
256-
final String urlParams = ACT_TX_TOKEN_ACTION + offsetParam + ADDRESS_PARAM + address
256+
final String urlParams = ACT_TX_ERC20_ACTION + offsetParam + ADDRESS_PARAM + address
257257
+ CONTRACT_PARAM + contractAddress + blockParam + SORT_ASC_PARAM;
258258

259-
return getRequestUsingOffset(urlParams, TxERC20ResponseTO.class);
259+
return getRequestUsingOffset(urlParams, TxErc20ResponseTO.class);
260260
}
261261

262262
@NotNull
263263
@Override
264-
public List<TxERC721> txsERC721(String address) throws EtherScanException {
265-
return txsERC721(address, MIN_START_BLOCK);
264+
public List<TxErc721> txsErc721(String address) throws EtherScanException {
265+
return txsErc721(address, MIN_START_BLOCK);
266266
}
267267

268268
@NotNull
269269
@Override
270-
public List<TxERC721> txsERC721(String address, long startBlock) throws EtherScanException {
271-
return txsERC721(address, startBlock, MAX_END_BLOCK);
270+
public List<TxErc721> txsErc721(String address, long startBlock) throws EtherScanException {
271+
return txsErc721(address, startBlock, MAX_END_BLOCK);
272272
}
273273

274274
@NotNull
275275
@Override
276-
public List<TxERC721> txsERC721(String address, long startBlock, long endBlock) throws EtherScanException {
276+
public List<TxErc721> txsErc721(String address, long startBlock, long endBlock) throws EtherScanException {
277277
BasicUtils.validateAddress(address);
278278
final BlockParam blocks = BasicUtils.compensateBlocks(startBlock, endBlock);
279279

280-
final String urlParams = ACT_TX_NFT_TOKEN_ACTION + PAGE_PARAM + "%s" + OFFSET_PARAM + OFFSET_MAX
280+
final String urlParams = ACT_TX_ERC721_ACTION + PAGE_PARAM + "%s" + OFFSET_PARAM + OFFSET_MAX
281281
+ ADDRESS_PARAM + address
282282
+ START_BLOCK_PARAM + blocks.start() + END_BLOCK_PARAM + blocks.end()
283283
+ SORT_ASC_PARAM;
284284

285-
return getRequestUsingOffset(urlParams, TxERC20ResponseTO.class);
285+
return getRequestUsingOffset(urlParams, TxErc721ResponseTO.class);
286+
}
287+
288+
@Override
289+
public @NotNull List<TxErc721> txsErc721(String address, String contractAddress, long startBlock, long endBlock)
290+
throws EtherScanException {
291+
BasicUtils.validateAddress(address);
292+
final BlockParam blocks = BasicUtils.compensateBlocks(startBlock, endBlock);
293+
294+
final String offsetParam = PAGE_PARAM + "%s" + OFFSET_PARAM + OFFSET_MAX;
295+
final String blockParam = START_BLOCK_PARAM + blocks.start() + END_BLOCK_PARAM + blocks.end();
296+
final String urlParams = ACT_TX_ERC721_ACTION + offsetParam + ADDRESS_PARAM + address
297+
+ CONTRACT_PARAM + contractAddress + blockParam + SORT_ASC_PARAM;
298+
299+
return getRequestUsingOffset(urlParams, TxErc721ResponseTO.class);
300+
}
301+
302+
@Override
303+
public @NotNull List<TxErc721> txsErc721(String address, String contractAddress, long startBlock) throws EtherScanException {
304+
return txsErc721(address, contractAddress, startBlock, MAX_END_BLOCK);
305+
}
306+
307+
@Override
308+
public @NotNull List<TxErc721> txsErc721(String address, String contractAddress) throws EtherScanException {
309+
return txsErc721(address, contractAddress, MIN_START_BLOCK);
310+
}
311+
312+
@Override
313+
public @NotNull List<TxErc1155> txsErc1155(String address, long startBlock, long endBlock) throws EtherScanException {
314+
BasicUtils.validateAddress(address);
315+
final BlockParam blocks = BasicUtils.compensateBlocks(startBlock, endBlock);
316+
317+
final String urlParams = ACT_TX_ERC1155_ACTION + PAGE_PARAM + "%s" + OFFSET_PARAM + OFFSET_MAX
318+
+ ADDRESS_PARAM + address
319+
+ START_BLOCK_PARAM + blocks.start() + END_BLOCK_PARAM + blocks.end()
320+
+ SORT_ASC_PARAM;
321+
322+
return getRequestUsingOffset(urlParams, TxErc1155ResponseTO.class);
323+
}
324+
325+
@Override
326+
public @NotNull List<TxErc1155> txsErc1155(String address, long startBlock) throws EtherScanException {
327+
return txsErc1155(address, startBlock, MAX_END_BLOCK);
328+
}
329+
330+
@Override
331+
public @NotNull List<TxErc1155> txsErc1155(String address) throws EtherScanException {
332+
return txsErc1155(address, MIN_START_BLOCK);
333+
}
334+
335+
@Override
336+
public @NotNull List<TxErc1155> txsErc1155(String address, String contractAddress, long startBlock, long endBlock)
337+
throws EtherScanException {
338+
BasicUtils.validateAddress(address);
339+
final BlockParam blocks = BasicUtils.compensateBlocks(startBlock, endBlock);
340+
341+
final String offsetParam = PAGE_PARAM + "%s" + OFFSET_PARAM + OFFSET_MAX;
342+
final String blockParam = START_BLOCK_PARAM + blocks.start() + END_BLOCK_PARAM + blocks.end();
343+
final String urlParams = ACT_TX_ERC1155_ACTION + offsetParam + ADDRESS_PARAM + address
344+
+ CONTRACT_PARAM + contractAddress + blockParam + SORT_ASC_PARAM;
345+
346+
return getRequestUsingOffset(urlParams, TxErc1155ResponseTO.class);
347+
}
348+
349+
@Override
350+
public @NotNull List<TxErc1155> txsErc1155(String address, String contractAddress, long startBlock)
351+
throws EtherScanException {
352+
return txsErc1155(address, contractAddress, startBlock, MAX_END_BLOCK);
353+
}
354+
355+
@Override
356+
public @NotNull List<TxErc1155> txsErc1155(String address, String contractAddress) throws EtherScanException {
357+
return txsErc1155(address, contractAddress, MIN_START_BLOCK);
286358
}
287359

288360
@NotNull

‎src/main/java/io/goodforgod/api/etherscan/EthNetwork.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
*/
1010
public interface EthNetwork {
1111

12+
/**
13+
* @return URI for network domain like <a href="https://api.etherscan.io/api">EtherScan API</a>
14+
*/
1215
@NotNull
1316
URI domain();
1417
}

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

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ abstract class BaseTx {
2020
String hash;
2121
String from;
2222
String to;
23-
BigInteger value;
2423
String contractAddress;
2524
String input;
2625
BigInteger gas;
@@ -49,10 +48,6 @@ public String getTo() {
4948
return to;
5049
}
5150

52-
public BigInteger getValue() {
53-
return value;
54-
}
55-
5651
public String getContractAddress() {
5752
return contractAddress;
5853
}
@@ -76,41 +71,16 @@ public boolean equals(Object o) {
7671
return true;
7772
if (!(o instanceof BaseTx))
7873
return false;
79-
8074
BaseTx baseTx = (BaseTx) o;
81-
82-
if (blockNumber != baseTx.blockNumber)
83-
return false;
84-
if (!Objects.equals(timeStamp, baseTx.timeStamp))
85-
return false;
86-
if (!Objects.equals(hash, baseTx.hash))
87-
return false;
88-
if (!Objects.equals(from, baseTx.from))
89-
return false;
90-
if (!Objects.equals(to, baseTx.to))
91-
return false;
92-
return Objects.equals(value, baseTx.value);
75+
return blockNumber == baseTx.blockNumber && Objects.equals(timeStamp, baseTx.timeStamp)
76+
&& Objects.equals(hash, baseTx.hash) && Objects.equals(from, baseTx.from) && Objects.equals(to, baseTx.to)
77+
&& Objects.equals(contractAddress, baseTx.contractAddress) && Objects.equals(input, baseTx.input)
78+
&& Objects.equals(gas, baseTx.gas) && Objects.equals(gasUsed, baseTx.gasUsed);
9379
}
9480

9581
@Override
9682
public int hashCode() {
97-
int result = (int) (blockNumber ^ (blockNumber >>> 32));
98-
result = 31 * result + (timeStamp != null
99-
? timeStamp.hashCode()
100-
: 0);
101-
result = 31 * result + (hash != null
102-
? hash.hashCode()
103-
: 0);
104-
result = 31 * result + (from != null
105-
? from.hashCode()
106-
: 0);
107-
result = 31 * result + (to != null
108-
? to.hashCode()
109-
: 0);
110-
result = 31 * result + (value != null
111-
? value.hashCode()
112-
: 0);
113-
return result;
83+
return Objects.hash(blockNumber, timeStamp, hash, from, to, contractAddress, input, gas, gasUsed);
11484
}
11585

11686
@Override
@@ -121,7 +91,6 @@ public String toString() {
12191
", hash='" + hash + '\'' +
12292
", from='" + from + '\'' +
12393
", to='" + to + '\'' +
124-
", value=" + value +
12594
", contractAddress='" + contractAddress + '\'' +
12695
", input='" + input + '\'' +
12796
", gas=" + gas +

0 commit comments

Comments
 (0)