bdware/cm
2
0
Fork 0
mirror of https://gitee.com/BDWare/cm synced 2025-01-10 18:04:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

add update node manager

Browse Source
This commit is contained in:
CaiHQ 2022-11-29 15:14:58 +08:00
parent 8ce956a5c7
commit bc5dd8a106
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/org/bdware/sc/ContractManager.java
View File

@ -1254,19 +1254,6 @@ public class ContractManager {
ContractResult cr; ContractResult cr;
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
// 9000
if (null != request.getRequester() && !request.getRequester().startsWith("event")) {
if (client.contractMeta.sigRequired) {
if (!request.verifySignature()) {
cr = new ContractResult(Status.Error, new JsonPrimitive("sign verified failed"));
rcb.onResult(JsonUtil.parseObjectAsJsonObject(cr));
return;
}
} else if (null != request.getPublicKey() && request.getPublicKey().length() > 30 && !request.verifySignature()) {
request.setPublicKey(null);
}
}
client.times++; client.times++;
client.contractStatus = ContractStatus.Executing; client.contractStatus = ContractStatus.Executing;
ResultCallback acb; ResultCallback acb;
@ -1316,19 +1303,6 @@ public class ContractManager {
ContractResult cr; ContractResult cr;
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
LOGGER.debug(request.getContentStr()); LOGGER.debug(request.getContentStr());
if (client.contractMeta.sigRequired) {
if (!request.verifySignature()) {
cr = new ContractResult(Status.Error, new JsonPrimitive("sign verified failed"));
return JsonUtil.toJson(cr);
}
} else {
if (request.getPublicKey() != null) {
if (!request.verifySignature()) {
request.setPublicKey(null);
request.setRequester(null);
}
}
}
client.times++; client.times++;
// 将合约状态改为“Executing” // 将合约状态改为“Executing”
client.contractStatus = ContractStatus.Executing; client.contractStatus = ContractStatus.Executing;

2
src/main/java/org/bdware/sc/event/clients/ContractConsumer.java
View File

@ -1,5 +1,6 @@
package org.bdware.sc.event.clients; package org.bdware.sc.event.clients;
import com.google.gson.Gson;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -80,6 +81,7 @@ public class ContractConsumer implements IEventConsumer {
return; return;
} }
AtomicInteger callCount = new AtomicInteger(0); AtomicInteger callCount = new AtomicInteger(0);
LOGGER.info("ContractConsumer!"+new Gson().toJson(cr));
// TODO sending requests at a high frequency maybe cause that some requests are ignored // TODO sending requests at a high frequency maybe cause that some requests are ignored
ScheduledFuture<?> future = ContractManager.scheduledThreadPool.scheduleAtFixedRate( ScheduledFuture<?> future = ContractManager.scheduledThreadPool.scheduleAtFixedRate(
() -> ContractManager.instance.executeContractInternal(cr, new ResultCallback() { () -> ContractManager.instance.executeContractInternal(cr, new ResultCallback() {