status-im/eth2.0-specs
2
0
Fork 0
mirror of https://github.com/status-im/eth2.0-specs.git synced 2025-03-03 19:50:28 +00:00
Code Issues Projects Releases Wiki Activity

Move require(deposit_count) statement to where the value is used (post hash calculation) (#23)

Browse Source 
This tightly couples all require statements to their places of use.
This commit is contained in:
Alex Beregszaszi 2020-05-15 13:14:39 +01:00 committed by GitHub
parent 15bcfbaf91
commit 636f22f0ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deposit_contract.sol
View File

@ -91,9 +91,6 @@ contract DepositContract is IDepositContract, ERC165 {
require(withdrawal_credentials.length == WITHDRAWAL_CREDENTIALS_LENGTH, "DepositContract: invalid withdrawal_credentials length"); require(withdrawal_credentials.length == WITHDRAWAL_CREDENTIALS_LENGTH, "DepositContract: invalid withdrawal_credentials length");
require(signature.length == SIGNATURE_LENGTH, "DepositContract: invalid signature length"); require(signature.length == SIGNATURE_LENGTH, "DepositContract: invalid signature length");
// Avoid overflowing the Merkle tree (and prevent edge case in computing `branch`)
require(deposit_count < MAX_DEPOSIT_COUNT, "DepositContract: merkle tree full");
// Check deposit amount // Check deposit amount
require(msg.value >= MIN_DEPOSIT_AMOUNT, "DepositContract: deposit value too low"); require(msg.value >= MIN_DEPOSIT_AMOUNT, "DepositContract: deposit value too low");
require(msg.value % GWEI == 0, "DepositContract: deposit value not multiple of gwei"); require(msg.value % GWEI == 0, "DepositContract: deposit value not multiple of gwei");
@ -120,9 +117,13 @@ contract DepositContract is IDepositContract, ERC165 {
sha256(abi.encodePacked(pubkey_root, withdrawal_credentials)), sha256(abi.encodePacked(pubkey_root, withdrawal_credentials)),
sha256(abi.encodePacked(amount, bytes24(0), signature_root)) sha256(abi.encodePacked(amount, bytes24(0), signature_root))
)); ));
// Verify computed and expected deposit data roots match // Verify computed and expected deposit data roots match
require(node == deposit_data_root, "DepositContract: reconstructed DepositData does not match supplied deposit_data_root"); require(node == deposit_data_root, "DepositContract: reconstructed DepositData does not match supplied deposit_data_root");
// Avoid overflowing the Merkle tree (and prevent edge case in computing `branch`)
require(deposit_count < MAX_DEPOSIT_COUNT, "DepositContract: merkle tree full");
// Add deposit data root to Merkle tree (update a single `branch` node) // Add deposit data root to Merkle tree (update a single `branch` node)
deposit_count += 1; deposit_count += 1;
uint size = deposit_count; uint size = deposit_count;