Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

<feat>(account&client&driver): build account set key bytes & sendTx with user #25

Merged
merged 3 commits into from
May 27, 2024
Merged

<feat>(account&client&driver): build account set key bytes & sendTx with user #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50cc1e5
<feat>(account): build account set key bytes
May 22, 2024
f551373
<feat>(client&driver): sendTx with user
May 23, 2024
09857a6
<feat>(contract): process address
May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/main/java/com/webank/wecross/stub/chainmaker/ChainMakerConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
import com.fasterxml.jackson.databind.SerializationFeature;
import com.google.protobuf.util.JsonFormat;
import com.webank.wecross.stub.Connection;
import com.webank.wecross.stub.ObjectMapperFactory;
import com.webank.wecross.stub.Request;
import com.webank.wecross.stub.ResourceInfo;
import com.webank.wecross.stub.Response;
import com.webank.wecross.stub.chainmaker.account.ChainMakerUserFactory;
import com.webank.wecross.stub.chainmaker.client.AbstractClientWrapper;
import com.webank.wecross.stub.chainmaker.common.ChainMakerConstant;
import com.webank.wecross.stub.chainmaker.common.ChainMakerRequestType;
import com.webank.wecross.stub.chainmaker.common.ChainMakerStatusCode;
import com.webank.wecross.stub.chainmaker.common.ChainMakerStubException;
import com.webank.wecross.stub.chainmaker.common.ObjectMapperFactory;
import com.webank.wecross.stub.chainmaker.protocal.TransactionParams;
import com.webank.wecross.stub.chainmaker.utils.FunctionUtility;
import java.math.BigInteger;
Expand All @@ -29,6 +30,7 @@
import org.chainmaker.pb.common.ChainmakerBlock;
import org.chainmaker.pb.common.ChainmakerTransaction;
import org.chainmaker.pb.common.ResultOuterClass;
import org.chainmaker.sdk.User;
import org.fisco.bcos.sdk.abi.FunctionEncoder;
import org.fisco.bcos.sdk.abi.datatypes.Function;
import org.fisco.bcos.sdk.crypto.CryptoSuite;
Expand Down Expand Up @@ -190,10 +192,13 @@ private void handleAsyncTransactionRequest(Request request, Callback callback) {
try {
TransactionParams cmRequest =
objectMapper.readValue(request.getData(), TransactionParams.class);

org.chainmaker.pb.common.Request.TxRequest txRequest =
org.chainmaker.pb.common.Request.TxRequest.parseFrom(cmRequest.getSignData());
ResultOuterClass.TxResponse txResponse = clientWrapper.sendTxRequest(txRequest);
String contractAddress = cmRequest.getContractAddress();
String contractMethodId = cmRequest.getContractMethodId();
Map<String, byte[]> contractMethodParams = cmRequest.getContractMethodParams();
User user = ChainMakerUserFactory.buildUserFromPrivateKeyBytes(cmRequest.getSignKey());
ResultOuterClass.TxResponse txResponse =
clientWrapper.invokeContractWithUser(
contractAddress, contractMethodId, contractMethodParams, user);
if (logger.isDebugEnabled()) {
logger.debug("handleAsyncTransactionRequest: {}", JsonFormat.printer().print(txResponse));
}
Expand Down
166 changes: 75 additions & 91 deletions src/main/java/com/webank/wecross/stub/chainmaker/ChainMakerDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.webank.wecross.stub.BlockManager;
import com.webank.wecross.stub.Connection;
import com.webank.wecross.stub.Driver;
import com.webank.wecross.stub.ObjectMapperFactory;
import com.webank.wecross.stub.Path;
import com.webank.wecross.stub.Request;
import com.webank.wecross.stub.ResourceInfo;
Expand All @@ -17,11 +16,11 @@
import com.webank.wecross.stub.TransactionRequest;
import com.webank.wecross.stub.TransactionResponse;
import com.webank.wecross.stub.chainmaker.account.ChainMakerPublicAccount;
import com.webank.wecross.stub.chainmaker.client.ClientUtility;
import com.webank.wecross.stub.chainmaker.common.ChainMakerConstant;
import com.webank.wecross.stub.chainmaker.common.ChainMakerRequestType;
import com.webank.wecross.stub.chainmaker.common.ChainMakerStatusCode;
import com.webank.wecross.stub.chainmaker.common.ChainMakerStubException;
import com.webank.wecross.stub.chainmaker.common.ObjectMapperFactory;
import com.webank.wecross.stub.chainmaker.protocal.TransactionParams;
import com.webank.wecross.stub.chainmaker.protocal.TransactionProof;
import com.webank.wecross.stub.chainmaker.utils.BlockUtility;
Expand All @@ -43,7 +42,6 @@
import org.chainmaker.pb.common.ChainmakerBlock;
import org.chainmaker.pb.common.ChainmakerTransaction;
import org.chainmaker.pb.common.ResultOuterClass;
import org.chainmaker.sdk.ChainClient;
import org.chainmaker.sdk.User;
import org.chainmaker.sdk.utils.CryptoUtils;
import org.fisco.bcos.sdk.abi.ABICodec;
Expand Down Expand Up @@ -102,79 +100,78 @@ public ImmutablePair<Boolean, TransactionRequest> decodeTransactionRequest(Reque
String method = transactionRequest.getMethod();
TransactionParams.SUB_TYPE subType = transactionParams.getSubType();
String contractAbi = transactionParams.getAbi();
String abi = "";
String encodeAbi = "";
String encodedFromInput = "";
String encodedFromNow = "";
switch (subType) {
case SEND_TX_BY_PROXY:
case CALL_BY_PROXY:
{
byte[] contractMethodParamsBytes =
transactionParams
.getContractMethodParams()
.get(ChainMakerConstant.CHAIN_MAKER_CONTRACT_ARGS_EVM_PARAM);
String input =
Numeric.cleanHexPrefix(
new String(contractMethodParamsBytes, StandardCharsets.UTF_8));
if (subType == TransactionParams.SUB_TYPE.SEND_TX_BY_PROXY) {
org.chainmaker.pb.common.Request.TxRequest txRequest =
org.chainmaker.pb.common.Request.TxRequest.parseFrom(
transactionParams.getSignData());
String valueData =
txRequest.getPayload().getParametersList().get(0).getValue().toStringUtf8();
if (valueData.startsWith(
functionEncoder.buildMethodId(FunctionUtility.ProxySendTransactionTXMethod))) {
if (input.startsWith(
Numeric.cleanHexPrefix(
functionEncoder.buildMethodId(
FunctionUtility.ProxySendTransactionTXMethod)))) {
// sendTransactionWithXa
Tuple6<String, String, BigInteger, String, String, byte[]>
sendTransactionProxyFunctionInput =
FunctionUtility.getSendTransactionProxyFunctionInput(valueData);
abi = Hex.toHexString(sendTransactionProxyFunctionInput.getValue6());
FunctionUtility.getSendTransactionProxyFunctionInput(input);
encodedFromInput = Hex.toHexString(sendTransactionProxyFunctionInput.getValue6());
} else {
// sendTransaction
Tuple3<String, String, byte[]> sendTransactionProxyFunctionInput =
FunctionUtility.getSendTransactionProxyWithoutTxIdFunctionInput(valueData);
abi = Hex.toHexString(sendTransactionProxyFunctionInput.getValue3());
abi = abi.substring(FunctionUtility.MethodIDLength);
FunctionUtility.getSendTransactionProxyWithoutTxIdFunctionInput(input);
String encodedMethodWithArgs =
Hex.toHexString(sendTransactionProxyFunctionInput.getValue3());
encodedFromInput = encodedMethodWithArgs.substring(FunctionUtility.MethodIDLength);
}
} else {
byte[] contractMethodParamsBytes =
transactionParams
.getContractMethodParams()
.get(ChainMakerConstant.CHAIN_MAKER_CONTRACT_ARGS_EVM_PARAM);
String contractMethodParams =
new String(contractMethodParamsBytes, StandardCharsets.UTF_8);
if (contractMethodParams.startsWith(
functionEncoder.buildMethodId(
FunctionUtility.ProxyCallWithTransactionIdMethod))) {
if (input.startsWith(
Numeric.cleanHexPrefix(
functionEncoder.buildMethodId(
FunctionUtility.ProxyCallWithTransactionIdMethod)))) {
// constantCallWithXa
Tuple4<String, String, String, byte[]> constantCallProxyFunctionInput =
FunctionUtility.getConstantCallProxyFunctionInput(contractMethodParams);
abi = Hex.toHexString(constantCallProxyFunctionInput.getValue4());
FunctionUtility.getConstantCallProxyFunctionInput(input);
encodedFromInput = Hex.toHexString(constantCallProxyFunctionInput.getValue4());
} else {
// constantCall
Tuple2<String, byte[]> sendTransactionProxyFunctionInput =
FunctionUtility.getConstantCallFunctionInput(contractMethodParams);
abi = Hex.toHexString(sendTransactionProxyFunctionInput.getValue2());
abi = abi.substring(FunctionUtility.MethodIDLength);
FunctionUtility.getConstantCallFunctionInput(input);
String encodedMethodWithArgs =
Hex.toHexString(sendTransactionProxyFunctionInput.getValue2());
encodedFromInput = encodedMethodWithArgs.substring(FunctionUtility.MethodIDLength);
}
}
// encoded now
List<ABIDefinition> abiDefinitions =
abiDefinitionFactory
.loadABI(transactionParams.getAbi())
.getFunctions()
.get(transactionRequest.getMethod());
if (Objects.isNull(abiDefinitions) || abiDefinitions.isEmpty()) {
throw new InvalidParameterException(
" found no method in abi, method: " + transactionRequest.getMethod());
" found no method in encodedFromInput, method: "
+ transactionRequest.getMethod());
}

encodeAbi = encodeFunctionArgs(abiDefinitions.get(0), args);
encodedFromNow = encodeFunctionArgs(abiDefinitions.get(0), args);
break;
}
case SEND_TX:
case CALL:
{
if (subType == TransactionParams.SUB_TYPE.SEND_TX) {
org.chainmaker.pb.common.Request.TxRequest txRequest =
org.chainmaker.pb.common.Request.TxRequest.parseFrom(
transactionParams.getSignData());
abi = txRequest.getPayload().getParameters(0).getValue().toStringUtf8();
} else {
Map<String, byte[]> contractMethodParams =
transactionParams.getContractMethodParams();
byte[] orgEncodeArgs =
contractMethodParams.get(ChainMakerConstant.CHAIN_MAKER_CONTRACT_ARGS_EVM_PARAM);
abi = new String(orgEncodeArgs, StandardCharsets.UTF_8);
}
encodeAbi =
byte[] contractMethodParamsBytes =
transactionParams
.getContractMethodParams()
.get(ChainMakerConstant.CHAIN_MAKER_CONTRACT_ARGS_EVM_PARAM);
encodedFromInput = new String(contractMethodParamsBytes, StandardCharsets.UTF_8);
encodedFromNow =
abiCodec.encodeMethodFromString(
contractAbi, method, args != null ? Arrays.asList(args) : new ArrayList<>());
break;
Expand All @@ -185,10 +182,14 @@ public ImmutablePair<Boolean, TransactionRequest> decodeTransactionRequest(Reque
return new ImmutablePair<>(true, null);
}
}
if (Numeric.cleanHexPrefix(encodeAbi).equals(Numeric.cleanHexPrefix(abi))) {
// compare
if (Numeric.cleanHexPrefix(encodedFromNow).equals(Numeric.cleanHexPrefix(encodedFromInput))) {
return new ImmutablePair<>(true, transactionRequest);
}
logger.warn(" abi not meet expectations, abi:{}, encodeAbi:{}", abi, encodeAbi);
logger.warn(
" encodedFromInput not meet expectations, encodedFromInput:{}, encodedFromNow:{}",
encodedFromInput,
encodedFromNow);
return new ImmutablePair<>(true, null);
} catch (Exception e) {
logger.error("decodeTransactionRequest error: ", e);
Expand Down Expand Up @@ -256,14 +257,12 @@ public void asyncGetBlockNumber(Connection connection, GetBlockNumberCallback ca
@Override
public void asyncGetBlock(
long blockNumber, boolean onlyHeader, Connection connection, GetBlockCallback callback) {
// 构建Request
byte[] blockNumberBytes = BigInteger.valueOf(blockNumber).toByteArray();
Request request =
Request.newRequest(ChainMakerRequestType.GET_BLOCK_BY_NUMBER, blockNumberBytes);
connection.asyncSend(
request,
response -> {
// 判断请求是否成功
if (response.getErrorCode() != ChainMakerStatusCode.Success) {
logger.warn(
" asyncGetBlock, errorCode: {}, errorMessage: {}",
Expand Down Expand Up @@ -579,10 +578,6 @@ private interface RequestTransactionProofCallback {
void onResponse(ChainMakerStubException e, TransactionProof proof);
}

/**
* @param transactionHash
* @param connection
*/
private void asyncRequestTransactionProof(
String transactionHash, Connection connection, RequestTransactionProofCallback callback) {

Expand Down Expand Up @@ -712,10 +707,11 @@ void asyncCallByProxy(
" name:{}, address: {}, method: {}, args: {}", name, contractAddress, method, args);
}

byte[] encodedMethodWithArgs =
functionEncoder.encode(function).getBytes(StandardCharsets.UTF_8);

Map<String, byte[]> params = new HashMap<>();
params.put(
ChainMakerConstant.CHAIN_MAKER_CONTRACT_ARGS_EVM_PARAM,
functionEncoder.encode(function).getBytes(StandardCharsets.UTF_8));
params.put(ChainMakerConstant.CHAIN_MAKER_CONTRACT_ARGS_EVM_PARAM, encodedMethodWithArgs);

TransactionParams transaction =
new TransactionParams(
Expand Down Expand Up @@ -833,7 +829,7 @@ void asyncCallNative(
new ChainMakerStubException(
ChainMakerStatusCode.MethodNotExist, "method not exist: " + method));

byte[] encodedArgs =
byte[] encodedMethodWithArgs =
abiCodec
.encodeMethodFromString(
contractAbi, method, args != null ? Arrays.asList(args) : new ArrayList<>())
Expand All @@ -845,7 +841,7 @@ void asyncCallNative(
}

Map<String, byte[]> params = new HashMap<>();
params.put(ChainMakerConstant.CHAIN_MAKER_CONTRACT_ARGS_EVM_PARAM, encodedArgs);
params.put(ChainMakerConstant.CHAIN_MAKER_CONTRACT_ARGS_EVM_PARAM, encodedMethodWithArgs);

TransactionParams transaction =
new TransactionParams(
Expand Down Expand Up @@ -1009,26 +1005,21 @@ void asyncSendTransactionByProxy(
" name:{},address: {}, method: {}, args: {}", name, contractAddress, method, args);
}

byte[] encodedMethodWithArgs =
functionEncoder.encode(function).getBytes(StandardCharsets.UTF_8);

Map<String, byte[]> params = new HashMap<>();
params.put(
ChainMakerConstant.CHAIN_MAKER_CONTRACT_ARGS_EVM_PARAM,
functionEncoder.encode(function).getBytes(StandardCharsets.UTF_8));

ChainClient nativeClient = chainMakerConnection.getClientWrapper().getNativeClient();
org.chainmaker.pb.common.Request.Payload payload =
ClientUtility.createPayload(
nativeClient.getChainId(),
proxyContractAddress,
functionEncoder.buildMethodId(proxyMethod),
params);
User clientUser = nativeClient.getClientUser();
org.chainmaker.pb.common.Request.TxRequest txRequest =
ClientUtility.createTxRequest(
payload, clientUser.getOrgId(), user, nativeClient.getHash());
params.put(ChainMakerConstant.CHAIN_MAKER_CONTRACT_ARGS_EVM_PARAM, encodedMethodWithArgs);

TransactionParams transactionParams =
new TransactionParams(
request, txRequest.toByteArray(), TransactionParams.SUB_TYPE.SEND_TX_BY_PROXY);
request,
proxyContractAddress,
functionEncoder.buildMethodId(proxyMethod),
params,
TransactionParams.SUB_TYPE.SEND_TX_BY_PROXY);
transactionParams.setAbi(contractAbi);
transactionParams.setSignKey(user.getPriBytes());
Request req =
Request.newRequest(
ChainMakerRequestType.SEND_TRANSACTION,
Expand Down Expand Up @@ -1139,7 +1130,7 @@ void asyncSendTransactionNative(
new ChainMakerStubException(
ChainMakerStatusCode.MethodNotExist, "method not exist: " + method));

byte[] encodedArgs =
byte[] encodedMethodWithArgs =
abiCodec
.encodeMethodFromString(
contractAbi, method, args != null ? Arrays.asList(args) : new ArrayList<>())
Expand All @@ -1151,23 +1142,16 @@ void asyncSendTransactionNative(
}

Map<String, byte[]> params = new HashMap<>();
params.put(ChainMakerConstant.CHAIN_MAKER_CONTRACT_ARGS_EVM_PARAM, encodedArgs);

ChainClient nativeClient = chainMakerConnection.getClientWrapper().getNativeClient();
org.chainmaker.pb.common.Request.Payload payload =
ClientUtility.createPayload(
nativeClient.getChainId(),
contractAddress,
functionEncoder.buildMethodId(abiDefinition.getMethodSignatureAsString()),
params);
User clientUser = nativeClient.getClientUser();
org.chainmaker.pb.common.Request.TxRequest txRequest =
ClientUtility.createTxRequest(
payload, clientUser.getOrgId(), user, nativeClient.getHash());
params.put(ChainMakerConstant.CHAIN_MAKER_CONTRACT_ARGS_EVM_PARAM, encodedMethodWithArgs);
TransactionParams transactionParams =
new TransactionParams(
request, txRequest.toByteArray(), TransactionParams.SUB_TYPE.SEND_TX);
request,
contractAddress,
functionEncoder.buildMethodId(abiDefinition.getMethodSignatureAsString()),
params,
TransactionParams.SUB_TYPE.SEND_TX);
transactionParams.setAbi(contractAbi);
transactionParams.setSignKey(user.getPriBytes());
Request req =
Request.newRequest(
ChainMakerRequestType.SEND_TRANSACTION,
Expand Down
Loading
Loading