Skip to content

E
ethereum-package
Commit abdfc2c3 authored by Barnabas Busa's avatar Barnabas Busa Committed by GitHub
Browse files
Options

feat: we no longer need 4788 deployer (#485)

parent bbe0b16e
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 177 deletions
README.md
View file @ abdfc2c3
......@@ -769,7 +769,6 @@ Here's a table of where the keys are used
| 1 | blob_spammer | ✅ | | As the sender of blobs |
| 3 | transaction_spammer | ✅ | | To spam transactions with |
| 4 | goomy_blob | ✅ | | As the sender of blobs |
| 5 | eip4788_deployment | ✅ | | As contract deployer |
| 6 | mev_flood | ✅ | | As the contract owner |
| 7 | mev_flood | ✅ | | As the user_key |
| 8 | assertoor | ✅ | ✅ | As the funding for tests |
......
main.star
View file @ abdfc2c3
......@@ -34,9 +34,6 @@ mev_flood = import_module("./src/mev/mev_flood/mev_flood_launcher.star")
mev_custom_flood = import_module(
"./src/mev/mev_custom_flood/mev_custom_flood_launcher.star"
)
eip4788_deployment = import_module(
"./src/eip4788_deployment/eip4788_deployment_launcher.star"
)
broadcaster = import_module("./src/broadcaster/broadcaster.star")
assertoor = import_module("./src/assertoor/assertoor_launcher.star")
......@@ -130,18 +127,6 @@ def run(plan, args={}):
all_cl_client_contexts,
args_with_right_defaults.participants,
)
if network_params.network == constants.NETWORK_NAME.kurtosis:
if network_params.deneb_fork_epoch != 0:
plan.print("Launching 4788 contract deployer")
el_uri = "http://{0}:{1}".format(
all_el_client_contexts[0].ip_addr,
all_el_client_contexts[0].rpc_port_num,
)
eip4788_deployment.deploy_eip4788_contract_in_background(
plan,
genesis_constants.PRE_FUNDED_ACCOUNTS[5].private_key,
el_uri,
)
fuzz_target = "http://{0}:{1}".format(
all_el_client_contexts[0].ip_addr,
......
src/eip4788_deployment/eip4788_deployment_launcher.star deleted 100644 → 0
View file @ bbe0b16e
PYTHON_IMAGE = "ethpandaops/python-web3"
EIP4788_DEPLOYMENT_SERVICE_NAME = "eip4788-contract-deployment"
# The min/max CPU/memory that deployer can use
MIN_CPU = 10
MAX_CPU = 100
MIN_MEMORY = 10
MAX_MEMORY = 300
def deploy_eip4788_contract_in_background(plan, sender_key, el_uri):
sender_script = plan.upload_files(
src="./sender.py", name="eip4788-deployment-sender"
)
plan.add_service(
name=EIP4788_DEPLOYMENT_SERVICE_NAME,
config=ServiceConfig(
image=PYTHON_IMAGE,
files={"/tmp": sender_script},
cmd=["/bin/sh", "-c", "touch /tmp/sender.log && tail -f /tmp/sender.log"],
env_vars={
"SENDER_PRIVATE_KEY": sender_key,
"EL_RPC_URI": el_uri,
},
min_cpu=MIN_CPU,
max_cpu=MAX_CPU,
min_memory=MIN_MEMORY,
max_memory=MAX_MEMORY,
),
)
plan.exec(
service_name=EIP4788_DEPLOYMENT_SERVICE_NAME,
recipe=ExecRecipe(
["/bin/sh", "-c", "nohup python /tmp/sender.py > /dev/null 2>&1 &"]
),
)
src/eip4788_deployment/sender.py deleted 100644 → 0
View file @ bbe0b16e
"""
this script deploys the contract used by eip4788. It has been presigned and the contract uses a deterministic deployment.
"""
from web3 import Web3
from web3.middleware import construct_sign_and_send_raw_middleware
import os
import time
import logging
from decimal import Decimal
VALUE_TO_SEND = 0x9184
logging.basicConfig(filename="/tmp/sender.log",
filemode='a',
format='%(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s',
datefmt='%H:%M:%S',
level=logging.INFO)
def eip4788_deployment():
# this is the 5th prefunded address
sender = os.getenv("SENDER_PRIVATE_KEY", "7da08f856b5956d40a72968f93396f6acff17193f013e8053f6fbb6c08c194d6")
# this is the 4788 presigned contract deployer
receiver = "0x0B799C86a49DEeb90402691F1041aa3AF2d3C875"
signed_4788_deployment_tx = os.getenv("SIGNED_4788_DEPLOYMENT_TX", "f8838085e8d4a510008303d0908080b86a60618060095f395ff33373fffffffffffffffffffffffffffffffffffffffe14604d57602036146024575f5ffd5b5f35801560495762001fff810690815414603c575f5ffd5b62001fff01545f5260205ff35b5f5ffd5b62001fff42064281555f359062001fff0155001b820539851b9b6eb1f0")
el_uri = os.getenv("EL_RPC_URI", 'http://0.0.0.0:53913')
logging.info(f"Using sender {sender} receiver {receiver} and el_uri {el_uri}")
w3 = Web3(Web3.HTTPProvider(el_uri))
# sleep for 10s before checking again
time.sleep(10)
# Check if the chain has started before submitting transactions
block = w3.eth.get_block('latest')
logging.info(f"Latest block number: {block.number}")
if block.number >1:
logging.info("Chain has started, proceeding with Funding")
# Import sender account
sender_account = w3.eth.account.from_key(sender)
# Prepare to Construct and sign transaction
w3.middleware_onion.add(construct_sign_and_send_raw_middleware(sender_account))
# Prepare funding transaction
logging.info("Preparing funding tx")
transaction = {
"from": sender_account.address,
"to": receiver,
"value": w3.to_wei(Decimal('1000.0'), 'ether'), # Sending 1000 Ether
"gasPrice": w3.eth.gas_price,
'nonce': w3.eth.get_transaction_count(sender_account.address)
}
# Estimate gas
logging.info("Estimating gas")
estimated_gas = w3.eth.estimate_gas(transaction)
# Set gas value
transaction["gas"] = estimated_gas
# Send transaction
logging.debug(f"Sending deployment tx: {transaction}")
tx_hash = w3.eth.send_transaction(transaction)
time.sleep(10)
# Wait for the transaction to be mined
funding_tx = w3.eth.get_transaction(tx_hash)
logging.debug(f"Funding Txhash: {tx_hash.hex()}")
logging.info(f"Genesis funder Balance: {w3.eth.get_balance(sender_account.address)}")
logging.info(f"4788 deployer Balance: {w3.eth.get_balance(receiver)}")
if funding_tx["from"] == sender_account.address:
logging.info("Funding tx mined successfully")
logging.info("Deploying signed tx")
# Prepare deployment transaction
deployment_tx_hash = w3.eth.send_raw_transaction(signed_4788_deployment_tx)
# Sleep before checking
time.sleep(10)
deployment_tx = w3.eth.get_transaction(deployment_tx_hash)
logging.debug(f"Deployment Txhash: {deployment_tx.hash.hex()}")
# Sleep before checking
time.sleep(10)
logging.info(f"4788 deployer Balance: {w3.eth.get_balance(receiver)}")
assert deployment_tx["from"] == receiver
# Check if contract has been deployed
eip4788_code = w3.eth.get_code('0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02')
if eip4788_code != "":
logging.info(f"Contract deployed: {eip4788_code.hex()}")
logging.info("Deployment tx mined successfully")
# Exit script
return True
else:
logging.info("Deployment failed, restarting script")
return False
else:
logging.info("Funding failed, restarting script")
return False
else:
logging.info("Chain has not started, restarting script")
return False
def run_till_deployed():
deployment_status = False
while deployment_status is False:
try:
deployment_status = eip4788_deployment()
except Exception as e:
logging.error(e)
logging.error("restarting deployment as previous one failed")
if __name__ == "__main__":
run_till_deployed()
logging.info("Deployment complete, exiting script")
src/participant_network.star
View file @ abdfc2c3
......@@ -119,7 +119,7 @@ def launch_participant_network(
and network_params.electra_fork_epoch == None
):
ethereum_genesis_generator_image = (
"ethpandaops/ethereum-genesis-generator:2.0.8"
"ethpandaops/ethereum-genesis-generator:2.0.11"
)
# we are running electra - experimental
elif network_params.electra_fork_epoch != None:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment