bdware/bdcontract-web-ide
21
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: fix bugs in executeContract of NodeContractInstances.js

Browse Source
This commit is contained in:
Frank.R.Wu 2021-12-12 12:25:36 +08:00
parent 0dfa8a555a
commit 965ee67409
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/NodeContractInstances.js
View File

@ -398,14 +398,14 @@ function executeContract() {
request.pubkey = global.sm2Key.publicKey; request.pubkey = global.sm2Key.publicKey;
request.isDebug = executeContractAsDebug.checked; request.isDebug = executeContractAsDebug.checked;
console.log(request.arg); console.log(request.arg);
const gasLimit = $('#gasLimit').val()/1; const gasLimit = $('#gasLimit').val() / 1;
var toSign = request.contractID + "|" var toSign = request.contractID + "|"
+ request.operation + "|" + arg ; + request.operation + "|" + request.arg;
if (gasLimit>0){ if (gasLimit > 0) {
request.gasLimit = gasLimit; request.gasLimit = gasLimit;
toSign+= "|" + gasLimit; toSign += "|" + gasLimit;
} }
toSign+= "|" + global.sm2Key.publicKey; toSign += "|" + global.sm2Key.publicKey;
request.signature = sm2.doSignature( request.signature = sm2.doSignature(
toSign, toSign,
global.sm2Key.privateKey, global.sm2Key.privateKey,
@ -431,9 +431,9 @@ function onExecuteResult(obj) {
$("#responseArea")[0].value = result.result; $("#responseArea")[0].value = result.result;
} }
$("#responseID").html(`请求ID:${obj['responseID']}`); $("#responseID").html(`请求ID:${obj['responseID']}`);
var gasInfo=""; var gasInfo = "";
if (obj.executionGas!=undefined && obj.executionGas>0) if (obj.executionGas != undefined && obj.executionGas > 0)
gasInfo="<br>"+obj.executionGas+"gas"; gasInfo = "<br>" + obj.executionGas + "gas";
$("#responseTime").html(`响应时间:${obj['executeTime']}ms${gasInfo}${styleTail}`); $("#responseTime").html(`响应时间:${obj['executeTime']}ms${gasInfo}${styleTail}`);
} catch (e) { } catch (e) {
$("#responseStatus").html("执行状态：Failed"); $("#responseStatus").html("执行状态：Failed");
@ -461,12 +461,12 @@ function getMask() {
console.log(request.arg); console.log(request.arg);
//const gasLimit = $('#gasLimit').val()/1; //const gasLimit = $('#gasLimit').val()/1;
var toSign = request.contractID + "|" var toSign = request.contractID + "|"
+ request.operation + "|" + arg ; + request.operation + "|" + arg;
/*if (gasLimit>0){ /*if (gasLimit>0){
request.gasLimit = gasLimit; request.gasLimit = gasLimit;
toSign+= "|" + gasLimit; toSign+= "|" + gasLimit;
}*/ }*/
toSign+= "|" + global.sm2Key.publicKey; toSign += "|" + global.sm2Key.publicKey;
request.signature = sm2.doSignature( request.signature = sm2.doSignature(
toSign, toSign,
global.sm2Key.privateKey, global.sm2Key.privateKey,
@ -474,6 +474,7 @@ function getMask() {
localStorage.setItem("persisArg", JSON.stringify(request)); localStorage.setItem("persisArg", JSON.stringify(request));
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
} }
function setMask() { function setMask() {
const argDiv = $('#maskArg')[0]; const argDiv = $('#maskArg')[0];
const request = {}; const request = {};
@ -492,12 +493,12 @@ function setMask() {
console.log(request.arg); console.log(request.arg);
//const gasLimit = $('#gasLimit').val()/1; //const gasLimit = $('#gasLimit').val()/1;
var toSign = request.contractID + "|" var toSign = request.contractID + "|"
+ request.operation + "|" + arg ; + request.operation + "|" + arg;
/*if (gasLimit>0){ /*if (gasLimit>0){
request.gasLimit = gasLimit; request.gasLimit = gasLimit;
toSign+= "|" + gasLimit; toSign+= "|" + gasLimit;
}*/ }*/
toSign+= "|" + global.sm2Key.publicKey; toSign += "|" + global.sm2Key.publicKey;
request.signature = sm2.doSignature( request.signature = sm2.doSignature(
toSign, toSign,
global.sm2Key.privateKey, global.sm2Key.privateKey,
@ -535,12 +536,12 @@ function getMock() {
console.log(request.arg); console.log(request.arg);
//const gasLimit = $('#gasLimit').val()/1; //const gasLimit = $('#gasLimit').val()/1;
var toSign = request.contractID + "|" var toSign = request.contractID + "|"
+ request.operation + "|" + arg ; + request.operation + "|" + arg;
/*if (gasLimit>0){ /*if (gasLimit>0){
request.gasLimit = gasLimit; request.gasLimit = gasLimit;
toSign+= "|" + gasLimit; toSign+= "|" + gasLimit;
}*/ }*/
toSign+= "|" + global.sm2Key.publicKey; toSign += "|" + global.sm2Key.publicKey;
request.signature = sm2.doSignature( request.signature = sm2.doSignature(
toSign, toSign,
global.sm2Key.privateKey, global.sm2Key.privateKey,
@ -567,12 +568,12 @@ function setMock() {
console.log(request.arg); console.log(request.arg);
//const gasLimit = $('#gasLimit').val()/1; //const gasLimit = $('#gasLimit').val()/1;
var toSign = request.contractID + "|" var toSign = request.contractID + "|"
+ request.operation + "|" + arg ; + request.operation + "|" + arg;
/*if (gasLimit>0){ /*if (gasLimit>0){
request.gasLimit = gasLimit; request.gasLimit = gasLimit;
toSign+= "|" + gasLimit; toSign+= "|" + gasLimit;
}*/ }*/
toSign+= "|" + global.sm2Key.publicKey; toSign += "|" + global.sm2Key.publicKey;
request.signature = sm2.doSignature( request.signature = sm2.doSignature(
toSign, toSign,
global.sm2Key.privateKey, global.sm2Key.privateKey,