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

Compare commits

base: bdware:c73d1cfabfff48d0790480289890399ad2936f20
Branches Tags
bdware:master bdware:proj/zhizhen bdware:proj/nanning
bdware:v1.6.6 bdware:v1.4.5
...
compare: bdware:v1.6.6
Branches Tags
bdware:master bdware:proj/zhizhen bdware:proj/nanning
bdware:v1.6.6 bdware:v1.4.5

7 Commits
c73d1cfabf ... v1.6.6

Author SHA1 Message Date
Frank.R.Wu
cdcdfbdfde fix: add a lost file 
add jquery-2.1.4.js to fix frontend bugs
 2021-12-23 21:40:54 +08:00
CaiHQ
d0f8af9851 optimize: use jquery 2.1.4.min 
refactor: DOA Contract
update: use doip sdk 1.0.2
 2021-12-22 22:07:51 +08:00
Frank.R.Wu
965ee67409 fix: fix bugs in executeContract of NodeContractInstances.js 2021-12-12 12:25:36 +08:00
Frank.R.Wu
0dfa8a555a style 2021-12-11 19:15:13 +08:00
CaiHQ
37476bd506 merge pbft algorithm 2021-11-22 11:50:39 +08:00
Frank.R.Wu
89360bbf0c feat: add SelfAdaptiveShardingExecutor 
add new type of multi-point contract "SelfAdaptiveSharding"
 2021-11-11 12:52:38 +08:00
bitvincent
f6c898dc9e fix:typo error (shading->sharding) 2021-11-04 18:31:16 +08:00
8 changed files with 79 additions and 9273 deletions
Expand all files Collapse all files

14
NodePortal.html
View File

@@ -280,7 +280,9 @@
<option value="3">RARF</option>
<option value="4">RARH</option>
<option value="5">RARA</option>
<option value="6">Shading</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>

2
NodePortal_Gateway.html
View File

@@ -284,7 +284,7 @@
<option value="3">RARF</option>
<option value="4">RARH</option>
<option value="5">RARA</option>
<option value="6">Shading</option>
<option value="6">Sharding</option>
</select>
<div class="btn-group mr-3" role="group"
style="margin-left: 2%">

2
index_gate.html
View File

@@ -284,7 +284,7 @@
<option value="3">RARF</option>
<option value="4">RARH</option>
<option value="5">RARA</option>
<option value="6">Shading</option>
<option value="6">Sharding</option>
</select>
<div class="btn-group mr-3" role="group"
style="margin-left: 2%">

BIN
jqueryui1.12/.index.html.swp
View File

Binary file not shown.

9214
jqueryui1.12/jquery-2.1.4.js vendored Executable file → Normal file
View File

File diff suppressed because one or more lines are too long

33
js/NodeContractInstances.js
View File

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

29
js/codeManage/operManage.js
View File

@@ -158,39 +158,44 @@ var onStartContract = function(obj) {
};
// 集群启动合约
var startContractUnits = function(place) {
function startContractUnits(place) {
// ZYX
var unitsID = $("#selectUnits")[0].value.split("_")[1];
if(unitsID == undefined || unitsID == "选择节点集群"){
myToast("提示","请选择节点集群!");
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;
request.type = $("#sequence")[0].value;
console.log(request.type);
if (request.type==0){
myToast("提示","请选择集群合约模式!");
if (request.type == 0) {
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文件"){
myToast("提示","请选择合约!");
if (!request.projectName || request.projectName == "请选择ypk文件") {
myToast("提示", "请选择合约!");
return;
}
request.isPrivate = global.ypkIsPrivate;
request.sponsorPeerID = global.peerID; //peerID of the node
console.log(request);
global.wssocket.send(JSON.stringify(request));
};
}
var onStartTrustfulContract = function(obj) {
console.log(obj);

14
js/onlineide/rightmenu.js
View File

@@ -174,7 +174,7 @@ function importContractInstanceCodeByDOI() {
function openInClient() {
let path = document.location.pathname.lastIndexOf("/ide");
if (path>0)
if (path > 0)
path = document.location.pathname.substr(0, path + 1);
else path = "/";
window.open(isBaaS ?
@@ -222,15 +222,15 @@ function executeContract() {
request.contractID = contract.id;
request.operation = contract.exportedFunctions[selectedFunction.value].functionName;
const arg = executeContractArgInput.value;
const gasLimit = $('#gasLimit').val()/1;
const gasLimit = $('#gasLimit').val() / 1;
request.pubkey = sm2Key.publicKey;
var toSign = request.contractID + "|"
+ request.operation + "|" + arg ;
if (gasLimit>0){
let toSign = request.contractID + "|"
+ request.operation + "|" + arg;
if (gasLimit > 0) {
request.gasLimit = gasLimit;
toSign+= "|" + gasLimit;
toSign += "|" + gasLimit;
}
toSign+= "|" + sm2Key.publicKey;
toSign += "|" + sm2Key.publicKey;
request.signature = sm2.doSignature(
toSign,
sm2Key.privateKey,