status-im/eth2.0-specs
2
0
Fork 0
mirror of https://github.com/status-im/eth2.0-specs.git synced 2025-02-21 06:48:12 +00:00
Code Issues Projects Releases Wiki Activity

Inline bytesN(0) instead of custom zero_bytesN vars (#8)

Browse Source 
Co-authored-by: Martin Lundfall <martin.lundfall@protonmail.com>
This commit is contained in:
Alex Beregszaszi 2020-05-12 19:04:18 +01:00 committed by GitHub
parent acb658fbda
commit a8ed83e087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deposit_contract.sol
View File

@ -50,7 +50,6 @@ contract DepositContract is IDepositContract {
}
function get_deposit_root() override external view returns (bytes32) {
bytes24 zero_bytes24;
bytes32 node;
uint size = deposit_count;
for (uint height = 0; height < DEPOSIT_CONTRACT_TREE_DEPTH; height++) {
@ -63,7 +62,7 @@ contract DepositContract is IDepositContract {
return sha256(abi.encodePacked(
node,
to_little_endian_64(uint64(deposit_count)),
zero_bytes24
bytes24(0)
));
}
@ -104,18 +103,14 @@ contract DepositContract is IDepositContract {
);
// Compute deposit data root (`DepositData` hash tree root)
// These are helpers and are implicitly initialised to zero.
bytes16 zero_bytes16;
bytes24 zero_bytes24;
bytes32 zero_bytes32;
bytes32 pubkey_root = sha256(abi.encodePacked(pubkey, zero_bytes16));
bytes32 pubkey_root = sha256(abi.encodePacked(pubkey, bytes16(0)));
bytes32 signature_root = sha256(abi.encodePacked(
sha256(abi.encodePacked(bytes(signature[:64]))),
sha256(abi.encodePacked(bytes(signature[64:]), zero_bytes32))
sha256(abi.encodePacked(bytes(signature[64:]), bytes32(0)))
));
bytes32 node = sha256(abi.encodePacked(
sha256(abi.encodePacked(pubkey_root, withdrawal_credentials)),
sha256(abi.encodePacked(amount, zero_bytes24, signature_root))
sha256(abi.encodePacked(amount, bytes24(0), signature_root))
));
// Verify computed and expected deposit data roots match
require(node == deposit_data_root);