Skip to content

Commit

Permalink
Update handleOep5TransferTxn
Browse files Browse the repository at this point in the history
  • Loading branch information
@leej1012
leej1012 committed Jul 11, 2023
1 parent fd164b9 commit 94a6cfd
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 86 deletions.
87 changes: 44 additions & 43 deletions back-end-projects/OntSynHandler/src/main/java/com/github/ontio/thread/TxHandlerThread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1017,76 +1017,77 @@ private void handleOep5TransferTxn(JSONArray stateArray, int txType, String txHa
} catch (Exception e) {
action = (String) stateArray.get(0);
}
//只解析birth和transfer合约方法
if (!(action.equalsIgnoreCase("transfer") || action.equalsIgnoreCase("birth"))) {
TxDetail txDetail = generateTransaction("", "", "", ConstantParam.ZERO, txType, txHash, blockHeight,
blockTime, indexInBlock, confirmFlag, action, gasConsumed, indexInTx, EventTypeEnum.Others.type(), contractAddress, payer, calledContractHash);

ConstantParam.BATCHBLOCKDTO.getTxDetails().add(txDetail);
ConstantParam.BATCHBLOCKDTO.getTxDetailDailys().add(TxDetail.toTxDetailDaily(txDetail));
ConstantParam.BATCHBLOCKDTO.getOep5TxDetails().add(TxDetail.toOep5TxDetail(txDetail));
return;
}

String fromAddress = (String) stateArray.get(1);
if (40 == fromAddress.length()) {
fromAddress = Address.parse(fromAddress).toBase58();
}
String toAddress = (String) stateArray.get(2);
if (40 == toAddress.length()) {
toAddress = Address.parse(toAddress).toBase58();
}

String fromAddress = "";
String toAddress = "";
String assetName = "";
BigDecimal amount = ConstantParam.ZERO;
//云斗龙特殊处理,记录birth出来的云斗龙信息
if ("HyperDragons".equalsIgnoreCase(oep5Obj.getString("name"))) {
// 如果是birth方法，tokenid位置在2；如果是transfer方法，tokenid位置在3
String dragonId = "";
if ("birth".equalsIgnoreCase(action)) {
dragonId = Helper.BigIntFromNeoBytes(Helper.hexToBytes((String) stateArray.get(2))).toString();
fromAddress = "";
toAddress = "";

Integer eventType = EventTypeEnum.Transfer.type();
if ("birth".equalsIgnoreCase(action)) {
//云斗龙特殊处理,记录birth出来的云斗龙信息
if ("HyperDragons".equalsIgnoreCase(oep5Obj.getString("name"))) {
String dragonId = Helper.BigIntFromNeoBytes(Helper.hexToBytes((String) stateArray.get(2))).toString();
Oep5Dragon oep5Dragon = Oep5Dragon.builder()
.contractHash(contractAddress)
.assetName(ConstantParam.ASSET_NAME_DRAGON + dragonId)
.jsonUrl(getDragonUrl(contractAddress, dragonId))
.build();
ConstantParam.BATCHBLOCKDTO.getOep5Dragons().add(oep5Dragon);
assetName = ConstantParam.ASSET_NAME_DRAGON + dragonId;
} else {
amount = ConstantParam.ONE;
dragonId = Helper.BigIntFromNeoBytes(Helper.hexToBytes((String) stateArray.get(3))).toString();
isTransfer = Boolean.TRUE;
}
assetName = ConstantParam.ASSET_NAME_DRAGON + dragonId;
} else {
//OEP5初始化交易，更新total_supply。且tokenid位置在2
if ("birth".equalsIgnoreCase(action)) {
//OEP5初始化交易，更新total_supply。且tokenId位置在2
assetName = oep5Obj.getString("symbol") + stateArray.get(2);
fromAddress = "";
toAddress = "";

Long totalSupply = commonService.getOep5TotalSupply(contractAddress);
Oep5 oep5 = Oep5.builder()
.contractHash(contractAddress)
.totalSupply(totalSupply)
.build();
//在子线程直接更新，不批量更新
oep5Mapper.updateByPrimaryKeySelective(oep5);
}
} else if ("transfer".equalsIgnoreCase(action)) {
try {
fromAddress = (String) stateArray.get(1);
if (40 == fromAddress.length()) {
fromAddress = Address.parse(fromAddress).toBase58();
}
toAddress = (String) stateArray.get(2);
if (40 == toAddress.length()) {
toAddress = Address.parse(toAddress).toBase58();
}
} catch (Exception ignore) {
}

} else if ("transfer".equalsIgnoreCase(action)) {
//transfer方法，tokenid在位置3
if ("HyperDragons".equalsIgnoreCase(oep5Obj.getString("name"))) {
amount = ConstantParam.ONE;
String dragonId = Helper.BigIntFromNeoBytes(Helper.hexToBytes((String) stateArray.get(3))).toString();
assetName = ConstantParam.ASSET_NAME_DRAGON + dragonId;
} else {
//transfer方法，tokenId在位置3
assetName = oep5Obj.getString("symbol") + stateArray.get(3);
amount = ConstantParam.ONE;
isTransfer = Boolean.TRUE;
}
isTransfer = Boolean.TRUE;
} else if ("mintTokenAction".equalsIgnoreCase(action)) {
//mintTokenAction方法，tokenId在位置2
try {
toAddress = (String) stateArray.get(1);
if (40 == toAddress.length()) {
toAddress = Address.parse(toAddress).toBase58();
}
} catch (Exception ignore) {
}
assetName = oep5Obj.getString("symbol") + stateArray.get(2);
amount = new BigDecimal(Helper.BigIntFromNeoBytes(Helper.hexToBytes((String) stateArray.get(3))));
} else {
eventType = EventTypeEnum.Others.type();
}

log.info("OEP5TransferTx:fromaddress:{}, toaddress:{}, assetName:{}", fromAddress, toAddress, assetName);

TxDetail txDetail = generateTransaction(fromAddress, toAddress, assetName, amount, txType, txHash, blockHeight,
blockTime, indexInBlock, confirmFlag, action, gasConsumed, indexInTx, EventTypeEnum.Transfer.type(), contractAddress, payer, calledContractHash);
blockTime, indexInBlock, confirmFlag, action, gasConsumed, indexInTx, eventType,
contractAddress, payer, calledContractHash);

ConstantParam.BATCHBLOCKDTO.getTxDetails().add(txDetail);
ConstantParam.BATCHBLOCKDTO.getTxDetailDailys().add(TxDetail.toTxDetailDaily(txDetail));
Expand Down
86 changes: 43 additions & 43 deletions back-end-projects/OntSynHandler/src/main/java/com/github/ontio/thread/TxReSyncThread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,75 +457,75 @@ private void handleOep5TransferTxn(JSONArray stateArray, int txType, String txHa
} catch (Exception e) {
action = (String) stateArray.get(0);
}
//只解析birth和transfer合约方法
if (!(action.equalsIgnoreCase("transfer") || action.equalsIgnoreCase("birth"))) {
TxDetail txDetail = generateTransaction("", "", "", ConstantParam.ZERO, txType, txHash, blockHeight,
blockTime, indexInBlock, confirmFlag, action, gasConsumed, indexInTx, EventTypeEnum.Others.type(),
contractAddress, payer, calledContractHash);

ReSyncConstantParam.BATCHBLOCKDTO.getTxDetails().add(txDetail);
ReSyncConstantParam.BATCHBLOCKDTO.getTxDetailDailys().add(TxDetail.toTxDetailDaily(txDetail));
ReSyncConstantParam.BATCHBLOCKDTO.getOep5TxDetails().add(TxDetail.toOep5TxDetail(txDetail));
return;
}

String fromAddress = (String) stateArray.get(1);
if (40 == fromAddress.length()) {
fromAddress = Address.parse(fromAddress).toBase58();
}
String toAddress = (String) stateArray.get(2);
if (40 == toAddress.length()) {
toAddress = Address.parse(toAddress).toBase58();
}

String fromAddress = "";
String toAddress = "";
String assetName = "";
BigDecimal amount = ConstantParam.ZERO;
//云斗龙特殊处理,记录birth出来的云斗龙信息
if ("HyperDragons".equalsIgnoreCase(oep5Obj.getString("name"))) {
// 如果是birth方法，tokenid位置在2；如果是transfer方法，tokenid位置在3
String dragonId = "";
if ("birth".equalsIgnoreCase(action)) {
dragonId = Helper.BigIntFromNeoBytes(Helper.hexToBytes((String) stateArray.get(2))).toString();
fromAddress = "";
toAddress = "";

Integer eventType = EventTypeEnum.Transfer.type();
if ("birth".equalsIgnoreCase(action)) {
//云斗龙特殊处理,记录birth出来的云斗龙信息
if ("HyperDragons".equalsIgnoreCase(oep5Obj.getString("name"))) {
String dragonId = Helper.BigIntFromNeoBytes(Helper.hexToBytes((String) stateArray.get(2))).toString();
Oep5Dragon oep5Dragon = Oep5Dragon.builder()
.contractHash(contractAddress)
.assetName(ConstantParam.ASSET_NAME_DRAGON + dragonId)
.jsonUrl(getDragonUrl(contractAddress, dragonId))
.build();
ReSyncConstantParam.BATCHBLOCKDTO.getOep5Dragons().add(oep5Dragon);
assetName = ConstantParam.ASSET_NAME_DRAGON + dragonId;
} else {
amount = ConstantParam.ONE;
dragonId = Helper.BigIntFromNeoBytes(Helper.hexToBytes((String) stateArray.get(3))).toString();
}
assetName = ConstantParam.ASSET_NAME_DRAGON + dragonId;
} else {
//OEP5初始化交易，更新total_supply。且tokenid位置在2
if ("birth".equalsIgnoreCase(action)) {
//OEP5初始化交易，更新total_supply。且tokenId位置在2
assetName = oep5Obj.getString("symbol") + stateArray.get(2);
fromAddress = "";
toAddress = "";

Long totalSupply = commonService.getOep5TotalSupply(contractAddress);
Oep5 oep5 = Oep5.builder()
.contractHash(contractAddress)
.totalSupply(totalSupply)
.build();
//在子线程直接更新，不批量更新
oep5Mapper.updateByPrimaryKeySelective(oep5);
}
} else if ("transfer".equalsIgnoreCase(action)) {
try {
fromAddress = (String) stateArray.get(1);
if (40 == fromAddress.length()) {
fromAddress = Address.parse(fromAddress).toBase58();
}
toAddress = (String) stateArray.get(2);
if (40 == toAddress.length()) {
toAddress = Address.parse(toAddress).toBase58();
}
} catch (Exception ignore) {
}

} else if ("transfer".equalsIgnoreCase(action)) {
//transfer方法，tokenid在位置3
if ("HyperDragons".equalsIgnoreCase(oep5Obj.getString("name"))) {
amount = ConstantParam.ONE;
String dragonId = Helper.BigIntFromNeoBytes(Helper.hexToBytes((String) stateArray.get(3))).toString();
assetName = ConstantParam.ASSET_NAME_DRAGON + dragonId;
} else {
//transfer方法，tokenId在位置3
assetName = oep5Obj.getString("symbol") + stateArray.get(3);
amount = ConstantParam.ONE;
}
} else if ("mintTokenAction".equalsIgnoreCase(action)) {
//mintTokenAction方法，tokenId在位置2
try {
toAddress = (String) stateArray.get(1);
if (40 == toAddress.length()) {
toAddress = Address.parse(toAddress).toBase58();
}
} catch (Exception ignore) {
}
assetName = oep5Obj.getString("symbol") + stateArray.get(2);
amount = new BigDecimal(Helper.BigIntFromNeoBytes(Helper.hexToBytes((String) stateArray.get(3))));
} else {
eventType = EventTypeEnum.Others.type();
}

log.info("OEP5TransferTx:fromaddress:{}, toaddress:{}, assetName:{}", fromAddress, toAddress, assetName);

TxDetail txDetail = generateTransaction(fromAddress, toAddress, assetName, amount, txType, txHash, blockHeight,
blockTime, indexInBlock, confirmFlag, action, gasConsumed, indexInTx, EventTypeEnum.Transfer.type(),
blockTime, indexInBlock, confirmFlag, action, gasConsumed, indexInTx, eventType,
contractAddress, payer, calledContractHash);

ReSyncConstantParam.BATCHBLOCKDTO.getTxDetails().add(txDetail);
Expand Down Expand Up @@ -699,7 +699,7 @@ private void insertTxBasicInfo(int txType, String txHash, int blockHeight, int b
int eventType, String contractAddress, String payer, String calledContractHash) throws Exception {
//
// TxDetail txDetail = generateTransaction("", "", "", ConstantParam.ZERO, txType, txHash, blockHeight,
// blockTime, indexInBlock, confirmFlag, action, gasConsumed, indexInTx, eventType, contractAddress, payer,
// blockTime, indexInBlock, confirmFlag, action, gasConsumed, indexInTx, eventType, contractAddress, payer,
// calledContractHash);
//
// ReSyncConstantParam.BATCHBLOCKDTO.getTxDetails().add(txDetail);
Expand Down

0 comments on commit 94a6cfd

Please sign in to comment.