mirror of
https://github.com/seigler/govobject-proposal
synced 2025-07-27 06:46:10 +00:00
refactor: tx listener and superblock date selection fields (#6)
This commit is contained in:
Cofresi
snogcel
parent
6cae0e6ec5
commit
c28f342ec3
1 changed files with 316 additions and 310 deletions
446
index.html
446
index.html
|
|
@ -27,96 +27,10 @@
|
|||
|
||||
$("#time").val(Math.floor((new Date).getTime() / 1000));
|
||||
|
||||
var opts = { dateFormat: $.datepicker.ISO_8601 }; // TODO remove
|
||||
prepareTime();
|
||||
|
||||
$("#progresstxt").text(progresstxt);
|
||||
|
||||
$.getJSON(apiserversocket + "insight-api-dash/status?q=getinfo", function( data ) {
|
||||
var timefield = $("#time");
|
||||
timefield.val(Math.floor((new Date).getTime() / 1000));
|
||||
console.log('time: ' + timefield.val());
|
||||
blockheight = data.info.blocks;
|
||||
console.log('network: ' + gov.network);
|
||||
var budgetPaymentCycleBlocks = getBudgetPaymentCycleBlocks();
|
||||
var nextsuperblock = Math.round(blockheight/budgetPaymentCycleBlocks) * budgetPaymentCycleBlocks;
|
||||
var selectblock = nextsuperblock;
|
||||
|
||||
console.log('budgetPaymentCycleBlocks: ' + budgetPaymentCycleBlocks);
|
||||
console.log('blockheight: ' + blockheight);
|
||||
console.log('next superblock ' + nextsuperblock);
|
||||
|
||||
var optionsStart = [];
|
||||
var optionsEnd = [];
|
||||
var numOfSuperBlockDates = 12;
|
||||
|
||||
// Clear the options first
|
||||
var start_epoch = $("#start_epoch");
|
||||
var end_epoch = $("#end_epoch");
|
||||
start_epoch.find("option").each(function(index, option) {
|
||||
$(option).remove();
|
||||
});
|
||||
end_epoch.find("option").each(function(index, option) {
|
||||
$(option).remove();
|
||||
});
|
||||
|
||||
var blocksleft = nextsuperblock - blockheight;
|
||||
for (i = 0; i < numOfSuperBlockDates; i ++)
|
||||
{
|
||||
var timeleft;
|
||||
var blockdiff = nextsuperblock - blockheight;
|
||||
var nextsuperblocktimestamp = $.now() + blockdiff * (2.6 * 60 * 1000);
|
||||
var d = $.datepicker.formatDate('yy-mm-dd', new Date(nextsuperblocktimestamp));
|
||||
|
||||
if (i == 0) {
|
||||
var daysleft = Math.round( blocksleft/554 * 10) / 10; // day rounded to one decimal
|
||||
if (daysleft >= 2) {
|
||||
timeleft = daysleft + ' days'
|
||||
}
|
||||
else {
|
||||
timeleft = daysleft + ' day'
|
||||
}
|
||||
optionsStart.push("<option value='" + nextsuperblock + "'>block " + nextsuperblock + " in " + timeleft + " (" + d + ")</option>");
|
||||
}
|
||||
else {
|
||||
if (i == 1) {
|
||||
timeleft = '1 month';
|
||||
}
|
||||
else {
|
||||
timeleft = i + ' months';
|
||||
}
|
||||
optionsStart.push("<option value='" + nextsuperblock + "'>block " + nextsuperblock + " in " + timeleft + " (" + d + ")</option>");
|
||||
if (i == numOfSuperBlockDates - 1) {
|
||||
timeleft = numOfSuperBlockDates + ' month';
|
||||
nextsuperblock += budgetPaymentCycleBlocks;
|
||||
}
|
||||
}
|
||||
nextsuperblock += budgetPaymentCycleBlocks;
|
||||
}
|
||||
|
||||
start_epoch.append(optionsStart.join(""));
|
||||
|
||||
//populate budget cycle dropdown
|
||||
for (i = 1; i < 100; i ++)
|
||||
{
|
||||
if (i == 1) {
|
||||
optionsEnd.push("<option value='" + i + "'>one-time payment</option>");
|
||||
}
|
||||
else {
|
||||
optionsEnd.push("<option value='" + i + "'>payment once a month for " + i + " months</option>");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
end_epoch.append(optionsEnd.join(""));
|
||||
|
||||
//if next superblock is less than 3 days (60*24*3/2.6) away, select next month's superblock by default so proposal has more time to be voted upon
|
||||
if (selectblock - blockheight < (60*24*bufferdays/2.6)) {
|
||||
selectblock += budgetPaymentCycleBlocks;
|
||||
start_epoch.val(selectblock);
|
||||
nextsuperblocktimestamp = nextsuperblocktimestamp + budgetPaymentCycleBlocks * (2.6 * 60 * 1000);
|
||||
}
|
||||
});
|
||||
|
||||
$('#prepareProposal').click(function() {
|
||||
copyToClipboard($(this).attr('id'));
|
||||
});
|
||||
|
|
@ -149,6 +63,150 @@
|
|||
|
||||
proposal.walletCommands();
|
||||
|
||||
proposal.transactionListener(proposal);
|
||||
|
||||
$('#btnEdit').click(function() {
|
||||
proposal.createProposal();
|
||||
});
|
||||
|
||||
$('#btnNew').click(function() {
|
||||
proposal.resetProposal();
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
var ProposalGenerator = function(gov) {
|
||||
this._mode = 'proposal';
|
||||
this.gov = gov;
|
||||
this.gov.network = 'livenet';
|
||||
|
||||
// proposal basic fields
|
||||
this.gov.name = $('#name').val();
|
||||
this.gov.url = $('#url').val();
|
||||
this.gov.payment_address = $('#payment_address').val();
|
||||
this.gov.payment_amount = parseFloat($('#payment_amount').val());
|
||||
|
||||
// format dates for govobject serialization
|
||||
var start_epoch = $('#start_epoch');
|
||||
var startdate = formattedDateForSuperblockHeight(start_epoch.val());
|
||||
|
||||
console.log('startdate: ' + startdate);
|
||||
this.gov.start_epoch = (new Date(startdate) / 1000) || null;
|
||||
|
||||
var enddate = formattedDateForSuperblockHeight(start_epoch.val(),$('#end_epoch').val());
|
||||
console.log('enddate: ' + enddate);
|
||||
|
||||
this.gov.end_epoch = (new Date(enddate) / 1000) || null;
|
||||
|
||||
// hidden elements
|
||||
this.gov.type = parseInt($('#type').val());
|
||||
};
|
||||
|
||||
ProposalGenerator.prototype.validate = function() {
|
||||
try {
|
||||
var gov = this.gov.serialize();
|
||||
}
|
||||
catch (e) {
|
||||
|
||||
switch(e.message) {
|
||||
|
||||
case 'Invalid Name':
|
||||
console.log("error: invalid name");
|
||||
$('#name').addClass('validationError');
|
||||
$('#name').val("Invalid name. Please enter a name without spaces and weird characters. E.g. can use a '-' or '_' instead of a space.");
|
||||
break;
|
||||
|
||||
case 'Invalid URL':
|
||||
console.log("Error: invalid url");
|
||||
$('#url').addClass('validationError');
|
||||
$('#url').val("There is a formatting error in your URL. Did you forget the leading 'http://'?");
|
||||
break;
|
||||
|
||||
case 'Invalid Payment Amount':
|
||||
console.log("Error: invalid payment amount");
|
||||
$('#payment_amount').addClass('validationError');
|
||||
$('#payment_amount').val("Invalid payment amount. Please enter a number from 1 - 7500");
|
||||
break;
|
||||
|
||||
case 'Invalid Timespan':
|
||||
console.log("Error: invalid timespan");
|
||||
$('#start_epoch, #end_epoch').addClass('validationError');
|
||||
break;
|
||||
|
||||
case 'Invalid Start Date':
|
||||
console.log("Error: invalid start date");
|
||||
$('#start_epoch').addClass('validationError');
|
||||
break;
|
||||
|
||||
case 'Invalid End Date':
|
||||
console.log("Error: invalid end date");
|
||||
$('#end_epoch').addClass('validationError');
|
||||
break;
|
||||
|
||||
case 'Invalid Address':
|
||||
console.log("Error: invalid address");
|
||||
$('#payment_address').addClass('validationError');
|
||||
$('#payment_address').val("Invalid Dash Address. Please just copy & paste from wallet.");
|
||||
break;
|
||||
|
||||
default:
|
||||
console.log(e);
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
};
|
||||
|
||||
ProposalGenerator.prototype.walletCommands = function() {
|
||||
var gov = this.gov;
|
||||
|
||||
var prepCommand = "gobject prepare "+$('#parentHash').val() + " " + $('#revision').val() +" " + $('#time').val() +" " + gov.serialize();
|
||||
console.log(prepCommand);
|
||||
$("textarea#prepareProposal").val(prepCommand);
|
||||
|
||||
if(this._mode == 'proposal') {
|
||||
setFormEditable(true);
|
||||
|
||||
$('.walletCommands#walletCommandsHeader').removeClass('hidden');
|
||||
$('.walletCommands#walletCommandsPrepare').removeClass('hidden');
|
||||
$('.walletCommands#walletCommandsTx').removeClass('hidden');
|
||||
//$('.walletCommands#walletCommandsProgress').removeClass('hidden');
|
||||
//$('.walletCommands#walletCommandsSubmit').removeClass('hidden');
|
||||
|
||||
this._mode = 'command';
|
||||
}
|
||||
};
|
||||
|
||||
ProposalGenerator.prototype.createProposal = function() {
|
||||
$('#feeTxid').val("");
|
||||
$('#submitProposal').val("");
|
||||
|
||||
if(this._mode == 'command') {
|
||||
setFormEditable(false);
|
||||
|
||||
$('.walletCommands#walletCommandsHeader').addClass('hidden');
|
||||
$('.walletCommands#walletCommandsPrepare').addClass('hidden');
|
||||
$('.walletCommands#walletCommandsTx').addClass('hidden');
|
||||
$('.walletCommands#walletCommandsProgress').addClass('hidden');
|
||||
$('.walletCommands#walletCommandsSubmit').addClass('hidden');
|
||||
|
||||
this._mode = 'proposal';
|
||||
}
|
||||
};
|
||||
|
||||
ProposalGenerator.prototype.resetProposal = function() {
|
||||
$('.createProposal input').each(function() {
|
||||
$(this).val('');
|
||||
});
|
||||
setFormEditable(true);
|
||||
};
|
||||
|
||||
ProposalGenerator.prototype.transactionListener = function(proposal) {
|
||||
|
||||
$('#feeTxid').on('input', function() {
|
||||
if ($(this).val().length > 0) {
|
||||
|
||||
|
|
@ -371,145 +429,93 @@
|
|||
}
|
||||
|
||||
});
|
||||
|
||||
$('#btnEdit').click(function() {
|
||||
proposal.createProposal();
|
||||
});
|
||||
|
||||
$('#btnNew').click(function() {
|
||||
proposal.resetProposal();
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
var ProposalGenerator = function(gov) {
|
||||
this._mode = 'proposal';
|
||||
this.gov = gov;
|
||||
this.gov.network = 'livenet';
|
||||
|
||||
// proposal basic fields
|
||||
this.gov.name = $('#name').val();
|
||||
this.gov.url = $('#url').val();
|
||||
this.gov.payment_address = $('#payment_address').val();
|
||||
this.gov.payment_amount = parseFloat($('#payment_amount').val());
|
||||
|
||||
// format dates for gobject serialization
|
||||
var start_epoch = $('#start_epoch');
|
||||
var startdate = formattedDateForSuperblockHeight(start_epoch.val());
|
||||
|
||||
console.log('startdate: ' + startdate);
|
||||
this.gov.start_epoch = (new Date(startdate) / 1000) || null;
|
||||
|
||||
var enddate = formattedDateForSuperblockHeight(start_epoch.val(),$('#end_epoch').val());
|
||||
console.log('enddate: ' + enddate);
|
||||
|
||||
this.gov.end_epoch = (new Date(enddate) / 1000) || null;
|
||||
|
||||
// hidden elements
|
||||
this.gov.type = parseInt($('#type').val());
|
||||
};
|
||||
|
||||
ProposalGenerator.prototype.validate = function() {
|
||||
try {
|
||||
var gov = this.gov.serialize();
|
||||
}
|
||||
catch (e) {
|
||||
prepareTime = function() {
|
||||
$.getJSON(apiserversocket + "insight-api-dash/status?q=getinfo", function( data ) {
|
||||
var timefield = $("#time");
|
||||
timefield.val(Math.floor((new Date).getTime() / 1000));
|
||||
console.log('time: ' + timefield.val());
|
||||
blockheight = data.info.blocks;
|
||||
console.log('network: ' + gov.network);
|
||||
var budgetPaymentCycleBlocks = getBudgetPaymentCycleBlocks();
|
||||
var nextsuperblock = Math.round(blockheight/budgetPaymentCycleBlocks) * budgetPaymentCycleBlocks;
|
||||
var selectblock = nextsuperblock;
|
||||
|
||||
switch(e.message) {
|
||||
console.log('budgetPaymentCycleBlocks: ' + budgetPaymentCycleBlocks);
|
||||
console.log('blockheight: ' + blockheight);
|
||||
console.log('next superblock ' + nextsuperblock);
|
||||
|
||||
case 'Invalid Name':
|
||||
console.log("error: invalid name");
|
||||
$('#name').addClass('validationError');
|
||||
$('#name').val("Invalid name. Please enter a name without spaces and weird characters. E.g. can use a '-' or '_' instead of a space.");
|
||||
break;
|
||||
var optionsStart = [];
|
||||
var optionsEnd = [];
|
||||
var numOfSuperBlockDates = 12;
|
||||
|
||||
case 'Invalid URL':
|
||||
console.log("Error: invalid url");
|
||||
$('#url').addClass('validationError');
|
||||
$('#url').val("There is a formatting error in your URL. Did you forget the leading 'http://'?");
|
||||
break;
|
||||
|
||||
case 'Invalid Payment Amount':
|
||||
console.log("Error: invalid payment amount");
|
||||
$('#payment_amount').addClass('validationError');
|
||||
$('#payment_amount').val("Invalid payment amount. Please enter a number from 1 - 7500");
|
||||
break;
|
||||
|
||||
case 'Invalid Timespan':
|
||||
console.log("Error: invalid timespan");
|
||||
$('#start_epoch, #end_epoch').addClass('validationError');
|
||||
break;
|
||||
|
||||
case 'Invalid Start Date':
|
||||
console.log("Error: invalid start date");
|
||||
$('#start_epoch').addClass('validationError');
|
||||
break;
|
||||
|
||||
case 'Invalid End Date':
|
||||
console.log("Error: invalid end date");
|
||||
$('#end_epoch').addClass('validationError');
|
||||
break;
|
||||
|
||||
case 'Invalid Address':
|
||||
console.log("Error: invalid address");
|
||||
$('#payment_address').addClass('validationError');
|
||||
$('#payment_address').val("Invalid Dash Address. Please just copy & paste from wallet.");
|
||||
break;
|
||||
|
||||
default:
|
||||
console.log(e);
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
};
|
||||
|
||||
ProposalGenerator.prototype.walletCommands = function() {
|
||||
var gov = this.gov;
|
||||
|
||||
var prepCommand = "gobject prepare "+$('#parentHash').val() + " " + $('#revision').val() +" " + $('#time').val() +" " + gov.serialize();
|
||||
console.log(prepCommand);
|
||||
$("textarea#prepareProposal").val(prepCommand);
|
||||
|
||||
if(this._mode == 'proposal') {
|
||||
setFormEditable(true);
|
||||
|
||||
$('.walletCommands#walletCommandsHeader').removeClass('hidden');
|
||||
$('.walletCommands#walletCommandsPrepare').removeClass('hidden');
|
||||
$('.walletCommands#walletCommandsTx').removeClass('hidden');
|
||||
//$('.walletCommands#walletCommandsProgress').removeClass('hidden');
|
||||
//$('.walletCommands#walletCommandsSubmit').removeClass('hidden');
|
||||
|
||||
this._mode = 'command';
|
||||
}
|
||||
};
|
||||
|
||||
ProposalGenerator.prototype.createProposal = function() {
|
||||
$('#feeTxid').val("");
|
||||
$('#submitProposal').val("");
|
||||
|
||||
if(this._mode == 'command') {
|
||||
setFormEditable(false);
|
||||
|
||||
$('.walletCommands#walletCommandsHeader').addClass('hidden');
|
||||
$('.walletCommands#walletCommandsPrepare').addClass('hidden');
|
||||
$('.walletCommands#walletCommandsTx').addClass('hidden');
|
||||
$('.walletCommands#walletCommandsProgress').addClass('hidden');
|
||||
$('.walletCommands#walletCommandsSubmit').addClass('hidden');
|
||||
|
||||
this._mode = 'proposal';
|
||||
}
|
||||
};
|
||||
|
||||
ProposalGenerator.prototype.resetProposal = function() {
|
||||
$('.createProposal input').each(function() {
|
||||
$(this).val('');
|
||||
// Clear the options first
|
||||
var start_epoch = $("#start_epoch");
|
||||
var end_epoch = $("#end_epoch");
|
||||
start_epoch.find("option").each(function(index, option) {
|
||||
$(option).remove();
|
||||
});
|
||||
end_epoch.find("option").each(function(index, option) {
|
||||
$(option).remove();
|
||||
});
|
||||
|
||||
var blocksleft = nextsuperblock - blockheight;
|
||||
for (i = 0; i < numOfSuperBlockDates; i ++)
|
||||
{
|
||||
var timeleft;
|
||||
var blockdiff = nextsuperblock - blockheight;
|
||||
var nextsuperblocktimestamp = $.now() + blockdiff * (2.6 * 60 * 1000);
|
||||
var d = $.datepicker.formatDate('yy-mm-dd', new Date(nextsuperblocktimestamp));
|
||||
|
||||
if (i == 0) {
|
||||
var daysleft = Math.round( blocksleft/554 * 10) / 10; // day rounded to one decimal
|
||||
if (daysleft >= 2) {
|
||||
timeleft = daysleft + ' days'
|
||||
}
|
||||
else {
|
||||
timeleft = daysleft + ' day'
|
||||
}
|
||||
optionsStart.push("<option value='" + nextsuperblock + "'>block " + nextsuperblock + " in " + timeleft + " (" + d + ")</option>");
|
||||
}
|
||||
else {
|
||||
if (i == 1) {
|
||||
timeleft = '1 month';
|
||||
}
|
||||
else {
|
||||
timeleft = i + ' months';
|
||||
}
|
||||
optionsStart.push("<option value='" + nextsuperblock + "'>block " + nextsuperblock + " in " + timeleft + " (" + d + ")</option>");
|
||||
if (i == numOfSuperBlockDates - 1) {
|
||||
timeleft = numOfSuperBlockDates + ' month';
|
||||
nextsuperblock += budgetPaymentCycleBlocks;
|
||||
}
|
||||
}
|
||||
nextsuperblock += budgetPaymentCycleBlocks;
|
||||
}
|
||||
|
||||
start_epoch.append(optionsStart.join(""));
|
||||
|
||||
//populate budget cycle dropdown
|
||||
for (i = 1; i < 100; i ++)
|
||||
{
|
||||
if (i == 1) {
|
||||
optionsEnd.push("<option value='" + i + "'>one-time payment</option>");
|
||||
}
|
||||
else {
|
||||
optionsEnd.push("<option value='" + i + "'>payment once a month for " + i + " months</option>");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
end_epoch.append(optionsEnd.join(""));
|
||||
|
||||
//if next superblock is less than n (bufferdays) days (60*24*bufferdays/2.6) away, select next month's superblock by default so proposal has more time to be voted upon
|
||||
if (selectblock - blockheight < (60*24*bufferdays/2.6)) {
|
||||
selectblock += budgetPaymentCycleBlocks;
|
||||
start_epoch.val(selectblock);
|
||||
}
|
||||
});
|
||||
setFormEditable(true);
|
||||
};
|
||||
|
||||
function setFormEditable(edit) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue