merge: merge changes in BaaS
This commit is contained in:
@@ -76,9 +76,9 @@ var importContractInstanceCodeByDOI = function () {
|
||||
};
|
||||
|
||||
var openinClient = function () {
|
||||
var path = document.location.pathname;
|
||||
path = path.replace("/SCIDE","");
|
||||
path = path.replace("/OnlineIDE.html","");
|
||||
var path = document.location.pathname;
|
||||
path = path.replace("/SCIDE", "");
|
||||
path = path.replace("/OnlineIDE.html", "");
|
||||
var url = path + "/client/bdwareclient.html?self=true&contract="
|
||||
+ mainVue.contracts[selectedContract.value].id;
|
||||
window.open(url);
|
||||
@@ -91,7 +91,7 @@ var stopAllContract = function () {
|
||||
};
|
||||
var selectContractToExecute = function () {
|
||||
var value = selectedContractAtExecute.value;
|
||||
if (value != undefined && value != "Select Instance") {
|
||||
if (value && value !== "Select Instance") {
|
||||
var exportedFunction = mainVue.contracts[value].exportedFunctions;
|
||||
mainVue.contractFunctions = exportedFunction;
|
||||
|
||||
@@ -119,7 +119,6 @@ var executeContract = function () {
|
||||
var request = {};
|
||||
|
||||
|
||||
|
||||
request.action = "executeContract";
|
||||
request.requestID = new Date().getTime() + "_"
|
||||
+ Math.floor(Math.random() * 10000);
|
||||
@@ -131,14 +130,14 @@ var executeContract = function () {
|
||||
arg.arg = executeContractArgInput.value;
|
||||
//console.log("[global.withEvaluatesAnalysis]"+global.withEvaluatesAnalysis);
|
||||
//if (global.withEvaluatesAnalysis != undefined) {
|
||||
//console.log("test");
|
||||
//console.log("test");
|
||||
if ($('#gasLimit').val() == undefined || $('#gasLimit').val() == "") {
|
||||
arg.gasLimit = '1000';
|
||||
} else {
|
||||
arg.gasLimit =$('#gasLimit').val();
|
||||
arg.gasLimit = $('#gasLimit').val();
|
||||
}
|
||||
console.log("[arg.gasLimit]"+arg.gasLimit);
|
||||
//request.withEvaluatesAnalysis = global.withEvaluatesAnalysis;
|
||||
console.log("[arg.gasLimit]" + arg.gasLimit);
|
||||
//request.withEvaluatesAnalysis = global.withEvaluatesAnalysis;
|
||||
//}
|
||||
request.pubkey = sm2Key.publicKey;
|
||||
request.signature = sm2.doSignature(request.contractID + "|" + arg.action
|
||||
|
||||
Reference in New Issue
Block a user