Skip to content

Fixes bug where the proposal generator was using the testnet block ex… #4

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes bug where the proposal generator was using the testnet block ex… #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dee7f65
Fixes bug where the proposal generator was using the testnet block ex…
thomasluis Oct 15, 2018
0db0b97
Explorer's current state. Changes to paymentcycle.js
Nov 6, 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
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ <h2>Wallet Commands</h2>

<div class="form-group">
<label for="feeTxid">Confirm Transaction:</label>
<p id="progresstxt">Waiting for 6 block confirmations, this should take approximately 15 minutes.</p>
<p id="progresstxt">Waiting for 6 block confirmations, this should take approximately 1 hour.</p>
<div id="progressbar"></div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ var Bitcore = require('@anonymousbitcoin/anoncore-lib');
var socket;
var paymentCycle;

var mainnetProvider = 'http://texplorer.anonfork.io/';
var mainnetProvider = 'https://explorer.anonfork.io/';
var mainnetPrefix = 'insight-api-anon';

var testnetProvider = 'http://texplorer.anonfork.io/';
var testnetProvider = 'https://explorer.anonfork.io/';
var testnetPrefix = 'insight-api-anon';

var init = function(network, provider, prefix) {
Expand Down
12 changes: 6 additions & 6 deletions js/paymentCycle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ function PaymentCycle(gov, provider, prefix) {
this.network = gov.network;
this.provider = provider;
this.prefix = prefix;
this.paymentCycle = 16616;
this.proposalMaturity = 1662; // ~(60*24*3)/2.6 = about three days
this.budgetCycles = 24;
this.paymentCycle = 4320;
this.proposalMaturity = 432; // ~(60*24*3)/10 = about three days
this.budgetCycles = 99;

this.selectedStartIndex = 0;
this.selectedPeriods = 1;
Expand Down Expand Up @@ -58,7 +58,7 @@ PaymentCycle.prototype.getBlockTimestamp = function(block) {
var blocks = block - this.blockHeight;
var now = Math.floor(Date.now());

return (now + (blocks * (155 * 1000))); // 155 seconds per block x 1000 = ms per block
return (now + (blocks * (600 * 1000))); // 155 seconds per block x 1000 = ms per block
};

PaymentCycle.prototype.getTimeDifference = function(opts, start, end) {
Expand Down Expand Up @@ -147,7 +147,7 @@ PaymentCycle.prototype.updateDropdowns = function() {
$.each(this.startDate, function(index) {
var eta = self.getTimeDifference(opts, now, this.timestamp);
var time = this.timestamp - now;
var option = $("<option />").val((Math.floor(this.before / 1000))).text(this.label).attr('data-index', index).attr('data-time', time).attr('data-eta', eta).attr('data-block', this.superblock);
var option = $("<option />").val((Math.floor(this.before))).text(this.label).attr('data-index', index).attr('data-time', time).attr('data-eta', eta).attr('data-block', this.superblock);
start_epoch.append(option);

});
Expand Down Expand Up @@ -178,7 +178,7 @@ PaymentCycle.prototype.updateEndEpoch = function() {
var eta = self.getTimeDifference(opts, self.startDate[self.selectedStartIndex].timestamp, this.timestamp);
var time = this.timestamp - self.startDate[self.selectedStartIndex].timestamp;

var option = $("<option />").val((Math.floor(this.after / 1000))).text((i+" "+payments)).attr('data-index', index).attr('data-label', this.label).attr('data-time', time).attr('data-eta', eta).attr('data-block', this.superblock);
var option = $("<option />").val((Math.floor(this.after))).text((i+" "+payments)).attr('data-index', index).attr('data-label', this.label).attr('data-time', time).attr('data-eta', eta).attr('data-block', this.superblock);
end_epoch.append(option);

i++;
Expand Down
22 changes: 0 additions & 22 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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 @@ -20,7 +20,7 @@
},
"homepage": "https://github.com/anonymousbitcoin/proposal-generator#readme",
"devDependencies": {
"@anonymousbitcoin/anoncore-lib": "^0.15.7",
"@anonymousbitcoin/anoncore-lib": "github:anonymousbitcoin/bitcore-lib-anon#feature/governance",
"browserify": "^14.3.0",
"eslint": "^4.8.0"
},
Expand Down