Problem: (Fix #1435) No standardized staking event #1449

calvinlauyh · 2020-04-18T11:01:09Z

Solution: Refactor staking related events to standardized events

Remove RewardsDistribution and SlashValidators event
Standardized all staking address related actions into StakingChange event
Some sample event format (base64 encoded values are decoded)

Transaction

{
    type: 'StakingChange',
    attributes: [
        {
            key: 'staking_address',
            value: '0x2dfde2178daa679508828242119dcf2114038ea8',
        },
        {
            key: 'staking_optype',
            value: 'unbond',
        },
        {
            key: 'staking_diff',
            value: '[{key:'Bonded',value:"-1000"},{key:"Unbonded",value:"1000"}]'
        }
    ]
}

BeginBlock

{
  "begin_block": {
    "events": [
      {
        "type": "staking_change",
        "attributes": [
          {
            "key": "staking_address",
            "value": "MHgyZGZkZTIxNzhkYWE2Nzk1MDg4MjgyNDIxMTlkY2YyMTE0MDM4ZWE4"
          },
          {
            "key": "staking_optype",
            "value": "slash"
          },
          {
            "key": "staking_diff",
            "value": "[{\"key\":\"Bonded\",\"value\":\"-50000000000\"},{\"key\":\"Unbonded\",\"value\":\"-50000000000\"}]"
          },
          {
            "key": "staking_opreason",
            "value": "NonLive"
          }
        ]
      },
      {
        "type": "staking_change",
        "attributes": [
          {
            "key": "staking_address",
            "value": "0x45c1851c2f0dc6138935857b9e23b173185fea15"
          },
          {
            "key": "staking_optype",
            "value": "reward"
          },
          {
            "key": "staking_diff",
            "value": "{\"key\":\"Bonded\",\"value\":\"100000000000\"}"
          }
        ]
      },
      {
        "type": "reward",
        "attributes": [
          {
            "key": "minted",
            "value": "\"0\""
          }
        ]
      }
    ]
  }
}

codecov · 2020-04-18T14:21:29Z

Codecov Report

Merging #1449 into master will increase coverage by 0.89%.
The diff coverage is 96.82%.

@@            Coverage Diff             @@
##           master    #1449      +/-   ##
==========================================
+ Coverage   63.55%   64.44%   +0.89%     
==========================================
  Files         159      160       +1     
  Lines       21026    21632     +606     
==========================================
+ Hits        13363    13941     +578     
- Misses       7663     7691      +28

Impacted Files	Coverage Δ
chain-core/src/init/coin.rs	`84.21% <ø> (-2.20%)`	⬇️
chain-core/src/common/mod.rs	`68.88% <70.00%> (-2.54%)`	⬇️
chain-abci/src/storage/mod.rs	`84.61% <76.08%> (-3.25%)`	⬇️
chain-abci/src/app/validate_tx.rs	`81.42% <91.66%> (-1.68%)`	⬇️
chain-abci/src/app/mod.rs	`83.01% <96.05%> (+0.20%)`	⬆️
...lient-common/src/tendermint/types/block_results.rs	`90.09% <96.29%> (-0.82%)`	⬇️
chain-abci/src/staking/mod.rs	`99.10% <96.55%> (-0.66%)`	⬇️
chain-abci/src/app/staking_event.rs	`99.38% <99.38%> (ø)`
chain-abci/src/staking/table.rs	`89.07% <100.00%> (+0.51%)`	⬆️
chain-abci/src/staking/tx.rs	`91.89% <100.00%> (+0.07%)`	⬆️
... and 10 more

chain-abci/src/storage/mod.rs

tomtau

looks ok, but agree with #1449 (comment) -- processing that only needs TxEnclaveAction should only get TxEnclaveAction as input;
processing that needs both can have that top-level TxAction

tomtau · 2020-04-20T01:52:46Z

chain-abci/src/app/validate_tx.rs

        }
+        _ => panic!("Trying to execute non-enclave transaction"),


this "catch-all" is potentially error-prone if a new enclave tx variant is added and it's not handled here

Code updated based on review

yihuang · 2020-04-20T02:48:00Z

          {
            "key": "staking_diff",
            "value": "{\"key\":\"Bonded\",\"value\":\"-50000000000\"}"
          },
          {
            "key": "staking_diff",
            "value": "{\"key\":\"Unbonded\",\"value\":\"-50000000000\"}"
          },

How about merge them into one item:

          {
            "key": "staking_diff",
            "value": "[[\"Unbonded\", \"-50000000000\"], [\"Bonded\", \"-50000000000\"]]"
          }

calvinlauyh · 2020-04-20T08:50:41Z

bors try

bors · 2020-04-20T08:50:43Z

🔒 Permission denied

Existing reviewers: click here to make calvinlauco a reviewer

tomtau

looks ok, there may be some minor improvemensts to do down the line

tomtau · 2020-04-21T06:05:24Z

chain-abci/src/staking/table.rs

+        StakedStateAddress,
+        Coin,
+        Coin,
+        PunishmentKind,
+        Option<Timespec>,


It'd be good to have some type alias for this -- also what's difference between the Coin on the second position and the third position

Created an alias PunishmentKind and refactored the (Coin, Coin) pair to SlashedCoin structure for readability.

tomtau · 2020-04-21T06:09:45Z

bors r+

bors · 2020-04-21T06:14:46Z

Merge conflict.

tomtau

there's a conflict with the latest master

calvinlauyh · 2020-04-21T08:52:18Z

there's a conflict with the latest master

Resolving conflicts now

calvinlauyh · 2020-04-21T10:50:24Z

Conflicts resolved

calvinaco · 2020-04-21T11:09:04Z

bors try

calvinlauyh · 2020-04-21T11:55:34Z

Updated based on TravisCI lint suggestion.

bors · 2020-04-21T12:12:30Z

try

Build failed:

continuous-integration/travis-ci/push

calvinaco · 2020-04-21T14:30:22Z

bors try

bors · 2020-04-21T15:10:57Z

try

Build succeeded:

tomtau · 2020-04-22T02:15:46Z

bors r+

1449: Problem: (Fix #1435) No standardized staking event r=tomtau a=calvinlauco Solution: Refactor staking related events to standardized events --- - Remove `RewardsDistribution` and `SlashValidators ` event - Standardized all staking address related actions into `StakingChange` event - Some sample event format (base64 encoded values are decoded) #### Transaction ``` { type: 'StakingChange', attributes: [ { key: 'staking_address', value: '0x2dfde2178daa679508828242119dcf2114038ea8', }, { key: 'staking_optype', value: 'unbond', }, { key: 'staking_diff', value: '[{key:'Bonded',value:"-1000"},{key:"Unbonded",value:"1000"}]' } ] } ``` #### BeginBlock ``` { "begin_block": { "events": [ { "type": "staking_change", "attributes": [ { "key": "staking_address", "value": "MHgyZGZkZTIxNzhkYWE2Nzk1MDg4MjgyNDIxMTlkY2YyMTE0MDM4ZWE4" }, { "key": "staking_optype", "value": "slash" }, { "key": "staking_diff", "value": "[{\"key\":\"Bonded\",\"value\":\"-50000000000\"},{\"key\":\"Unbonded\",\"value\":\"-50000000000\"}]" }, { "key": "staking_opreason", "value": "NonLive" } ] }, { "type": "staking_change", "attributes": [ { "key": "staking_address", "value": "0x45c1851c2f0dc6138935857b9e23b173185fea15" }, { "key": "staking_optype", "value": "reward" }, { "key": "staking_diff", "value": "{\"key\":\"Bonded\",\"value\":\"100000000000\"}" } ] }, { "type": "reward", "attributes": [ { "key": "minted", "value": "\"0\"" } ] } ] } } ``` Co-authored-by: Calvin Lau <[email protected]>

tomtau · 2020-04-22T02:50:55Z

bors r-

bors · 2020-04-22T02:50:56Z

Canceled.

calvinlauyh · 2020-04-22T03:01:48Z

Updated to add missing unbonded_from to event

calvinaco · 2020-04-22T03:15:22Z

bors try

tomtau · 2020-04-22T03:19:35Z

bors r+

1449: Problem: (Fix #1435) No standardized staking event r=tomtau a=calvinlauco Solution: Refactor staking related events to standardized events --- - Remove `RewardsDistribution` and `SlashValidators ` event - Standardized all staking address related actions into `StakingChange` event - Some sample event format (base64 encoded values are decoded) #### Transaction ``` { type: 'StakingChange', attributes: [ { key: 'staking_address', value: '0x2dfde2178daa679508828242119dcf2114038ea8', }, { key: 'staking_optype', value: 'unbond', }, { key: 'staking_diff', value: '[{key:'Bonded',value:"-1000"},{key:"Unbonded",value:"1000"}]' } ] } ``` #### BeginBlock ``` { "begin_block": { "events": [ { "type": "staking_change", "attributes": [ { "key": "staking_address", "value": "MHgyZGZkZTIxNzhkYWE2Nzk1MDg4MjgyNDIxMTlkY2YyMTE0MDM4ZWE4" }, { "key": "staking_optype", "value": "slash" }, { "key": "staking_diff", "value": "[{\"key\":\"Bonded\",\"value\":\"-50000000000\"},{\"key\":\"Unbonded\",\"value\":\"-50000000000\"}]" }, { "key": "staking_opreason", "value": "NonLive" } ] }, { "type": "staking_change", "attributes": [ { "key": "staking_address", "value": "0x45c1851c2f0dc6138935857b9e23b173185fea15" }, { "key": "staking_optype", "value": "reward" }, { "key": "staking_diff", "value": "{\"key\":\"Bonded\",\"value\":\"100000000000\"}" } ] }, { "type": "reward", "attributes": [ { "key": "minted", "value": "\"0\"" } ] } ] } } ``` Co-authored-by: Calvin Lau <[email protected]>

Solution: Refactor staking related events to standardized events

bors · 2020-04-22T03:31:56Z

Canceled.

calvinlauyh · 2020-04-22T03:34:41Z

bors r+

@tomtau
Fixed formatting issue found on TravisCI.

devashishdxt · 2020-04-22T03:49:12Z

bors r+

bors · 2020-04-22T04:23:46Z

try

Build failed:

continuous-integration/travis-ci/push

calvinlauyh · 2020-04-22T04:25:24Z

try

Build failed:

continuous-integration/travis-ci/push

This error comes from last bors try attempt before the format fix. Can be ignored

leejw51crypto

lgtm

bors · 2020-04-22T04:59:38Z

Build succeeded:

calvinlauyh requested review from calvinaco, devashishdxt and tomtau as code owners April 18, 2020 11:01

calvinlauyh force-pushed the feature/1435-staking-event branch from 3e2c556 to 6d5fa72 Compare April 18, 2020 11:01

calvinaco requested review from yihuang and lezzokafka April 18, 2020 11:02

calvinlauyh force-pushed the feature/1435-staking-event branch 2 times, most recently from 616f316 to bd5fab0 Compare April 18, 2020 13:39

yihuang reviewed Apr 19, 2020

View reviewed changes

chain-abci/src/storage/mod.rs Outdated Show resolved Hide resolved

tomtau requested review from leejw51crypto and linfeng-crypto April 20, 2020 01:53

tomtau suggested changes Apr 20, 2020

View reviewed changes

calvinlauyh force-pushed the feature/1435-staking-event branch from bd5fab0 to 7f810cb Compare April 20, 2020 08:49

yihuang approved these changes Apr 20, 2020

View reviewed changes

tomtau approved these changes Apr 21, 2020

View reviewed changes

tomtau self-requested a review April 21, 2020 06:25

tomtau suggested changes Apr 21, 2020

View reviewed changes

tomtau mentioned this pull request Apr 21, 2020

Problem: next release not documented #1455

Merged

calvinlauyh force-pushed the feature/1435-staking-event branch 2 times, most recently from 1674b60 to 3065b4d Compare April 21, 2020 10:50

calvinlauyh force-pushed the feature/1435-staking-event branch from 3065b4d to eda30e3 Compare April 21, 2020 11:09

bors bot added a commit that referenced this pull request Apr 21, 2020

Try #1449:

34c7808

calvinlauyh force-pushed the feature/1435-staking-event branch from eda30e3 to 391e90d Compare April 21, 2020 11:54

bors bot added a commit that referenced this pull request Apr 21, 2020

Try #1449:

22cb9e4

tomtau mentioned this pull request Apr 22, 2020

Problem: (Fix #1459) Missing bonded from in staking change event #1460

Closed

calvinlauyh force-pushed the feature/1435-staking-event branch from 391e90d to 5325938 Compare April 22, 2020 02:54

bors bot added a commit that referenced this pull request Apr 22, 2020

Try #1449:

a75b41f

Problem: (Fix crypto-com#1435) No standardized staking event

bacdb1b

Solution: Refactor staking related events to standardized events

calvinlauyh force-pushed the feature/1435-staking-event branch from 5325938 to bacdb1b Compare April 22, 2020 03:31

leejw51crypto approved these changes Apr 22, 2020

View reviewed changes

bors bot merged commit b4a0b29 into crypto-com:master Apr 22, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Problem: (Fix #1435) No standardized staking event #1449

Problem: (Fix #1435) No standardized staking event #1449

calvinlauyh commented Apr 18, 2020 •

edited

Loading

codecov bot commented Apr 18, 2020 •

edited

Loading

tomtau left a comment

tomtau Apr 20, 2020

calvinlauyh Apr 20, 2020

yihuang commented Apr 20, 2020

calvinlauyh commented Apr 20, 2020

bors bot commented Apr 20, 2020

tomtau left a comment

tomtau Apr 21, 2020

calvinlauyh Apr 21, 2020

tomtau commented Apr 21, 2020

bors bot commented Apr 21, 2020

tomtau left a comment

calvinlauyh commented Apr 21, 2020

calvinlauyh commented Apr 21, 2020

calvinaco commented Apr 21, 2020

calvinlauyh commented Apr 21, 2020

bors bot commented Apr 21, 2020

calvinaco commented Apr 21, 2020

bors bot commented Apr 21, 2020

tomtau commented Apr 22, 2020

tomtau commented Apr 22, 2020

bors bot commented Apr 22, 2020

calvinlauyh commented Apr 22, 2020

calvinaco commented Apr 22, 2020

tomtau commented Apr 22, 2020

bors bot commented Apr 22, 2020

calvinlauyh commented Apr 22, 2020

devashishdxt commented Apr 22, 2020

bors bot commented Apr 22, 2020

calvinlauyh commented Apr 22, 2020

try

leejw51crypto left a comment

bors bot commented Apr 22, 2020

Problem: (Fix #1435) No standardized staking event #1449

Problem: (Fix #1435) No standardized staking event #1449

Conversation

calvinlauyh commented Apr 18, 2020 • edited Loading

Transaction

BeginBlock

codecov bot commented Apr 18, 2020 • edited Loading

Codecov Report

tomtau left a comment

Choose a reason for hiding this comment

tomtau Apr 20, 2020

Choose a reason for hiding this comment

calvinlauyh Apr 20, 2020

Choose a reason for hiding this comment

yihuang commented Apr 20, 2020

calvinlauyh commented Apr 20, 2020

bors bot commented Apr 20, 2020

tomtau left a comment

Choose a reason for hiding this comment

tomtau Apr 21, 2020

Choose a reason for hiding this comment

calvinlauyh Apr 21, 2020

Choose a reason for hiding this comment

tomtau commented Apr 21, 2020

bors bot commented Apr 21, 2020

tomtau left a comment

Choose a reason for hiding this comment

calvinlauyh commented Apr 21, 2020

calvinlauyh commented Apr 21, 2020

calvinaco commented Apr 21, 2020

calvinlauyh commented Apr 21, 2020

bors bot commented Apr 21, 2020

try

calvinaco commented Apr 21, 2020

bors bot commented Apr 21, 2020

try

tomtau commented Apr 22, 2020

tomtau commented Apr 22, 2020

bors bot commented Apr 22, 2020

calvinlauyh commented Apr 22, 2020

calvinaco commented Apr 22, 2020

tomtau commented Apr 22, 2020

bors bot commented Apr 22, 2020

calvinlauyh commented Apr 22, 2020

devashishdxt commented Apr 22, 2020

bors bot commented Apr 22, 2020

try

calvinlauyh commented Apr 22, 2020

try

leejw51crypto left a comment

Choose a reason for hiding this comment

bors bot commented Apr 22, 2020

calvinlauyh commented Apr 18, 2020 •

edited

Loading

codecov bot commented Apr 18, 2020 •

edited

Loading