Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 54 additions & 25 deletions main.star
Original file line number Diff line number Diff line change
Expand Up @@ -213,29 +213,29 @@ def run(plan, args={}):
description = "Waiting for L1 to sync",
)

# Get real genesis timestamp
contract_genesis_timestamp = plan.run_python(
description="Getting real genesis timestamp for helix",
run="""
import sys
a = int(sys.argv[1])
b = int(sys.argv[2])
print(int(a+b), end="")
""",
args=[str(final_genesis_timestamp),str(network_params.genesis_delay)],
).output

# Deploy all smart contracts
contract_deployer.deploy(
plan,
contract_genesis_timestamp,
all_el_contexts[0],
prefunded_accounts,
network_id,
taiko_params.taiko_deploy_image,
preconf_params.avs_deploy_image,
contracts_addresses,
)
# # Get real genesis timestamp
# contract_genesis_timestamp = plan.run_python(
# description="Getting real genesis timestamp for helix",
# run="""
# import sys
# a = int(sys.argv[1])
# b = int(sys.argv[2])
# print(int(a+b), end="")
# """,
# args=[str(final_genesis_timestamp),str(network_params.genesis_delay)],
# ).output

# # Deploy all smart contracts
# contract_deployer.deploy(
# plan,
# contract_genesis_timestamp,
# all_el_contexts[0],
# prefunded_accounts,
# network_id,
# taiko_params.taiko_deploy_image,
# preconf_params.avs_deploy_image,
# contracts_addresses,
# )

# Broadcaster forwards requests, sent to it, to all nodes in parallel
if "broadcaster" in args_with_right_defaults.additional_services:
Expand Down Expand Up @@ -760,6 +760,35 @@ print(int(a+b), end="")
name="taiko_genesis",
)

plan.run_sh(
run = "sleep 60",
description = "Waiting for L1 to sync",
)

# Get real genesis timestamp
contract_genesis_timestamp = plan.run_python(
description="Getting real genesis timestamp for helix",
run="""
import sys
a = int(sys.argv[1])
b = int(sys.argv[2])
print(int(a+b), end="")
""",
args=[str(final_genesis_timestamp),str(network_params.genesis_delay)],
).output

# Deploy all smart contracts
contract_deployer.deploy(
plan,
contract_genesis_timestamp,
all_el_contexts[0],
prefunded_accounts,
network_id,
taiko_params.taiko_deploy_image,
preconf_params.avs_deploy_image,
contracts_addresses,
)

#Launch boot-node
p2p_bootnode_test = plan.add_service(
name = "taiko-bootnode-test",
Expand Down Expand Up @@ -909,7 +938,7 @@ print(int(a+b), end="")
all_cl_contexts[0],
taiko_stack_1,
taiko_params.taiko_deploy_image,
all_mevboost_contexts[0],
# all_mevboost_contexts[0],
prefunded_accounts,
"3219c83a76e82682c3e706902ca85777e703a06c9f0a82a5dfa6164f527c1ea6",
1,
Expand All @@ -932,7 +961,7 @@ print(int(a+b), end="")
all_cl_contexts[0],
taiko_stack_2,
taiko_params.taiko_deploy_image,
all_mevboost_contexts[0],
# all_mevboost_contexts[0],
prefunded_accounts,
"0dce41fa73ae9f6bdfd51df4d422d75eee174553dba5fd450c4437e4ed3fc903",
1,
Expand Down
22 changes: 12 additions & 10 deletions network_params.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
participants:
# EL
- el_type: nethermind
el_image: nethermindeth/nethermind:ccc88f011
el_log_level: "debug"
- el_type: geth
el_image: ethereum/client-go:latest
el_log_level: ""
el_extra_env_vars: {}
el_extra_labels: {}
el_extra_params: []
Expand Down Expand Up @@ -43,7 +43,7 @@ participants:
# participant specific
node_selectors: {}
tolerations: []
count: 1
count: 2
snooper_enabled: false
ethereum_metrics_exporter_enabled: false
xatu_sentry_enabled: false
Expand Down Expand Up @@ -87,6 +87,7 @@ network_params:
devnet_repo: ethpandaops
prefunded_accounts: {}
additional_services:
- tx_spammer
- blockscout
- taiko_stack
- preconf_avs
Expand All @@ -113,7 +114,8 @@ parallel_keystore_generation: false
disable_peer_scoring: false
grafana_additional_dashboards: []
persistent: false
mev_type: commit-boost
mev_type: null
# mev_type: commit-boost
mev_params:
mev_relay_image: ghcr.io/chainbound/bolt-relay:v0.2.1-alpha
mev_builder_image: ghcr.io/chainbound/bolt-builder:v0.3.0-alpha.rc3
Expand Down Expand Up @@ -147,13 +149,13 @@ preconf_params:
avs_deploy_image: nethswitchboard/preconf-avs-protocol:latest
preconf_avs_image: nethswitchboard/preconf-avs-node:whitelist
contracts_addresses:
taiko_l1: 0x7E2E7DD2Aead92e2e6d05707F21D4C36004f8A2B
taiko_token: 0x422A3492e218383753D8006C7Bfa97815B44373F
taiko_l1: 0xBb4d683Ae82b814ca7d580AF5922306bF63E7A88
taiko_token: 0x83706736D4821aE382E795D57092e0320182eCd4
taiko_l2: 0x1670010000000000000000000000000000010001
l2_suggested_fee_recipient: 0x8943545177806ED17B9F23F0a21ee5948eCaa776
preconf_router: 0x1788a5D023bac58bAF55a92153192a6568E42BAD
taiko_wrapper: 0x57718C9cE2CcC1D7a4a136ebECA892c8Dd9F67c7
preconf_whitelist: 0x3D7F46607b02EAd1Cd1d09A86B76885730d3De0F
preconf_router: 0x61064B18219b8aE1d5dCb962cECBfA736B46d83a
taiko_wrapper: 0x47cD215F786D723Bbe0118b19c23f897cd3c7544
preconf_whitelist: 0x63d7b5Dd5474BB7cF3c0Cef1Ca7b3a6BbDAC6109
avs_directory: 0xBf549F50fdbbD7Eb73ce88985AA107eEC0955f4c
strategy_manager: 0xe21c9cfea094aAbE99C96D56281a00876F97258a
slasher: 0x700420690932eeB22bCd01fBf537d37BeCa5577C
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/contract_deployer.star
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def deploy(
el_rpc_url = el_context.rpc_http_url

# Get first prefunded account
first_prefunded_account = prefunded_accounts[0]
first_prefunded_account = prefunded_accounts[10]

# Deploy taiko contracts
taiko_contract_deployer.deploy(
Expand Down
3 changes: 2 additions & 1 deletion src/package_io/constants.star
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ EIP7594_FORK_VERSION = "0x70000038"

ETHEREUM_GENESIS_GENERATOR = struct(
capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12", # Deprecated (no support for minimal config)
deneb_genesis="nethswitchboard/ethereum-genesis-generator:e2e", # Customised for Taiko Preconf
# deneb_genesis="nethswitchboard/ethereum-genesis-generator:e2e", # Customised for Taiko Preconf
deneb_genesis="ethpandaops/ethereum-genesis-generator:4.1.9",
verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19", # soon to be deneb genesis, waiting for rebase
verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0",
)
Expand Down
12 changes: 6 additions & 6 deletions src/preconf_avs/avs_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def launch(
cl_context,
taiko_stack,
taiko_protocol_image,
mev_boost_context,
# mev_boost_context,
prefunded_accounts,
first_validator_bls_private_key,
first_validator_index,
Expand All @@ -23,11 +23,11 @@ def launch(
contracts_addresses,
simulate_not_submitting_at_the_end_of_epoch,
):
mev_boost_url = "http://{0}:{1}".format(
mev_boost_context.private_ip_address, mev_boost_context.port
)
# mev_boost_url = "http://{0}:{1}".format(
# mev_boost_context.private_ip_address, mev_boost_context.port
# )

contract_owner = prefunded_accounts[0]
contract_owner = prefunded_accounts[10]
RPC_URL_COMMAND = "--rpc-url {0}".format(el_context.rpc_http_url)
PRIVATE_KEY_OWNER_COMMAND = "--private-key {0}".format(contract_owner.private_key)
ADDRESS_OPERATOR = prefunded_accounts[index].address
Expand Down Expand Up @@ -77,7 +77,7 @@ def launch(
"L1_CHAIN_ID": l1_chain_id,
"VALIDATOR_BLS_PRIVATEKEY": first_validator_bls_private_key,
"VALIDATOR_INDEX": str(first_validator_index),
"MEV_BOOST_URL": mev_boost_url,
# "MEV_BOOST_URL": mev_boost_url,
"L1_WS_RPC_URL": el_context.ws_url,
"L1_BEACON_URL": cl_context.beacon_http_url,
"RUST_LOG": "debug,reqwest=info,hyper=info,alloy_transport=info,alloy_rpc_client=info,p2p_network=info,libp2p_gossipsub=info,discv5=info,netlink_proto=info",
Expand Down
Loading