status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-22 20:42:13 +00:00
Code Issues Projects Releases Wiki Activity

Address review comments.

Browse Source
This commit is contained in:
cheatfate 2024-02-13 20:00:47 +02:00
parent 5699d2212d
commit 3a9b4f065a
No known key found for this signature in database
GPG Key ID: 46ADD633A7201F95
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
beacon_chain/el/deposit_contract.nim
View File

@ -14,7 +14,7 @@ import
../networking/network_metadata, ../networking/network_metadata,
web3, web3/confutils_defs, eth/keys, eth/p2p/discoveryv5/random2, web3, web3/confutils_defs, eth/keys, eth/p2p/discoveryv5/random2,
stew/[io2, byteutils], stew/[io2, byteutils],
../spec/eth2_merkleization, ../spec/[eth2_merkleization, helpers],
../spec/datatypes/base, ../spec/datatypes/base,
../validators/keystore_management ../validators/keystore_management
@ -136,16 +136,13 @@ proc sendEth(web3: Web3, to: Eth1Address, valueEth: int): Future[TxHash] =
`from`: web3.defaultAccount, `from`: web3.defaultAccount,
gas: Quantity(3000000).some, gas: Quantity(3000000).some,
gasPrice: Quantity(1).some, gasPrice: Quantity(1).some,
value: some(valueEth.u256 * 1000000000000000000.u256), value: some(valueEth.toWei),
to: some(to)) to: some(to))
web3.send(tr) web3.send(tr)
type type
DelayGenerator* = proc(): chronos.Duration {.gcsafe, raises: [].} DelayGenerator* = proc(): chronos.Duration {.gcsafe, raises: [].}
proc ethToWei(eth: UInt256): UInt256 =
eth * 1000000000000000000.u256
proc initWeb3(web3Url, privateKey: string): Future[Web3] {.async.} = proc initWeb3(web3Url, privateKey: string): Future[Web3] {.async.} =
result = await newWeb3(web3Url) result = await newWeb3(web3Url)
if privateKey.len != 0: if privateKey.len != 0:
@ -180,7 +177,7 @@ proc sendDeposits*(deposits: seq[LaunchPadDeposit],
SignatureBytes(@(dp.signature.toRaw())), SignatureBytes(@(dp.signature.toRaw())),
FixedBytes[32](hash_tree_root(dp).data)) FixedBytes[32](hash_tree_root(dp).data))
let status = await tx.send(value = 32.u256.ethToWei, gasPrice = gasPrice) let status = await tx.send(value = 32.toWei, gasPrice = gasPrice)
info "Deposit sent", tx = $status info "Deposit sent", tx = $status

6
beacon_chain/spec/helpers.nim
View File

@ -523,3 +523,9 @@ proc blockToBlockHeader*(blck: ForkyBeaconBlock): ExecutionBlockHeader =
proc compute_execution_block_hash*(blck: ForkyBeaconBlock): Eth2Digest = proc compute_execution_block_hash*(blck: ForkyBeaconBlock): Eth2Digest =
rlpHash blockToBlockHeader(blck) rlpHash blockToBlockHeader(blck)
func toWei*(eth: SomeInteger): UInt256 =
eth.u256 * 1000000000000000000.u256
func toWei*(eth: UInt256): UInt256 =
eth * 1000000000000000000.u256

9
beacon_chain/validators/rewards.nim
View File

@ -7,7 +7,7 @@
{.push raises: [].} {.push raises: [].}
import ".."/spec/[forks, beaconstate, state_transition_block] import ".."/spec/[forks, beaconstate, state_transition_block, helpers]
type type
AuxiliaryState = object AuxiliaryState = object
@ -56,6 +56,8 @@ template withStateAndMaybeBlindedBlck(
const consensusFork {.inject, used.} = ConsensusFork.Deneb const consensusFork {.inject, used.} = ConsensusFork.Deneb
template forkyState: untyped {.inject.} = s.denebData template forkyState: untyped {.inject.} = s.denebData
template forkyBlck: untyped {.inject.} = b template forkyBlck: untyped {.inject.} = b
else:
{.error: "withStateAndMaybeBlindedBlock does not support " & $typeof(b).}
func init(t: typedesc[AuxiliaryState], func init(t: typedesc[AuxiliaryState],
forkedState: ForkedHashedBeaconState): Opt[AuxiliaryState] = forkedState: ForkedHashedBeaconState): Opt[AuxiliaryState] =
@ -166,9 +168,6 @@ proc collectFromSyncAggregate(
if aggregate.sync_committee_bits[i]: if aggregate.sync_committee_bits[i]:
proposerOutcome += proposer_reward proposerOutcome += proposer_reward
proc gweiToWei(eth: Gwei): UInt256 =
eth.u256 * 1000000000000000000.u256
proc collectBlockRewards*( proc collectBlockRewards*(
forkedState: ForkedHashedBeaconState, forkedState: ForkedHashedBeaconState,
forkedBlock: RewardingBlock forkedBlock: RewardingBlock
@ -184,4 +183,4 @@ proc collectBlockRewards*(
reward.collectFromAttestations( reward.collectFromAttestations(
forkedState, forkedBlock, auxiliaryState, cache) forkedState, forkedBlock, auxiliaryState, cache)
reward.collectFromSyncAggregate(forkedState, forkedBlock, cache) reward.collectFromSyncAggregate(forkedState, forkedBlock, cache)
ok(gweiToWei(reward)) ok(reward.toWei)

9
ncli/ncli_testnet.nim
View File

@ -15,7 +15,7 @@ import
../beacon_chain/conf, ../beacon_chain/conf,
../beacon_chain/el/el_manager, ../beacon_chain/el/el_manager,
../beacon_chain/networking/eth2_network, ../beacon_chain/networking/eth2_network,
../beacon_chain/spec/eth2_merkleization, ../beacon_chain/spec/[eth2_merkleization, helpers],
../beacon_chain/spec/datatypes/base, ../beacon_chain/spec/datatypes/base,
../beacon_chain/spec/eth2_apis/eth2_rest_serialization, ../beacon_chain/spec/eth2_apis/eth2_rest_serialization,
../beacon_chain/validators/keystore_management, ../beacon_chain/validators/keystore_management,
@ -518,16 +518,13 @@ proc sendEth(web3: Web3, to: Eth1Address, valueEth: int): Future[TxHash] =
`from`: web3.defaultAccount, `from`: web3.defaultAccount,
gas: Quantity(3000000).some, gas: Quantity(3000000).some,
gasPrice: Quantity(1).some, gasPrice: Quantity(1).some,
value: some(valueEth.u256 * 1000000000000000000.u256), value: some(valueEth.toWei),
to: some(to)) to: some(to))
web3.send(tr) web3.send(tr)
type type
DelayGenerator = proc(): chronos.Duration {.gcsafe, raises: [].} DelayGenerator = proc(): chronos.Duration {.gcsafe, raises: [].}
func ethToWei(eth: UInt256): UInt256 =
eth * 1000000000000000000.u256
proc initWeb3(web3Url, privateKey: string): Future[Web3] {.async.} = proc initWeb3(web3Url, privateKey: string): Future[Web3] {.async.} =
result = await newWeb3(web3Url) result = await newWeb3(web3Url)
if privateKey.len != 0: if privateKey.len != 0:
@ -562,7 +559,7 @@ proc sendDeposits(deposits: seq[LaunchPadDeposit],
SignatureBytes(@(dp.signature.toRaw())), SignatureBytes(@(dp.signature.toRaw())),
FixedBytes[32](hash_tree_root(dp).data)) FixedBytes[32](hash_tree_root(dp).data))
let status = await tx.send(value = 32.u256.ethToWei, gasPrice = gasPrice) let status = await tx.send(value = 32.toWei, gasPrice = gasPrice)
info "Deposit sent", tx = $status info "Deposit sent", tx = $status