Problem:( CRO-496) complex and inflexible initial distribution config #508

linfeng-crypto · 2019-10-24T07:18:33Z

change enum AccountType to StakedStateDestination
remove struct InitialValidator and add ValidatorPubkey
redefine the struct InitConfig, remove launch_incentive_from,launch_incentive_to, long_term_incentive, add a field rewards_pool to store the initial token amount, change council_nodes from a vector into a BTreeMap, as below:

pub struct InitConfig {
    // initial rewards pool of CRO tokens
    pub rewards_pool: Coin,
    // Redeem mapping of ERC20 snapshot: Eth address => (StakedStateDestination,CRO tokens)
    // (doesn't include the rewards pool amount)
    pub distribution: BTreeMap<RedeemAddress, (StakedStateDestination, Coin)>,
    // initial network parameters
    pub network_params: InitNetworkParameters,
    // initial validators
    pub council_nodes: BTreeMap<RedeemAddress, ValidatorPubkey>,
}

simplify the function validate_config_get_genesis for InitConfig
Use new InitConfig in dev-util and chain-abci
fix test cases

leejw51crypto · 2019-10-24T08:05:51Z

chain-abci/tests/abci_app.rs

    let account_key = to_stake_key(&StakedStateAddress::from(*account_address));
    let state = app.last_state.clone().expect("app state");
-    println!("committed root hash: {:?}", &state.last_account_root_hash);
+    println!(


this is in tests, so it won't be printed out unless the test fails

so println! is OK

leejw51crypto

lgtm,
just fix clippy issues

tomtau

seems abci_app unit tests would require some fixing: https://travis-ci.org/crypto-com/chain/jobs/602210157#L1174

error[E0433]: failed to resolve: use of undeclared type or module `AccountType`
1175    --> chain-abci/tests/abci_app.rs:1416:48
1176     |
11771416 |     distribution.insert(address, (Coin::max(), AccountType::ExternallyOwnedAccount));
1178     |                                                ^^^^^^^^^^^ use of undeclared type or module `AccountType`
1179
1180error[E0433]: failed to resolve: use of undeclared type or module `AccountType`
1181    --> chain-abci/tests/abci_app.rs:1419:24
1182     |
11831419 |         (Coin::zero(), AccountType::Contract),
1184     |                        ^^^^^^^^^^^ use of undeclared type or module `AccountType`
1185
1186error[E0433]: failed to resolve: use of undeclared type or module `AccountType`
1187    --> chain-abci/tests/abci_app.rs:1604:48
1188     |
11891604 |     distribution.insert(address, (Coin::max(), AccountType::ExternallyOwnedAccount));
1190     |                                                ^^^^^^^^^^^ use of undeclared type or module `AccountType`
1191
1192error[E0433]: failed to resolve: use of undeclared type or module `AccountType`
1193    --> chain-abci/tests/abci_app.rs:1607:24
1194     |
11951607 |         (Coin::zero(), AccountType::Contract),
1196     |                        ^^^^^^^^^^^ use of undeclared type or module `AccountType`
1197
1198error[E0422]: cannot find struct, variant or union type `InitialValidator` in this scope
1199    --> chain-abci/tests/abci_app.rs:1444:14
1200     |
12011444 |         vec![InitialValidator {
1202     |              ^^^^^^^^^^^^^^^^ not found in this scope
1203
1204error[E0422]: cannot find struct, variant or union type `InitialValidator` in this scope
1205    --> chain-abci/tests/abci_app.rs:1632:14
1206     |
12071632 |         vec![InitialValidator {
1208     |              ^^^^^^^^^^^^^^^^ not found in this scope
1209
1210error[E0061]: this function takes 4 parameters but 6 parameters were supplied
1211    --> chain-abci/tests/abci_app.rs:1438:23
1212     |
12131438 |       let init_config = InitConfig::new(
1214     |  _______________________^
12151439 | |         distribution,
12161440 | |         RedeemAddress::default(),
12171441 | |         RedeemAddress::default(),
1218...    |
12191448 | |         }],
12201449 | |     );
1221     | |_____^ expected 4 parameters
1222
1223error[E0061]: this function takes 4 parameters but 6 parameters were supplied
1224    --> chain-abci/tests/abci_app.rs:1626:23
1225     |
12261626 |       let init_config = InitConfig::new(
1227     |  _______________________^
12281627 | |         distribution,
12291628 | |         RedeemAddress::default(),
12301629 | |         RedeemAddress::default(),
1231...    |
12321636 | |         }],
12331637 | |     );
1234     | |_____^ expected 4 parameters
1235
1236error: aborting due to 8 previous errors

tomtau

abci app unit test fails to compile:

error[E0433]: failed to resolve: use of undeclared type or module `AccountType`
311	    --> chain-abci/tests/abci_app.rs:1416:48
312	     |
313	1416 |     distribution.insert(address, (Coin::max(), AccountType::ExternallyOwnedAccount));
314	     |                                                ^^^^^^^^^^^ use of undeclared type or module `AccountType`
315	
316	error[E0433]: failed to resolve: use of undeclared type or module `AccountType`
317	    --> chain-abci/tests/abci_app.rs:1419:24
318	     |
319	1419 |         (Coin::zero(), AccountType::Contract),
320	     |                        ^^^^^^^^^^^ use of undeclared type or module `AccountType`
321	
322	error[E0433]: failed to resolve: use of undeclared type or module `AccountType`
323	    --> chain-abci/tests/abci_app.rs:1604:48
324	     |
325	1604 |     distribution.insert(address, (Coin::max(), AccountType::ExternallyOwnedAccount));
326	     |                                                ^^^^^^^^^^^ use of undeclared type or module `AccountType`
327	
328	error[E0433]: failed to resolve: use of undeclared type or module `AccountType`
329	    --> chain-abci/tests/abci_app.rs:1607:24
330	     |
331	1607 |         (Coin::zero(), AccountType::Contract),
332	     |                        ^^^^^^^^^^^ use of undeclared type or module `AccountType`
333	
334	error[E0422]: cannot find struct, variant or union type `InitialValidator` in this scope
335	    --> chain-abci/tests/abci_app.rs:1444:14
336	     |
337	1444 |         vec![InitialValidator {
338	     |              ^^^^^^^^^^^^^^^^ not found in this scope
339	
340	error[E0422]: cannot find struct, variant or union type `InitialValidator` in this scope
341	    --> chain-abci/tests/abci_app.rs:1632:14
342	     |
343	1632 |         vec![InitialValidator {
344	     |              ^^^^^^^^^^^^^^^^ not found in this scope
345	
346	error[E0061]: this function takes 4 parameters but 6 parameters were supplied
347	    --> chain-abci/tests/abci_app.rs:1438:23
348	     |
349	1438 |       let init_config = InitConfig::new(
350	     |  _______________________^
351	1439 | |         distribution,
352	1440 | |         RedeemAddress::default(),
353	1441 | |         RedeemAddress::default(),
354	...    |
355	1448 | |         }],
356	1449 | |     );
357	     | |_____^ expected 4 parameters
358	
359	error[E0061]: this function takes 4 parameters but 6 parameters were supplied
360	    --> chain-abci/tests/abci_app.rs:1626:23
361	     |
362	1626 |       let init_config = InitConfig::new(
363	     |  _______________________^
364	1627 | |         distribution,
365	1628 | |         RedeemAddress::default(),
366	1629 | |         RedeemAddress::default(),
367	...    |
368	1636 | |         }],
369	1637 | |     );
370	     | |_____^ expected 4 parameters
371

chain-core/src/init/address.rs

codecov · 2019-10-24T10:59:50Z

Codecov Report

Merging #508 into master will increase coverage by 0.05%.
The diff coverage is 81.18%.

@@            Coverage Diff             @@
##           master     #508      +/-   ##
==========================================
+ Coverage   67.31%   67.37%   +0.05%     
==========================================
  Files         120      120              
  Lines       14158    14073      -85     
==========================================
- Hits         9531     9481      -50     
+ Misses       4627     4592      -35

Impacted Files	Coverage Δ
dev-utils/src/commands/genesis_dev_config.rs	`0% <0%> (ø)`	⬆️
dev-utils/src/commands/genesis_command.rs	`0% <0%> (ø)`	⬆️
dev-utils/src/commands/init_command.rs	`0% <0%> (ø)`	⬆️
chain-abci/src/app/jail_account.rs	`97.64% <100%> (-0.18%)`	⬇️
chain-abci/tests/abci_app.rs	`96.01% <100%> (-0.21%)`	⬇️
chain-core/tests/verify_config.rs	`100% <100%> (ø)`	⬆️
chain-core/src/init/address.rs	`73.46% <100%> (+0.55%)`	⬆️
chain-abci/src/app/app_init.rs	`69.4% <75%> (-0.26%)`	⬇️
chain-core/src/init/config.rs	`72.62% <83.01%> (+3.5%)`	⬆️

tomtau · 2019-10-24T15:03:17Z

bors try

bors · 2019-10-24T15:19:10Z

try

Build failed

continuous-integration/drone/push

tomtau · 2019-10-25T02:06:54Z

chain-core/src/init/config.rs

+                let bonded = match destination {
+                    StakedStateDestination::Bonded => true,
+                    StakedStateDestination::UnbondedFromGenesis => false,
+                    StakedStateDestination::UnbondedFromCustomTime(_time) => false,


UnbondedFromCustomTime is ignored -- so I guess it'll be implemented in a different PR with new_init changes?

yes, I think so.

tomtau · 2019-10-25T02:16:17Z

dev-utils/src/commands/init_command.rs

        InitCommand::ask("** CAUTION **\n");
        self.ask_string("validator staking addresse is special, cannot be withdrawn in single node mode (anykey)","");
        self.ask_string(
            "these incentive wallets are special, cannot be withdrawn (anykey)",


this should be also removed -- did you try running the dev-utils commands?

no, I'll fix it.

tomtau · 2019-10-25T03:19:18Z

bors try

bors · 2019-10-25T04:55:27Z

try

Build failed

continuous-integration/travis-ci/push

tomtau

@linfeng-crypto seems the integration test fails: https://travis-ci.org/crypto-com/chain/jobs/602620994#L3393
you can ask @calvinaco for help

tomtau · 2019-10-28T01:30:45Z

@linfeng-crypto master changed, so there's a merge conflict with chain-abci/tests/abci_app.rs

tomtau · 2019-10-28T03:15:13Z

bors try

leejw51crypto · 2019-10-28T03:53:35Z

i checked enclave hw, lgtm

bors · 2019-10-28T04:24:23Z

try

Build succeeded

tomtau · 2019-10-28T06:13:50Z

@linfeng-crypto can you squash the commits (rebase on top of the latest master)?

tomtau · 2019-10-28T06:46:11Z

@linfeng-crypto a conflict in chain-abci/tests/abci_app.rs -- just keep the rewards_pool in the tests, I guess

tomtau · 2019-10-28T09:53:14Z

bors r+

508: Problem:( CRO-496) complex and inflexible initial distribution config r=tomtau a=linfeng-crypto - change enum `AccountType` to `StakedStateDestination` - remove struct `InitialValidator` and add `ValidatorPubkey` - redefine the struct `InitConfig`, remove `launch_incentive_from`,`launch_incentive_to`, `long_term_incentive`, add a field `rewards_pool` to store the initial token amount, change `council_nodes` from a vector into a `BTreeMap`, as below: ``` pub struct InitConfig { // initial rewards pool of CRO tokens pub rewards_pool: Coin, // Redeem mapping of ERC20 snapshot: Eth address => (StakedStateDestination,CRO tokens) // (doesn't include the rewards pool amount) pub distribution: BTreeMap<RedeemAddress, (StakedStateDestination, Coin)>, // initial network parameters pub network_params: InitNetworkParameters, // initial validators pub council_nodes: BTreeMap<RedeemAddress, ValidatorPubkey>, } ``` - simplify the function `validate_config_get_genesis` for `InitConfig` - Use new `InitConfig` in `dev-util` and `chain-abci` - fix test cases Co-authored-by: linfeng <[email protected]>

bors · 2019-10-28T10:39:59Z

Build succeeded

1418: Bump cbindgen from 0.14.0 to 0.14.1 r=tomtau a=dependabot-preview[bot] Bumps [cbindgen](https://github.com/eqrion/cbindgen) from 0.14.0 to 0.14.1. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/eqrion/cbindgen/blob/master/CHANGES">cbindgen's changelog</a>.</em></p> <blockquote> <h2>0.14.1</h2> <pre><code> * Handle mangling pointers. ([#508](mozilla/cbindgen#508)) * Unconditionally generate a return statement in partialeq implementations. ([#509](mozilla/cbindgen#509)) </code></pre> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/eqrion/cbindgen/commit/0761b9bbe48d01ded1bbec45bbeea5544b3b1002"><code>0761b9b</code></a> Release 0.14.1</li> <li><a href="https://github.com/eqrion/cbindgen/commit/33d9ecf11f300bd03f431e9f3417c063e681380c"><code>33d9ecf</code></a> Handle mangling pointers.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/0fed9eebc47abcd31e0e69357cd39262c8a5a6cc"><code>0fed9ee</code></a> enum: Unconditionally generate a return statement in partialeq implementations.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/a519f1bda444a0c6c01464296a052d9a05e1d9c4"><code>a519f1b</code></a> Actually use the temp dir for temporary compiled objects.</li> <li>See full diff in <a href="https://github.com/eqrion/cbindgen/compare/v0.14.0...v0.14.1">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=cbindgen&package-manager=cargo&previous-version=0.14.0&new-version=0.14.1)](https://dependabot.com/compatibility-score/?dependency-name=cbindgen&package-manager=cargo&previous-version=0.14.0&new-version=0.14.1) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com): - Update frequency (including time of day and day of week) - Pull request limits (per update run and/or open at any time) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

tomtau requested review from calvinaco, devashishdxt, leejw51crypto, lezzokafka and tomtau and removed request for devashishdxt and tomtau October 24, 2019 07:30

leejw51crypto reviewed Oct 24, 2019

View reviewed changes

leejw51crypto approved these changes Oct 24, 2019

View reviewed changes

linfeng-crypto force-pushed the cro-496 branch from a54e088 to 364a607 Compare October 24, 2019 08:28

tomtau suggested changes Oct 24, 2019

View reviewed changes

linfeng-crypto force-pushed the cro-496 branch from 364a607 to bf9622c Compare October 24, 2019 09:02

tomtau suggested changes Oct 24, 2019

View reviewed changes

chain-core/src/init/address.rs Show resolved Hide resolved

linfeng-crypto force-pushed the cro-496 branch from bf9622c to 35fbadc Compare October 24, 2019 09:51

bors bot added a commit that referenced this pull request Oct 24, 2019

Try #508:

edcf42e

tomtau reviewed Oct 25, 2019

View reviewed changes

tomtau requested a review from leejw51crypto October 25, 2019 02:16

bors bot added a commit that referenced this pull request Oct 25, 2019

Try #508:

d6795b1

tomtau self-requested a review October 25, 2019 05:08

tomtau suggested changes Oct 25, 2019

View reviewed changes

bors bot added a commit that referenced this pull request Oct 28, 2019

Try #508:

907511b

leejw51crypto approved these changes Oct 28, 2019

View reviewed changes

linfeng-crypto force-pushed the cro-496 branch from d7f3a1b to 96fca36 Compare October 28, 2019 06:30

linfeng-crypto force-pushed the cro-496 branch from 96fca36 to 72d2104 Compare October 28, 2019 06:55

Problem:(CRO-496) complex and inflexible initial distribution config

a5fbf46

linfeng-crypto force-pushed the cro-496 branch from 72d2104 to a5fbf46 Compare October 28, 2019 06:58

bors bot merged commit a5fbf46 into crypto-com:master Oct 28, 2019

Problem:( CRO-496) complex and inflexible initial distribution config #508

Problem:( CRO-496) complex and inflexible initial distribution config #508

Uh oh!

Conversation

linfeng-crypto commented Oct 24, 2019

Uh oh!

leejw51crypto Oct 24, 2019

Choose a reason for hiding this comment

Uh oh!

tomtau Oct 24, 2019

Choose a reason for hiding this comment

Uh oh!

tomtau Oct 24, 2019

Choose a reason for hiding this comment

Uh oh!

leejw51crypto left a comment

Choose a reason for hiding this comment

Uh oh!

tomtau left a comment

Choose a reason for hiding this comment

Uh oh!

tomtau left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codecov bot commented Oct 24, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

tomtau commented Oct 24, 2019

Uh oh!

bors bot commented Oct 24, 2019

try

Build failed

Uh oh!

tomtau Oct 25, 2019

Choose a reason for hiding this comment

Uh oh!

linfeng-crypto Oct 25, 2019

Choose a reason for hiding this comment

Uh oh!

tomtau Oct 25, 2019

Choose a reason for hiding this comment

Uh oh!

linfeng-crypto Oct 25, 2019

Choose a reason for hiding this comment

Uh oh!

tomtau commented Oct 25, 2019

Uh oh!

bors bot commented Oct 25, 2019

try

Build failed

Uh oh!

tomtau left a comment

Choose a reason for hiding this comment

Uh oh!

tomtau commented Oct 28, 2019

Uh oh!

tomtau commented Oct 28, 2019

Uh oh!

leejw51crypto commented Oct 28, 2019

Uh oh!

bors bot commented Oct 28, 2019

try

Build succeeded

Uh oh!

tomtau commented Oct 28, 2019

Uh oh!

tomtau commented Oct 28, 2019

Uh oh!

tomtau commented Oct 28, 2019

Uh oh!

bors bot commented Oct 28, 2019

Build succeeded

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

codecov bot commented Oct 24, 2019 •

edited

Loading