joshua/govobject-proposal
1
0
Fork 0
mirror of https://github.com/seigler/govobject-proposal synced 2025-07-27 06:46:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14 from hunterlester/development

Browse source 
step 4, generate submit command
This commit is contained in:
snogcel 2016-12-13 18:55:58 -07:00 • committed by GitHub
commit 7d3132d450
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
index.html
View file

@ -100,6 +100,8 @@
$('#feeTxid').on('input', function() { $('#feeTxid').on('input', function() {
var proposal = new ProposalGenerator(gov);
var transaction = $(this).val(); var transaction = $(this).val();
var txListener = new TXListener(socket, provider, transaction); var txListener = new TXListener(socket, provider, transaction);
@ -121,9 +123,14 @@
txListener.confirmations = res.confirmations; txListener.confirmations = res.confirmations;
txListener.initSocket(function() { txListener.initSocket(function() {
$('#walletCommandsSubmit').removeClass('hidden');
document.getElementById('step_four').click(); document.getElementById('step_four').click();
document.getElementsByClassName('progress-bar')[0].style.width = "100%"; document.getElementsByClassName('progress-bar')[0].style.width = "100%";
document.getElementsByClassName('progress-bar')[0].innerText = "Proposal ready for submission"; document.getElementsByClassName('progress-bar')[0].innerText = "Proposal ready for submission";
console.log($('#feeTxid').val());
var submitCommand = "gobject submit " + $('#parentHash').val() + " " + $('#revision').val() + " " + $('#time').val() + " " + proposal.gov.serialize() + " " + $('#feeTxid').val();
console.log(submitCommand);
$('textarea#submitProposal').val(submitCommand);
}); // callback issued after tx confirmations >= 6 }); // callback issued after tx confirmations >= 6
} }

15
js/txListener.js
View file

@ -12,6 +12,7 @@ function TXListener(socket, provider, transaction) {
TXListener.prototype.initSocket = function(cb) { TXListener.prototype.initSocket = function(cb) {
var self = this; var self = this;
var socket = this.socket; var socket = this.socket;
var confirmations = 0;
socket.on('block', function(data) { socket.on('block', function(data) {
console.log('block: '+ data); console.log('block: '+ data);
@ -19,12 +20,15 @@ TXListener.prototype.initSocket = function(cb) {
self.getBlock(data, function(err, res) { self.getBlock(data, function(err, res) {
if (err) console.log("error fetching block: " + data); if (err) console.log("error fetching block: " + data);
self.confirmations = (res.height - self.blockheight) + 1; // compare blockHeight against transaction blockHeight //self.confirmations = (res.height - self.blockheight) + 1; // compare blockHeight against transaction blockHeight
confirmations++;
if (self.confirmations >= 6) cb(); if (confirmations >= 6) {
$("#progressbar").progressbar({value: ((100 / 6) * self.confirmations)}); cb();
};
$("#progressbar").progressbar({value: ((100 / 6) * confirmations)});
console.log('confirmations: ' + self.confirmations); console.log('confirmations: ' + confirmations);
}); });
}); });
@ -41,6 +45,7 @@ TXListener.prototype.getTx = function(cb) {
format: "json" format: "json"
} }
}; };
console.log(opts);
this._fetch(opts, cb); this._fetch(opts, cb);
}; };
@ -83,4 +88,4 @@ TXListener.prototype._fetch = function(opts,cb) {
} else { } else {
cb('missing parameter',null); cb('missing parameter',null);
} }
}; };