From 70c2063cfa4bb5cb21cc1135c4094c5ef85fa083 Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Thu, 24 Oct 2019 21:49:07 +0900 Subject: [PATCH] PR feedback --- configs/mainnet.yaml | 3 --- configs/minimal.yaml | 3 --- specs/core/0_beacon-chain.md | 4 ++-- specs/test_formats/operations/README.md | 1 - test_generators/operations/main.py | 5 ----- 5 files changed, 2 insertions(+), 14 deletions(-) diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml index 45d5b6894..af446d575 100644 --- a/configs/mainnet.yaml +++ b/configs/mainnet.yaml @@ -116,8 +116,6 @@ MAX_ATTESTATIONS: 128 MAX_DEPOSITS: 16 # 2**4 (= 16) MAX_VOLUNTARY_EXITS: 16 -# Originally 2**4 (= 16), disabled for now. -MAX_TRANSFERS: 0 # Signature domains @@ -127,7 +125,6 @@ DOMAIN_BEACON_ATTESTER: 0x01000000 DOMAIN_RANDAO: 0x02000000 DOMAIN_DEPOSIT: 0x03000000 DOMAIN_VOLUNTARY_EXIT: 0x04000000 -DOMAIN_TRANSFER: 0x05000000 DOMAIN_CUSTODY_BIT_CHALLENGE: 0x06000000 DOMAIN_SHARD_PROPOSER: 0x80000000 DOMAIN_SHARD_ATTESTER: 0x81000000 diff --git a/configs/minimal.yaml b/configs/minimal.yaml index 75b93f66a..53599e83a 100644 --- a/configs/minimal.yaml +++ b/configs/minimal.yaml @@ -118,8 +118,6 @@ MAX_ATTESTATIONS: 128 MAX_DEPOSITS: 16 # 2**4 (= 16) MAX_VOLUNTARY_EXITS: 16 -# Originally 2**4 (= 16), disabled for now. -MAX_TRANSFERS: 0 # Signature domains @@ -129,7 +127,6 @@ DOMAIN_BEACON_ATTESTER: 0x01000000 DOMAIN_RANDAO: 0x02000000 DOMAIN_DEPOSIT: 0x03000000 DOMAIN_VOLUNTARY_EXIT: 0x04000000 -DOMAIN_TRANSFER: 0x05000000 DOMAIN_CUSTODY_BIT_CHALLENGE: 0x06000000 DOMAIN_SHARD_PROPOSER: 0x80000000 DOMAIN_SHARD_ATTESTER: 0x81000000 diff --git a/specs/core/0_beacon-chain.md b/specs/core/0_beacon-chain.md index 1819310a1..394a6d783 100644 --- a/specs/core/0_beacon-chain.md +++ b/specs/core/0_beacon-chain.md @@ -285,14 +285,14 @@ class Checkpoint(Container): ```python class Validator(Container): pubkey: BLSPubkey - withdrawal_credentials: Hash # Commitment to pubkey for withdrawals and transfers + withdrawal_credentials: Hash # Commitment to pubkey for withdrawals effective_balance: Gwei # Balance at stake slashed: boolean # Status epochs activation_eligibility_epoch: Epoch # When criteria for activation were met activation_epoch: Epoch exit_epoch: Epoch - withdrawable_epoch: Epoch # When validator can withdraw or transfer funds + withdrawable_epoch: Epoch # When validator can withdraw funds ``` #### `AttestationData` diff --git a/specs/test_formats/operations/README.md b/specs/test_formats/operations/README.md index be009486d..f1ec0429a 100644 --- a/specs/test_formats/operations/README.md +++ b/specs/test_formats/operations/README.md @@ -46,7 +46,6 @@ Operations: | `block_header` | `Block` | **`block`** | `process_block_header(state, block)` | | `deposit` | `Deposit` | `deposit` | `process_deposit(state, deposit)` | | `proposer_slashing` | `ProposerSlashing` | `proposer_slashing` | `process_proposer_slashing(state, proposer_slashing)` | -| `transfer` | `Transfer` | `transfer` | `process_transfer(state, transfer)` | | `voluntary_exit` | `VoluntaryExit` | `voluntary_exit` | `process_voluntary_exit(state, voluntary_exit)` | Note that `block_header` is not strictly an operation (and is a full `Block`), but processed in the same manner, and hence included here. diff --git a/test_generators/operations/main.py b/test_generators/operations/main.py index 995a626b4..de3eb7cf1 100644 --- a/test_generators/operations/main.py +++ b/test_generators/operations/main.py @@ -6,7 +6,6 @@ from eth2spec.test.phase_0.block_processing import ( test_process_block_header, test_process_deposit, test_process_proposer_slashing, - test_process_transfer, test_process_voluntary_exit, ) @@ -48,10 +47,6 @@ if __name__ == "__main__": create_provider('deposit', test_process_deposit, 'mainnet'), create_provider('proposer_slashing', test_process_proposer_slashing, 'minimal'), create_provider('proposer_slashing', test_process_proposer_slashing, 'mainnet'), - create_provider('transfer', test_process_transfer, 'minimal'), - # Disabled, due to the high amount of different transfer tests, this produces a shocking size of tests. - # Unnecessarily, as transfer are disabled currently, so not a priority. - # create_provider('transfer', test_process_transfer, 'mainnet'), create_provider('voluntary_exit', test_process_voluntary_exit, 'minimal'), create_provider('voluntary_exit', test_process_voluntary_exit, 'mainnet'), ])