Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/aionnetwork/aion into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@apalissery
apalissery committed Mar 2, 2018
2 parents f99bd94 + 80c594c commit a513cd9
Show file tree
Hide file tree
Showing 7 changed files with 658 additions and 379 deletions.
5 changes: 0 additions & 5 deletions modAionImpl/src/org/aion/equihash/EquiValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,6 @@ public boolean isValidSolution(byte[] solution, byte[] blockHeader, byte[] nonce
return false;
}

// blake instance can be reused inside 512 indiecs loop.
// it save both blake and initState mem cost.
// if use blake in Equivalidator instance level, as it's multi-threaded,
// have to pay a lock cost.
// so still keep it in function level.
Blake2b blake = Blake2b.Digest.newInstance(initState);

// Create array with 2^k slots
Expand Down
139 changes: 74 additions & 65 deletions modApiServer/src/org/aion/api/server/pb/ApiAion0.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.aion.zero.impl.blockchain.IAionChain;
import org.aion.zero.impl.types.AionBlock;
import org.aion.zero.impl.types.AionBlockSummary;
import org.aion.zero.impl.types.AionTxInfo;
import org.aion.zero.types.AionTransaction;
import org.aion.zero.types.AionTxReceipt;
import org.json.JSONArray;
Expand Down Expand Up @@ -1235,17 +1236,15 @@ public byte[] process(byte[] request, byte[] socketId) {

try {
req = Message.req_getBlockDetailsByNumber.parseFrom(data);
List<Long> num = req.getBlkNumbersList().parallelStream()
List<Long> blkNum = req.getBlkNumbersList().parallelStream()
.collect(Collectors.toSet()).parallelStream()
.sorted().collect(Collectors.toList());

if (num.size() > 1000) {
num = num.subList(0, 1000);
if (blkNum.size() > 1000) {
blkNum = blkNum.subList(0, 1000);
}

List<Map.Entry<AionBlock, BigInteger>> blks =
num.parallelStream().filter(n -> this.getBlock(n)!= null).map(n -> Map.entry(this.getBlock(n), this.ac.getBlockchain().getTotalDifficultyByHash(
Hash256.wrap(this.getBlock(n).getHash())))).collect(Collectors.toList());
List<Map.Entry<AionBlock, BigInteger>> blks = getBlkAndDifficultyForBlkNumList(blkNum);

if (blks == null) {
return ApiUtil.toReturnHeader(getApiVersion(), Message.Retcode.r_fail_function_arguments_VALUE);
Expand Down Expand Up @@ -1286,16 +1285,10 @@ public byte[] process(byte[] request, byte[] socketId) {
Long endBlock = this.getBestBlock().getNumber();
Long startBlock = (endBlock - count + 1) >= 0 ? (endBlock - count + 1) : 0;

List<Long> numbers = LongStream.rangeClosed(startBlock, endBlock)
List<Long> blkNum = LongStream.rangeClosed(startBlock, endBlock)
.boxed().collect(Collectors.toList());

List<Map.Entry<AionBlock, BigInteger>> blks =
numbers.parallelStream()
.filter(n -> this.getBlock(n)!= null)
.map(n -> Map.entry(this.getBlock(n),
this.ac.getBlockchain().getTotalDifficultyByHash(
Hash256.wrap(this.getBlock(n).getHash()))))
.collect(Collectors.toList());
List<Map.Entry<AionBlock, BigInteger>> blks = getBlkAndDifficultyForBlkNumList(blkNum);

if (blks == null) {
return ApiUtil.toReturnHeader(getApiVersion(), Message.Retcode.r_fail_function_arguments_VALUE);
Expand Down Expand Up @@ -1334,16 +1327,10 @@ public byte[] process(byte[] request, byte[] socketId) {
Long endBlock = this.getBestBlock().getNumber();
Long startBlock = (endBlock - count + 1) >= 0 ? (endBlock - count + 1) : 0;

List<Long> numbers = LongStream.rangeClosed(startBlock, endBlock)
List<Long> blkNum = LongStream.rangeClosed(startBlock, endBlock)
.boxed().collect(Collectors.toList());

List<Map.Entry<AionBlock, BigInteger>> blks =
numbers.parallelStream()
.filter(n -> this.getBlock(n)!= null)
.map(n -> Map.entry(this.getBlock(n),
this.ac.getBlockchain().getTotalDifficultyByHash(
Hash256.wrap(this.getBlock(n).getHash()))))
.collect(Collectors.toList());
List<Map.Entry<AionBlock, BigInteger>> blks = getBlkAndDifficultyForBlkNumList(blkNum);

if (blks == null) {
return ApiUtil.toReturnHeader(getApiVersion(), Message.Retcode.r_fail_function_arguments_VALUE);
Expand Down Expand Up @@ -1476,23 +1463,25 @@ private List<Message.t_Block> getRsp_getBlocks(List<Map.Entry<AionBlock, BigInte
List<Message.t_Block> bs = blks.parallelStream()
.filter(Objects::nonNull)
.map(blk -> {
AionBlock b = blk.getKey();

return Message.t_Block.newBuilder()
.setBlockNumber(blk.getKey().getNumber())
.setDifficulty(ByteString.copyFrom(blk.getKey().getDifficulty()))
.setExtraData(ByteString.copyFrom(blk.getKey().getExtraData()))
.setHash(ByteString.copyFrom(blk.getKey().getHash()))
.setLogsBloom(ByteString.copyFrom(blk.getKey().getLogBloom()))
.setMinerAddress(ByteString.copyFrom(blk.getKey().getCoinbase().toBytes()))
.setNonce(ByteString.copyFrom(blk.getKey().getNonce()))
.setNrgConsumed(blk.getKey().getNrgConsumed())
.setNrgLimit(blk.getKey().getNrgLimit())
.setParentHash(ByteString.copyFrom(blk.getKey().getParentHash()))
.setTimestamp(blk.getKey().getTimestamp())
.setTxTrieRoot(ByteString.copyFrom(blk.getKey().getTxTrieRoot()))
.setReceiptTrieRoot(ByteString.copyFrom(blk.getKey().getReceiptsRoot()))
.setStateRoot(ByteString.copyFrom(blk.getKey().getStateRoot()))
.setSize(blk.getKey().getEncoded().length)
.setSolution(ByteString.copyFrom(blk.getKey().getHeader().getSolution()))
.setBlockNumber(b.getNumber())
.setDifficulty(ByteString.copyFrom(b.getDifficulty()))
.setExtraData(ByteString.copyFrom(b.getExtraData()))
.setHash(ByteString.copyFrom(b.getHash()))
.setLogsBloom(ByteString.copyFrom(b.getLogBloom()))
.setMinerAddress(ByteString.copyFrom(b.getCoinbase().toBytes()))
.setNonce(ByteString.copyFrom(b.getNonce()))
.setNrgConsumed(b.getNrgConsumed())
.setNrgLimit(b.getNrgLimit())
.setParentHash(ByteString.copyFrom(b.getParentHash()))
.setTimestamp(b.getTimestamp())
.setTxTrieRoot(ByteString.copyFrom(b.getTxTrieRoot()))
.setReceiptTrieRoot(ByteString.copyFrom(b.getReceiptsRoot()))
.setStateRoot(ByteString.copyFrom(b.getStateRoot()))
.setSize(b.getEncoded().length)
.setSolution(ByteString.copyFrom(b.getHeader().getSolution()))
.setTotalDifficulty(ByteString.copyFrom(blk.getValue().toByteArray()))
.build();
}).collect(Collectors.toList());
Expand All @@ -1502,36 +1491,45 @@ private List<Message.t_Block> getRsp_getBlocks(List<Map.Entry<AionBlock, BigInte

private List<Message.t_BlockDetail> getRsp_getBlockDetails(List<Map.Entry<AionBlock, BigInteger>> blks) {
List<Message.t_BlockDetail> bds = blks.parallelStream().filter(Objects::nonNull).map(blk -> {

AionBlock b = blk.getKey();
Message.t_BlockDetail.Builder builder = Message.t_BlockDetail.newBuilder()
.setBlockNumber(blk.getKey().getNumber())
.setDifficulty(ByteString.copyFrom(blk.getKey().getDifficulty()))
.setExtraData(ByteString.copyFrom(blk.getKey().getExtraData()))
.setHash(ByteString.copyFrom(blk.getKey().getHash()))
.setLogsBloom(ByteString.copyFrom(blk.getKey().getLogBloom()))
.setMinerAddress(ByteString.copyFrom(blk.getKey().getCoinbase().toBytes()))
.setNonce(ByteString.copyFrom(blk.getKey().getNonce()))
.setNrgConsumed(blk.getKey().getNrgConsumed())
.setNrgLimit(blk.getKey().getNrgLimit())
.setParentHash(ByteString.copyFrom(blk.getKey().getParentHash()))
.setTimestamp(blk.getKey().getTimestamp())
.setTxTrieRoot(ByteString.copyFrom(blk.getKey().getTxTrieRoot()))
.setReceiptTrieRoot(ByteString.copyFrom(blk.getKey().getReceiptsRoot()))
.setStateRoot(ByteString.copyFrom(blk.getKey().getStateRoot()))
.setSize(blk.getKey().getEncoded().length)
.setSolution(ByteString.copyFrom(blk.getKey().getHeader().getSolution()))
.setBlockNumber(b.getNumber())
.setDifficulty(ByteString.copyFrom(b.getDifficulty()))
.setExtraData(ByteString.copyFrom(b.getExtraData()))
.setHash(ByteString.copyFrom(b.getHash()))
.setLogsBloom(ByteString.copyFrom(b.getLogBloom()))
.setMinerAddress(ByteString.copyFrom(b.getCoinbase().toBytes()))
.setNonce(ByteString.copyFrom(b.getNonce()))
.setNrgConsumed(b.getNrgConsumed())
.setNrgLimit(b.getNrgLimit())
.setParentHash(ByteString.copyFrom(b.getParentHash()))
.setTimestamp(b.getTimestamp())
.setTxTrieRoot(ByteString.copyFrom(b.getTxTrieRoot()))
.setReceiptTrieRoot(ByteString.copyFrom(b.getReceiptsRoot()))
.setStateRoot(ByteString.copyFrom(b.getStateRoot()))
.setSize(b.getEncoded().length)
.setSolution(ByteString.copyFrom(b.getHeader().getSolution()))
.setTotalDifficulty(ByteString.copyFrom(blk.getValue().toByteArray()));

List<AionTransaction> txs = blk.getKey().getTransactionsList();
List<AionTransaction> txs = b.getTransactionsList();

List<Message.t_TxDetail> tds = txs.parallelStream().filter(Objects::nonNull).map(tx -> {
TxRecpt rt = this.getTransactionReceipt(tx.getHash());
List<Message.t_TxDetail> tds = new ArrayList<>();
long cumulativeNrg = 0L;

List<Message.t_LgEle> tles = Arrays.asList(rt.logs).parallelStream().map(log -> Message.t_LgEle.newBuilder()
.setData(ByteString.copyFrom(ByteUtil.hexStringToBytes(log.data)))
.setAddress(ByteString.copyFrom(Address.wrap(log.address).toBytes()))
.addAllTopics(Arrays.asList(log.topics))
.build()).filter(Objects::nonNull).collect(Collectors.toList());
// Can't use parallel streams here since we need to compute cumulativeNrg, which is done iteratively
for (AionTransaction tx : txs) {
AionTxInfo ti = this.ac.getAionHub().getBlockchain().getTransactionInfo(tx.getHash());
cumulativeNrg += ti.getReceipt().getEnergyUsed();
TxRecpt rt = new TxRecpt(b, ti, cumulativeNrg);

List<Message.t_LgEle> tles = Arrays.asList(rt.logs).parallelStream()
.map(log -> {
return Message.t_LgEle.newBuilder()
.setData(ByteString.copyFrom(ByteUtil.hexStringToBytes(log.data)))
.setAddress(ByteString.copyFrom(Address.wrap(log.address).toBytes()))
.addAllTopics(Arrays.asList(log.topics))
.build();
}).filter(Objects::nonNull).collect(Collectors.toList());

Message.t_TxDetail.Builder tdBuilder = Message.t_TxDetail.newBuilder()
.setData(ByteString.copyFrom(tx.getData()))
Expand All @@ -1549,15 +1547,26 @@ private List<Message.t_BlockDetail> getRsp_getBlockDetails(List<Map.Entry<AionBl
tdBuilder.setContract(ByteString.copyFrom(ByteUtil.hexStringToBytes(rt.contractAddress)));

Message.t_TxDetail td = tdBuilder.build();
return td;
}).collect(Collectors.toList());
tds.add(td);
}

return builder.addAllTx(tds).build();
}).filter(Objects::nonNull).collect(Collectors.toList());

return bds;
}

// all or nothing. if any block from list is not found, unchecked exception gets thrown by Map.entry()
// causes this function to return in Exception
private List<Map.Entry<AionBlock, BigInteger>> getBlkAndDifficultyForBlkNumList(List<Long> blkNum) {
return blkNum.parallelStream()
.map(n -> {
AionBlock b = this.getBlock(n);
return Map.entry(b, this.ac.getAionHub().getBlockStore().getTotalDifficultyForHash(b.getHash()));
})
.collect(Collectors.toList());
}

@Override
public byte getApiVersion() {
return JAVAAPI_VAR;
Expand Down
Loading

0 comments on commit a513cd9

Please sign in to comment.