diff --git a/config.default.js b/config.default.js index b88f9fc..38c7fbb 100644 --- a/config.default.js +++ b/config.default.js @@ -5,9 +5,6 @@ module.exports = { //The Author author: "Anonymous", - //Include block.one distribution in snapshot - include_b1: true, - //Minimum balance required for snapshot inclusion. //Note: 1 EOS is recommended, as there will be a minimum balance required to have the bandwidth required for a functional account. Additionally, this prevents dust from appearing as an initial accounts, and cleans up the chain. snapshot_minimum_balance: 1, diff --git a/tools/snapshot/classes/Wallet.Final.js b/tools/snapshot/classes/Wallet.Final.js index e9e6630..86aa727 100644 --- a/tools/snapshot/classes/Wallet.Final.js +++ b/tools/snapshot/classes/Wallet.Final.js @@ -53,7 +53,7 @@ class WalletFinal extends Wallet { process_exclude(complete){ const exclude = [CS_ADDRESS_CROWDSALE, CS_ADDRESS_TOKEN] - if(!this.config.include_b1) exclude.push(CS_ADDRESS_B1) + // if(!this.config.include_b1) exclude.push(CS_ADDRESS_B1) if(exclude.indexOf(this.address) > -1) this.accepted = false, this.register_error = 'exclude' diff --git a/tools/snapshot/classes/Wallet.Ongoing.js b/tools/snapshot/classes/Wallet.Ongoing.js index 52e78ee..1f8cac2 100644 --- a/tools/snapshot/classes/Wallet.Ongoing.js +++ b/tools/snapshot/classes/Wallet.Ongoing.js @@ -60,7 +60,7 @@ class WalletOngoing extends Wallet { process_exclude(complete){ const exclude = [CS_ADDRESS_CROWDSALE, CS_ADDRESS_TOKEN] - if(!this.config.include_b1) exclude.push(CS_ADDRESS_B1) + // if(!this.config.include_b1) exclude.push(CS_ADDRESS_B1) if(exclude.indexOf(this.address) > -1) this.accepted = false, this.register_error = 'exclude' diff --git a/tools/snapshot/prompt.js b/tools/snapshot/prompt.js index 6882cec..f80b3eb 100644 --- a/tools/snapshot/prompt.js +++ b/tools/snapshot/prompt.js @@ -36,13 +36,13 @@ let schema = { }, //Options - include_b1: { - type: 'boolean', - description: colors.magenta('Include B1 Distribution in Snapshot?'), - message: 'Must be boolean', - default: true, - ask: () => prompt.history('load_config')===false - }, + // include_b1: { + // type: 'boolean', + // description: colors.magenta('Include B1 Distribution in Snapshot?'), + // message: 'Must be boolean', + // default: true, + // ask: () => prompt.history('load_config')===false + // }, registration_fallback: { type: 'boolean', diff --git a/tools/snapshot/tasks/export/snapshot.json.js b/tools/snapshot/tasks/export/snapshot.json.js index 26b5da2..69c83a1 100644 --- a/tools/snapshot/tasks/export/snapshot.json.js +++ b/tools/snapshot/tasks/export/snapshot.json.js @@ -33,8 +33,8 @@ module.exports = ( state, complete ) => { data.parameters = { period: config.period, block_begin: state.block_begin, - block_end: state.block_end, - b1_dist: config.include_b1 + block_end: state.block_end + // b1_dist: config.include_b1 } data.meta.author = config.author data.meta.timestamp_started = state.timestamp_started @@ -51,8 +51,7 @@ module.exports = ( state, complete ) => { } const get_supply_expected = callback => { - data.supply.expected = 200000000+(config.period*2000000) - if(config.include_b1) data.supply.expected += 100000000 + data.supply.expected = 200000000+(config.period*2000000)+100000000 callback() } diff --git a/tools/snapshot/tests/total-supply.js b/tools/snapshot/tests/total-supply.js index b9cc3e5..f632d18 100644 --- a/tools/snapshot/tests/total-supply.js +++ b/tools/snapshot/tests/total-supply.js @@ -3,15 +3,13 @@ let db = require('../models'), module.exports = ( state, callback ) => { let query = `SELECT sum(balance_wallet) FROM wallets` - if(!config.include_b1) query = `${query} WHERE address!="${CS_ADDRESS_B1}"` + // if(!config.include_b1) query = `${query} WHERE address!="${CS_ADDRESS_B1}"` db.sequelize .query(query, {type: db.sequelize.QueryTypes.SELECT}) .then( sum => { let total = new bn(parseFloat(sum[0]['sum(balance_wallet)'])), - expected = new bn(200000000).plus(new bn(CS_MAX_PERIOD_INDEX).times(2000000)) - - if(config.include_b1) expected = expected.plus(new bn(100000000)) + expected = new bn(200000000).plus(new bn(CS_MAX_PERIOD_INDEX).times(2000000)).plus(new bn(100000000)) const diff = total.sub(expected) diff --git a/tools/snapshot/utilities/periods.js b/tools/snapshot/utilities/periods.js index fa0b28b..7d42c7f 100644 --- a/tools/snapshot/utilities/periods.js +++ b/tools/snapshot/utilities/periods.js @@ -43,8 +43,7 @@ const daily_totals = ( callback ) => { } const expected_supply = (period, include_b1) => { - let result = new bn(CS_CREATE_FIRST_PERIOD).div(WAD).plus( new bn(CS_CREATE_PER_PERIOD).div(WAD).times(new bn(period)) ) - if(include_b1) result.plus(new bn(CS_B1_DISTRIBUTION).div(WAD)) + let result = new bn(CS_CREATE_FIRST_PERIOD).div(WAD).plus( new bn(CS_CREATE_PER_PERIOD).div(WAD).times(new bn(period)) ).plus(new bn(CS_B1_DISTRIBUTION).div(WAD)) return result.toFixed(4) }