status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

export `DepositContractSnapshot` in eth1 monitor (#3860) 

Avoid requiring explicit `beacon_chain_db` import in eth1 monitor use.
This commit is contained in:
Etan Kissling 2022-07-12 18:45:48 -07:00 committed by GitHub
parent b164f6357b
commit 22e77131f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
beacon_chain/eth1/eth1_monitor.nim
View File

@ -27,7 +27,8 @@ from std/times import getTime, inSeconds, initTime, `-`
from ../spec/engine_authentication import getSignedIatToken from ../spec/engine_authentication import getSignedIatToken
export export
web3Types, deques web3Types, deques,
beacon_chain_db.DepositContractSnapshot
logScope: logScope:
topics = "eth1" topics = "eth1"

8
scripts/test_merge_node.nim
View File

@ -1,3 +1,10 @@
# beacon_chain
# Copyright (c) 2022 Status Research & Development GmbH
# Licensed and distributed under either of
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
# at your option. This file may not be copied, modified, or distributed except according to those terms.
# https://notes.ethereum.org/@9AeMAlpyQYaAAyuj47BzRw/rkwW3ceVY # https://notes.ethereum.org/@9AeMAlpyQYaAAyuj47BzRw/rkwW3ceVY
# Monitor traffic: socat -v TCP-LISTEN:9550,fork TCP-CONNECT:127.0.0.1:8550 # Monitor traffic: socat -v TCP-LISTEN:9550,fork TCP-CONNECT:127.0.0.1:8550
@ -12,7 +19,6 @@ import
from std/os import paramCount, paramStr from std/os import paramCount, paramStr
from nimcrypto/utils import fromHex from nimcrypto/utils import fromHex
from web3/engine_api_types import PayloadExecutionStatus from web3/engine_api_types import PayloadExecutionStatus
from ../beacon_chain/beacon_chain_db import DepositContractSnapshot
from ../beacon_chain/networking/network_metadata import Eth1Network from ../beacon_chain/networking/network_metadata import Eth1Network
from ../beacon_chain/spec/datatypes/base import ZERO_HASH from ../beacon_chain/spec/datatypes/base import ZERO_HASH
from ../beacon_chain/spec/presets import Eth1Address, defaultRuntimeConfig from ../beacon_chain/spec/presets import Eth1Address, defaultRuntimeConfig

8
scripts/test_merge_vectors.nim
View File

@ -1,3 +1,10 @@
# beacon_chain
# Copyright (c) 2022 Status Research & Development GmbH
# Licensed and distributed under either of
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
# at your option. This file may not be copied, modified, or distributed except according to those terms.
# https://notes.ethereum.org/@9AeMAlpyQYaAAyuj47BzRw/rkwW3ceVY # https://notes.ethereum.org/@9AeMAlpyQYaAAyuj47BzRw/rkwW3ceVY
# Monitor traffic: socat -v TCP-LISTEN:9550,fork TCP-CONNECT:127.0.0.1:8550 # Monitor traffic: socat -v TCP-LISTEN:9550,fork TCP-CONNECT:127.0.0.1:8550
@ -9,7 +16,6 @@ import
from nimcrypto/utils import fromHex from nimcrypto/utils import fromHex
from web3/engine_api_types import PayloadExecutionStatus from web3/engine_api_types import PayloadExecutionStatus
from ../beacon_chain/beacon_chain_db import DepositContractSnapshot
from ../beacon_chain/networking/network_metadata import Eth1Network from ../beacon_chain/networking/network_metadata import Eth1Network
from ../beacon_chain/spec/datatypes/base import ZERO_HASH from ../beacon_chain/spec/datatypes/base import ZERO_HASH
from ../beacon_chain/spec/presets import Eth1Address, defaultRuntimeConfig from ../beacon_chain/spec/presets import Eth1Address, defaultRuntimeConfig