Compare commits
6 Commits
f6c898dc9e
...
v1.6.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cdcdfbdfde | ||
|
|
d0f8af9851 | ||
|
|
965ee67409 | ||
|
|
0dfa8a555a | ||
|
|
37476bd506 | ||
|
|
89360bbf0c |
@@ -281,6 +281,8 @@
|
||||
<option value="4">RARH</option>
|
||||
<option value="5">RARA</option>
|
||||
<option value="6">Sharding</option>
|
||||
<option value="7">SASharding</option>
|
||||
<option value="8">PBFT</option>
|
||||
</select>
|
||||
<div class="btn-group mr-3" role="group"
|
||||
style="margin-left: 2%">
|
||||
@@ -504,7 +506,8 @@
|
||||
</div>
|
||||
|
||||
<input type="text" class="form-control" placeholder="输入参数" id="arg">
|
||||
<input type="text" class="form-control col-2" placeholder="输入gas" id="gasLimit">
|
||||
<input type="text" class="form-control col-2" placeholder="输入gas"
|
||||
id="gasLimit">
|
||||
<div class="input-group-append">
|
||||
<div class="input-group-text">
|
||||
<input type="checkbox" id="executeContractAsDebug"
|
||||
@@ -553,7 +556,8 @@
|
||||
<span class="input-group-text">参数</span>
|
||||
</div>
|
||||
|
||||
<input type="text" class="form-control" placeholder="输入参数" id="maskArg">
|
||||
<input type="text" class="form-control" placeholder="输入参数"
|
||||
id="maskArg">
|
||||
|
||||
<div class="input-group-append">
|
||||
<button onclick="getMask()" type="button"
|
||||
@@ -586,7 +590,8 @@
|
||||
<span class="input-group-text">参数</span>
|
||||
</div>
|
||||
|
||||
<input type="text" class="form-control" placeholder="输入参数" id="mockArg">
|
||||
<input type="text" class="form-control" placeholder="输入参数"
|
||||
id="mockArg">
|
||||
|
||||
<div class="input-group-append">
|
||||
<button onclick="getMock()" type="button"
|
||||
@@ -1335,6 +1340,7 @@
|
||||
//initWSocket();
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
Binary file not shown.
9214
jqueryui1.12/jquery-2.1.4.js
vendored
Executable file → Normal file
9214
jqueryui1.12/jquery-2.1.4.js
vendored
Executable file → Normal file
File diff suppressed because one or more lines are too long
@@ -400,7 +400,7 @@ function executeContract() {
|
||||
console.log(request.arg);
|
||||
const gasLimit = $('#gasLimit').val() / 1;
|
||||
var toSign = request.contractID + "|"
|
||||
+ request.operation + "|" + arg ;
|
||||
+ request.operation + "|" + request.arg;
|
||||
if (gasLimit > 0) {
|
||||
request.gasLimit = gasLimit;
|
||||
toSign += "|" + gasLimit;
|
||||
@@ -474,6 +474,7 @@ function getMask() {
|
||||
localStorage.setItem("persisArg", JSON.stringify(request));
|
||||
global.wssocket.send(JSON.stringify(request));
|
||||
}
|
||||
|
||||
function setMask() {
|
||||
const argDiv = $('#maskArg')[0];
|
||||
const request = {};
|
||||
|
||||
@@ -158,20 +158,20 @@ var onStartContract = function(obj) {
|
||||
};
|
||||
|
||||
// 集群启动合约
|
||||
var startContractUnits = function(place) {
|
||||
function startContractUnits(place) {
|
||||
// ZYX
|
||||
var unitsID = $("#selectUnits")[0].value.split("_")[1];
|
||||
if(unitsID == undefined || unitsID == "选择节点集群"){
|
||||
const unitsID = $("#selectUnits")[0].value.split("_")[1];
|
||||
if (!unitsID || unitsID === "选择节点集群") {
|
||||
myToast("提示", "请选择节点集群!");
|
||||
return;
|
||||
}
|
||||
|
||||
var peersID = "";
|
||||
for ( var i in global.units[unitsID]) {
|
||||
let peersID = "";
|
||||
for (let i in global.units[unitsID]) {
|
||||
peersID += global.units[unitsID][i].pubKey + ",";
|
||||
}
|
||||
|
||||
var request = {};
|
||||
const request = {};
|
||||
|
||||
request.action = "startContractMultiPoint";
|
||||
request.peersID = peersID;
|
||||
@@ -181,8 +181,13 @@ var startContractUnits = function(place) {
|
||||
myToast("提示", "请选择集群合约模式!");
|
||||
return;
|
||||
}
|
||||
request.selectUnitNum = Number($("#selectUnitNum")[0].value);
|
||||
if (!request.selectUnitNum || isNaN(request.selectUnitNum)) {
|
||||
myToast("提示", "请填写集群规模!");
|
||||
return;
|
||||
}
|
||||
request.projectName = global.ypkName;
|
||||
if (request.projectName==undefined || request.projectName == "请选择ypk文件"){
|
||||
if (!request.projectName || request.projectName == "请选择ypk文件") {
|
||||
myToast("提示", "请选择合约!");
|
||||
return;
|
||||
}
|
||||
@@ -190,7 +195,7 @@ var startContractUnits = function(place) {
|
||||
request.sponsorPeerID = global.peerID; //peerID of the node
|
||||
console.log(request);
|
||||
global.wssocket.send(JSON.stringify(request));
|
||||
};
|
||||
}
|
||||
|
||||
var onStartTrustfulContract = function(obj) {
|
||||
console.log(obj);
|
||||
|
||||
@@ -224,7 +224,7 @@ function executeContract() {
|
||||
const arg = executeContractArgInput.value;
|
||||
const gasLimit = $('#gasLimit').val() / 1;
|
||||
request.pubkey = sm2Key.publicKey;
|
||||
var toSign = request.contractID + "|"
|
||||
let toSign = request.contractID + "|"
|
||||
+ request.operation + "|" + arg;
|
||||
if (gasLimit > 0) {
|
||||
request.gasLimit = gasLimit;
|
||||
|
||||
Reference in New Issue
Block a user