Skip to content

Remove witnessing #1

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

Open
LeonYanghaha wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Remove witnessing #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
50f3a4f
runnable in stage2
May 2, 2018
90a343e
fix bug
May 3, 2018
1326ef4
test
LeonYanghaha May 7, 2018
47cb98b
delete test file
LeonYanghaha May 7, 2018
01323db
delete witness
LeonYanghaha May 7, 2018
1bf0e89
delete witness
LeonYanghaha May 7, 2018
000a504
test
LeonYanghaha May 8, 2018
fc46e35
delete test file
LeonYanghaha May 8, 2018
5c47d0b
display last_ball_unit & is_on_main_chain
LeonYanghaha May 10, 2018
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
23 changes: 13 additions & 10 deletions controllers/units.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ function getUnitSequence(unit, cb) {
});
}


function getInfoOnUnit(unit, cb) {
storage.readUnitProps(db, unit, function(unitProps) {
storage.readJoint(db, unit, {
Expand Down Expand Up @@ -282,19 +283,21 @@ function getInfoOnUnit(unit, cb) {
messages: objJoint.unit.messages,
transfersInfo: transfersInfo,
outputsUnit: unitOutputs,
is_on_main_chain:unitProps.is_on_main_chain,
date: moment(objJoint.unit.timestamp * 1000).format(),
assocCommissions: assocCommissions
};
if (objJoint.unit.witnesses) {
objInfo.witnesses = objJoint.unit.witnesses;
cb(objInfo);
}
else {
storage.readWitnesses(db, unit, function(arrWitnesses) {
objInfo.witnesses = arrWitnesses;
cb(objInfo);
});
}
// if (objJoint.unit.witnesses) {
// objInfo.witnesses = objJoint.unit.witnesses;
// cb(objInfo);
// }
// else {
// storage.readWitnesses(db, unit, function(arrWitnesses) {
// objInfo.witnesses = arrWitnesses;
// cb(objInfo);
// });
// }
cb(objInfo);
});
});
});
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"async": "^2.1.5",
"trustnote-common": "git+https://github.com/trustnote/trustnote-common.git",
"trustnote-common": "file:../trustnote-common",
"express": "^4.14.0",
"moment": "^2.17.1",
"socket.io": "^1.7.1"
Expand Down
11 changes: 6 additions & 5 deletions public/js/detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ function generateMessageInfo(messages, transfersInfo, outputsUnit, assocCommissi
socket.on('info', function(data) {
if (bWaitingForHighlightNode) bWaitingForHighlightNode = false;
if (data) {
var childOut = '', parentOut = '', authorsOut = '', witnessesOut = '';
var childOut = '', parentOut = '', authorsOut = ''/*, witnessesOut = ''*/;
data.child.forEach(function(unit) {
childOut += '<div><a href="#' + unit + '">' + unit + '</a></div>';
});
Expand All @@ -870,9 +870,9 @@ socket.on('info', function(data) {
}
authorsOut += '</div>';
});
data.witnesses.forEach(function(witness) {
witnessesOut += '<div><a href="#' + witness + '">' + witness + '</a></div>';
});
//data.witnesses.forEach(function(witness) {
// witnessesOut += '<div><a href="#' + witness + '">' + witness + '</a></div>';
//});

$('#unit').html(data.unit);
$('#children').html(childOut);
Expand All @@ -886,7 +886,8 @@ socket.on('info', function(data) {
$('#main_chain_index').html(data.main_chain_index);
$('#latest_included_mc_index').html(data.latest_included_mc_index);
$('#is_stable').html(data.is_stable);
$('#witnesses').html(witnessesOut);
$('#is_on_main_chain').html(data.is_on_main_chain);
//$('#witnesses').html(witnessesOut);
$('#messages').html(data.sequence === 'final-bad' ? '' : generateMessageInfo(data.messages, data.transfersInfo, data.outputsUnit, data.assocCommissions));
if ($('#listInfo').css('display') === 'none') {
$('#defaultInfo').hide();
Expand Down
10 changes: 5 additions & 5 deletions public/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ function generateMessageInfo(messages, transfersInfo, outputsUnit, assocCommissi
socket.on('info', function (data) {
if (bWaitingForHighlightNode) bWaitingForHighlightNode = false;
if (data) {
var childOut = '', parentOut = '', authorsOut = '', witnessesOut = '';
var childOut = '', parentOut = '', authorsOut = '' /* , witnessesOut = '' */;
data.child.forEach(function (unit) {
childOut += '<div><a href="#' + unit + '">' + unit + '</a></div>';
});
Expand All @@ -884,9 +884,9 @@ socket.on('info', function (data) {
//authorsOut += '</div>';
authorsOut += '';
});
data.witnesses.forEach(function (witness) {
witnessesOut += '<div><a href="#' + witness + '">' + witness + '</a></div>';
});
//data.witnesses.forEach(function (witness) {
// witnessesOut += '<div><a href="#' + witness + '">' + witness + '</a></div>';
//});

$('#unit').html(data.unit);
$('#children').html(childOut);
Expand All @@ -900,7 +900,7 @@ socket.on('info', function (data) {
$('#main_chain_index').html(data.main_chain_index);
$('#latest_included_mc_index').html(data.latest_included_mc_index);
$('#is_stable').html(data.is_stable);
$('#witnesses').html(witnessesOut);
//$('#witnesses').html(witnessesOut);
$('#messages').html(data.sequence === 'final-bad' ? '' : generateMessageInfo(data.messages, data.transfersInfo, data.outputsUnit, data.assocCommissions));
if ($('#listInfo').css('display') === 'none') {
$('#defaultInfo').hide();
Expand Down
16 changes: 8 additions & 8 deletions relay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ function start () {
network.findOutboundPeerOrConnect(url);
});
}

replaceConsoleLog();
myWitnesses.readMyWitnesses(function (arrWitnesses) {
if (arrWitnesses.length > 0)
return start();
console.log('will init witnesses', conf.initial_witnesses);
myWitnesses.insertWitnesses(conf.initial_witnesses, start);
}, 'ignore');
start();
// replaceConsoleLog();
// myWitnesses.readMyWitnesses(function (arrWitnesses) {
// if (arrWitnesses.length > 0)
// return start();
// console.log('will init witnesses', conf.initial_witnesses);
// myWitnesses.insertWitnesses(conf.initial_witnesses, start);
// }, 'ignore');
11 changes: 8 additions & 3 deletions views/detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<!-- <a id="menuSocialSlack" href="#"><img src="/img/Slack_Mark.svg"></a> -->
</div>
<div id="menuLeft">
<a href="http://explorer.trustnote.org" id="menuLeftImg"><img src="/img/logo.png"></a>
<div id="menuLeftTitle"><a href="http://explorer.trustnote.org">TrustNote</a></div>
<a href="./" id="menuLeftImg"><img src="/img/logo.png"></a>
<div id="menuLeftTitle"><a href="./">TrustNote</a></div>
</div>
<div id="menuRight">
<div id="menuInput">
Expand Down Expand Up @@ -87,10 +87,15 @@
<div id="divFees">Fees: <span id="fees"></span></div>
<div>Level: <span id="level"></span></div>
<div style="display: none;">Witnessed level: <span id="witnessed_level"></span></div>
<div style="display: none;">Last ball unit: <span id="last_ball_unit"></span></div>

<div>Main chain index: <span id="main_chain_index"></span></div>
<div>Latest included mc index: <span id="latest_included_mc_index"></span></div>
<div>Is stable: <span id="is_stable"></span></div>

<div>Last ball unit: <span id="last_ball_unit"></span></div>
<div>Is_on_main_chain: <span id="is_on_main_chain"></span></div>
<br/>
<br/>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions views/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<!--top bar-->
<div id="menu" class="rowFull">
<div id="menuLeft">
<a href="http://explorer.trustnote.org" id="menuLeftImg"><img src="/img/logo.png"></a>
<div id="menuLeftTitle"><a href="http://explorer.trustnote.org">TrustNote</a></div>
<a href="./" id="menuLeftImg"><img src="/img/logo.png"></a>
<div id="menuLeftTitle"><a href="./">TrustNote</a></div>
</div>
<div id="menuRight">
<div id="menuInput">
Expand Down