diff --git a/app/data/compose/docker-compose-fixturenet-lotus.yml b/app/data/compose/docker-compose-fixturenet-lotus.yml index d4e72b79..43578682 100644 --- a/app/data/compose/docker-compose-fixturenet-lotus.yml +++ b/app/data/compose/docker-compose-fixturenet-lotus.yml @@ -8,17 +8,9 @@ services: image: cerc/lotus:local volumes: - ../config/fixturenet-lotus/setup-miner.sh:/docker-entrypoint-scripts.d/setup-miner.sh - - ../config/fixturenet-lotus/genesis/devgen.car:/devgen.car - - $HOME/stack-orchestrator/app/data/config/fixturenet-lotus/genesis/.genesis-sectors:/root/.genesis-sectors + - ../config/fixturenet-lotus/fund-account.sh:/fund-account.sh + - lotus_miner_params:/var/tmp/filecoin-proof-parameters - lotus-shared:/root/.lotus-shared - healthcheck: -# test: ["CMD-SHELL", "grep 'started ChainNotify channel' /var/log/lotus.log"] -# test: ["CMD-SHELL", "[ -f /root/.lotus-shared/miner.addr ]"] - test: ["CMD-SHELL", "[ -d /root/.lotus-miner-local-net ]"] - interval: 10s - timeout: 10s - retries: 10 - start_period: 60s entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-miner.sh"] ports: - "1234" @@ -30,14 +22,16 @@ services: hostname: lotus-node-1 env_file: - ../config/fixturenet-lotus/lotus-env.env + environment: + # Use 0.0.0.0 so that calls can be made from outside the container + - LOTUS_API_LISTENADDRESS=/ip4/0.0.0.0/tcp/1234/http image: cerc/lotus:local volumes: - ../config/fixturenet-lotus/setup-node.sh:/docker-entrypoint-scripts.d/setup-node.sh - - ../config/fixturenet-lotus/genesis/devgen.car:/devgen.car + - lotus_node_1_params:/var/tmp/filecoin-proof-parameters - lotus-shared:/root/.lotus-shared depends_on: - lotus-miner: - condition: service_healthy + - lotus-miner entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-node.sh"] ports: - "1234" @@ -49,14 +43,16 @@ services: hostname: lotus-node-2 env_file: - ../config/fixturenet-lotus/lotus-env.env + environment: + # Use 0.0.0.0 so that calls can be made from outside the container + - LOTUS_API_LISTENADDRESS=/ip4/0.0.0.0/tcp/1234/http image: cerc/lotus:local volumes: - ../config/fixturenet-lotus/setup-node.sh:/docker-entrypoint-scripts.d/setup-node.sh - - ../config/fixturenet-lotus/genesis/devgen.car:/devgen.car + - lotus_node_2_params:/var/tmp/filecoin-proof-parameters - lotus-shared:/root/.lotus-shared depends_on: - lotus-miner: - condition: service_healthy + - lotus-miner entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-node.sh"] ports: - "1234" @@ -65,4 +61,7 @@ services: - "1777" volumes: - lotus-shared: \ No newline at end of file + lotus_miner_params: + lotus_node_1_params: + lotus_node_2_params: + lotus-shared: diff --git a/app/data/compose/docker-compose-fixturenet-plugeth.yml b/app/data/compose/docker-compose-fixturenet-plugeth.yml index 27f997de..4780574c 100644 --- a/app/data/compose/docker-compose-fixturenet-plugeth.yml +++ b/app/data/compose/docker-compose-fixturenet-plugeth.yml @@ -9,6 +9,7 @@ services: image: cerc/fixturenet-plugeth-plugeth:local volumes: - fixturenet_plugeth_bootnode_geth_data:/root/ethdata + - ../config/fixturenet-plugeth/plugins:/root/ethdata/plugins ports: - "9898" - "30303" @@ -65,7 +66,7 @@ services: hostname: fixturenet-eth-bootnode-lighthouse environment: RUN_BOOTNODE: "true" - image: cerc/fixturenet-eth-lighthouse:local + image: cerc/fixturenet-plugeth-lighthouse:local fixturenet-eth-lighthouse-1: restart: always @@ -82,7 +83,7 @@ services: NODE_NUMBER: "1" ETH1_ENDPOINT: "http://fixturenet-eth-geth-1:8545" EXECUTION_ENDPOINT: "http://fixturenet-eth-geth-1:8551" - image: cerc/fixturenet-eth-lighthouse:local + image: cerc/fixturenet-plugeth-lighthouse:local volumes: - fixturenet_plugeth_lighthouse_1_data:/opt/testnet/build/cl depends_on: @@ -109,7 +110,7 @@ services: ETH1_ENDPOINT: "http://fixturenet-eth-geth-2:8545" EXECUTION_ENDPOINT: "http://fixturenet-eth-geth-2:8551" LIGHTHOUSE_GENESIS_STATE_URL: "http://fixturenet-eth-lighthouse-1:8001/eth/v2/debug/beacon/states/0" - image: cerc/fixturenet-eth-lighthouse:local + image: cerc/fixturenet-plugeth-lighthouse:local volumes: - fixturenet_plugeth_lighthouse_2_data:/opt/testnet/build/cl depends_on: diff --git a/app/data/config/fixturenet-lotus/fund-account.sh b/app/data/config/fixturenet-lotus/fund-account.sh new file mode 100755 index 00000000..713134fa --- /dev/null +++ b/app/data/config/fixturenet-lotus/fund-account.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# ETH account with pk c05fd3613bcd62a4f25e5eba1f464d0b76d74c3f771a7c2f13e26ad6439444b3 +ETH_ADDRESS=0xD375B03bd3A2434A9f675bEC4Ccd68aC5e67C743 +AMOUNT=1000 + +# Pre-fund stat +PREFUND_STAT_OUTPUT=$(lotus evm stat $ETH_ADDRESS) + +FILECOIN_ADDRESS=$(echo "$PREFUND_STAT_OUTPUT" | grep -oP 'Filecoin address:\s+\K\S+') +echo Filecoin address: "$FILECOIN_ADDRESS" + +echo Sending balance to "$FILECOIN_ADDRESS" +lotus send --from $(lotus wallet default) "$FILECOIN_ADDRESS" $AMOUNT + +# Post-fund stat +echo lotus evm stat $ETH_ADDRESS +lotus evm stat $ETH_ADDRESS + +echo "Account with ETH address $ETH_ADDRESS funded" diff --git a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-0/p_aux b/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-0/p_aux deleted file mode 100644 index 81030cb4..00000000 --- a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-0/p_aux +++ /dev/null @@ -1 +0,0 @@ -}+V{iй\kq  ?Af~쩙Ltbyqč?aӚJ \ No newline at end of file diff --git a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-0/sc-02-data-tree-r-last.dat b/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-0/sc-02-data-tree-r-last.dat deleted file mode 100644 index 5af05cae..00000000 --- a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-0/sc-02-data-tree-r-last.dat +++ /dev/null @@ -1 +0,0 @@ -f~쩙Ltbyqč?aӚJ \ No newline at end of file diff --git a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-0/t_aux b/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-0/t_aux deleted file mode 100644 index 09302363..00000000 Binary files a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-0/t_aux and /dev/null differ diff --git a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-1/p_aux b/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-1/p_aux deleted file mode 100644 index 5ed0bcb8..00000000 Binary files a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-1/p_aux and /dev/null differ diff --git a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-1/sc-02-data-tree-r-last.dat b/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-1/sc-02-data-tree-r-last.dat deleted file mode 100644 index 6165cf10..00000000 Binary files a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-1/sc-02-data-tree-r-last.dat and /dev/null differ diff --git a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-1/t_aux b/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-1/t_aux deleted file mode 100644 index 1a9f9afc..00000000 Binary files a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/cache/s-t01000-1/t_aux and /dev/null differ diff --git a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/pre-seal-t01000.json b/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/pre-seal-t01000.json deleted file mode 100644 index 3a05d4b1..00000000 --- a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/pre-seal-t01000.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "t01000": { - "ID": "t01000", - "Owner": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q", - "Worker": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q", - "PeerId": "12D3KooWG5q6pWJVdPBhDBv9AjWVbUh4xxTAZ7xvgZSjczWuD2Z9", - "MarketBalance": "0", - "PowerBalance": "0", - "SectorSize": 2048, - "Sectors": [ - { - "CommR": { - "/": "bagboea4b5abcboxypcewlkmrat2myu4vthk3ii2pcomak7nhqmdbb6sxlolp2wdf" - }, - "CommD": { - "/": "baga6ea4seaqn3jfixthmdgksv4vhfeuyvr6upw6tvaqbmzmsyxnzosm4pwgnmlq" - }, - "SectorID": 0, - "Deal": { - "PieceCID": { - "/": "baga6ea4seaqn3jfixthmdgksv4vhfeuyvr6upw6tvaqbmzmsyxnzosm4pwgnmlq" - }, - "PieceSize": 2048, - "VerifiedDeal": false, - "Client": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q", - "Provider": "t01000", - "Label": "0", - "StartEpoch": 0, - "EndEpoch": 9001, - "StoragePricePerEpoch": "0", - "ProviderCollateral": "0", - "ClientCollateral": "0" - }, - "DealClientKey": { - "Type": "bls", - "PrivateKey": "tFvSRiSg2G3Ssgg0PSYy23XyjaIMXpsmdyG2B7UFLT4=" - }, - "ProofType": 5 - }, - { - "CommR": { - "/": "bagboea4b5abcb6krzypqcczhcnbeyjcqkeo6omfergm336o3kitugh3jgjog2yqq" - }, - "CommD": { - "/": "baga6ea4seaqhondpb2373hjasjplxvbjzi5n5mm4fbbhjxp5ptnbq4cibapkeii" - }, - "SectorID": 1, - "Deal": { - "PieceCID": { - "/": "baga6ea4seaqhondpb2373hjasjplxvbjzi5n5mm4fbbhjxp5ptnbq4cibapkeii" - }, - "PieceSize": 2048, - "VerifiedDeal": false, - "Client": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q", - "Provider": "t01000", - "Label": "1", - "StartEpoch": 0, - "EndEpoch": 9001, - "StoragePricePerEpoch": "0", - "ProviderCollateral": "0", - "ClientCollateral": "0" - }, - "DealClientKey": { - "Type": "bls", - "PrivateKey": "tFvSRiSg2G3Ssgg0PSYy23XyjaIMXpsmdyG2B7UFLT4=" - }, - "ProofType": 5 - } - ] - } -} \ No newline at end of file diff --git a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/pre-seal-t01000.key b/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/pre-seal-t01000.key deleted file mode 100644 index 53e58628..00000000 --- a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/pre-seal-t01000.key +++ /dev/null @@ -1 +0,0 @@ -7b2254797065223a22626c73222c22507269766174654b6579223a227446765352695367324733537367673050535979323358796a61494d5870736d64794732423755464c54343d227d \ No newline at end of file diff --git a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/sealed/s-t01000-0 b/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/sealed/s-t01000-0 deleted file mode 100644 index 56a0f872..00000000 Binary files a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/sealed/s-t01000-0 and /dev/null differ diff --git a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/sealed/s-t01000-1 b/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/sealed/s-t01000-1 deleted file mode 100644 index dc3afe0f..00000000 Binary files a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/sealed/s-t01000-1 and /dev/null differ diff --git a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/sectorstore.json b/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/sectorstore.json deleted file mode 100644 index a49be73f..00000000 --- a/app/data/config/fixturenet-lotus/genesis/.genesis-sectors/sectorstore.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ID": "f355523e-69d0-4984-bd0e-9588487c6231", - "Weight": 0, - "CanSeal": false, - "CanStore": false, - "MaxStorage": 0, - "Groups": null, - "AllowTo": null, - "AllowTypes": null, - "DenyTypes": null -} \ No newline at end of file diff --git a/app/data/config/fixturenet-lotus/genesis/devgen.car b/app/data/config/fixturenet-lotus/genesis/devgen.car deleted file mode 100644 index a22eaed4..00000000 Binary files a/app/data/config/fixturenet-lotus/genesis/devgen.car and /dev/null differ diff --git a/app/data/config/fixturenet-lotus/genesis/localnet.json b/app/data/config/fixturenet-lotus/genesis/localnet.json deleted file mode 100644 index 06d3123e..00000000 --- a/app/data/config/fixturenet-lotus/genesis/localnet.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "NetworkVersion": 18, - "Accounts": [ - { - "Type": "account", - "Balance": "50000000000000000000000000", - "Meta": { - "Owner": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q" - } - } - ], - "Miners": [ - { - "ID": "t01000", - "Owner": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q", - "Worker": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q", - "PeerId": "12D3KooWG5q6pWJVdPBhDBv9AjWVbUh4xxTAZ7xvgZSjczWuD2Z9", - "MarketBalance": "0", - "PowerBalance": "0", - "SectorSize": 2048, - "Sectors": [ - { - "CommR": { - "/": "bagboea4b5abcboxypcewlkmrat2myu4vthk3ii2pcomak7nhqmdbb6sxlolp2wdf" - }, - "CommD": { - "/": "baga6ea4seaqn3jfixthmdgksv4vhfeuyvr6upw6tvaqbmzmsyxnzosm4pwgnmlq" - }, - "SectorID": 0, - "Deal": { - "PieceCID": { - "/": "baga6ea4seaqn3jfixthmdgksv4vhfeuyvr6upw6tvaqbmzmsyxnzosm4pwgnmlq" - }, - "PieceSize": 2048, - "VerifiedDeal": false, - "Client": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q", - "Provider": "t01000", - "Label": "0", - "StartEpoch": 0, - "EndEpoch": 9001, - "StoragePricePerEpoch": "0", - "ProviderCollateral": "0", - "ClientCollateral": "0" - }, - "DealClientKey": { - "Type": "bls", - "PrivateKey": "tFvSRiSg2G3Ssgg0PSYy23XyjaIMXpsmdyG2B7UFLT4=" - }, - "ProofType": 5 - }, - { - "CommR": { - "/": "bagboea4b5abcb6krzypqcczhcnbeyjcqkeo6omfergm336o3kitugh3jgjog2yqq" - }, - "CommD": { - "/": "baga6ea4seaqhondpb2373hjasjplxvbjzi5n5mm4fbbhjxp5ptnbq4cibapkeii" - }, - "SectorID": 1, - "Deal": { - "PieceCID": { - "/": "baga6ea4seaqhondpb2373hjasjplxvbjzi5n5mm4fbbhjxp5ptnbq4cibapkeii" - }, - "PieceSize": 2048, - "VerifiedDeal": false, - "Client": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q", - "Provider": "t01000", - "Label": "1", - "StartEpoch": 0, - "EndEpoch": 9001, - "StoragePricePerEpoch": "0", - "ProviderCollateral": "0", - "ClientCollateral": "0" - }, - "DealClientKey": { - "Type": "bls", - "PrivateKey": "tFvSRiSg2G3Ssgg0PSYy23XyjaIMXpsmdyG2B7UFLT4=" - }, - "ProofType": 5 - } - ] - } - ], - "NetworkName": "localnet-6d52dae5-ff29-4bac-a45d-f84e6c07564c", - "VerifregRootKey": { - "Type": "multisig", - "Balance": "0", - "Meta": { - "Signers": [ - "t1ceb34gnsc6qk5dt6n7xg6ycwzasjhbxm3iylkiy" - ], - "Threshold": 1, - "VestingDuration": 0, - "VestingStart": 0 - } - }, - "RemainderAccount": { - "Type": "multisig", - "Balance": "0", - "Meta": { - "Signers": [ - "t1ceb34gnsc6qk5dt6n7xg6ycwzasjhbxm3iylkiy" - ], - "Threshold": 1, - "VestingDuration": 0, - "VestingStart": 0 - } - } -} \ No newline at end of file diff --git a/app/data/config/fixturenet-lotus/lotus-env.env b/app/data/config/fixturenet-lotus/lotus-env.env index 582b8944..9ffd8e85 100644 --- a/app/data/config/fixturenet-lotus/lotus-env.env +++ b/app/data/config/fixturenet-lotus/lotus-env.env @@ -1,5 +1,6 @@ -LOTUS_PATH=~/.lotus-local-net -LOTUS_MINER_PATH=~/.lotus-miner-local-net +LOTUS_PATH=/root/.lotus-local-net +LOTUS_MINER_PATH=/root/.lotus-miner-local-net LOTUS_SKIP_GENESIS_CHECK=_yes_ +LOTUS_FEVM_ENABLEETHRPC=true CGO_CFLAGS_ALLOW="-D__BLST_PORTABLE__" CGO_CFLAGS="-D__BLST_PORTABLE__" diff --git a/app/data/config/fixturenet-lotus/setup-miner.sh b/app/data/config/fixturenet-lotus/setup-miner.sh index 1b818de6..68dd5f57 100644 --- a/app/data/config/fixturenet-lotus/setup-miner.sh +++ b/app/data/config/fixturenet-lotus/setup-miner.sh @@ -2,34 +2,47 @@ lotus --version -# # remove old bootnode peer info if present -# [ -f /root/.lotus-shared/miner.addr ] && rm /root/.lotus-shared/miner.addr +# remove old bootnode peer info if present +if [ -f /root/.lotus-shared/miner.addr ]; then + rm /root/.lotus-shared/miner.addr +fi -##TODO: generate genesis files inside container instead of bundling in config dir -##something like commands below should work, other scripts/compose will have to be updated to corresponding directories -# lotus fetch-params 2048 -# lotus-seed pre-seal --sector-size 2KiB --num-sectors 2 -# lotus-seed genesis new localnet.json -# lotus-seed genesis add-miner localnet.json ~/.genesis-sectors/pre-seal-t01000.json +# Check if filecoin-proof-parameters exist; avoid fetching if they do +if [ -z "$(find "/var/tmp/filecoin-proof-parameters" -maxdepth 1 -type f)" ]; then + echo "Proof params not found, fetching..." + lotus fetch-params 2048 +else + echo "Existing proof params found" +fi +lotus-seed pre-seal --sector-size 2KiB --num-sectors 2 +lotus-seed genesis new localnet.json +lotus-seed genesis add-miner localnet.json ~/.genesis-sectors/pre-seal-t01000.json # start daemon -nohup lotus daemon --genesis=/devgen.car --profile=bootstrapper --bootstrap=false > /var/log/lotus.log 2>&1 & +nohup lotus daemon --lotus-make-genesis=devgen.car --profile=bootstrapper --genesis-template=localnet.json --bootstrap=false > /var/log/lotus.log 2>&1 & # Loop until the daemon is started echo "Waiting for daemon to start..." while ! grep -q "started ChainNotify channel" /var/log/lotus.log ; do - sleep 5 + sleep 5 done echo "Daemon started." +# copy genesis file to shared volume +cp /devgen.car /root/.lotus-shared + # publish bootnode peer info to shared volume -lotus net listen | awk 'NR==1{print}' > /root/.lotus-shared/miner.addr +lotus net listen | awk 'NR==2{print}' > /root/.lotus-shared/miner.addr # if miner not already initialized -if [ ! -d /root/.lotus-miner-local-net ]; then +if [ ! -d $LOTUS_MINER_PATH ]; then # initialize miner lotus wallet import --as-default ~/.genesis-sectors/pre-seal-t01000.key + + # fund a known account for usage + /fund-account.sh + lotus-miner init --genesis-miner --actor=t01000 --sector-size=2KiB --pre-sealed-sectors=~/.genesis-sectors --pre-sealed-metadata=~/.genesis-sectors/pre-seal-t01000.json --nosync fi diff --git a/app/data/config/fixturenet-lotus/setup-node.sh b/app/data/config/fixturenet-lotus/setup-node.sh index 0bcd4717..dc3392fe 100644 --- a/app/data/config/fixturenet-lotus/setup-node.sh +++ b/app/data/config/fixturenet-lotus/setup-node.sh @@ -2,23 +2,28 @@ lotus --version -##TODO: paths can use values from lotus-env.env file +# Loop until the daemon is started +echo "Waiting for miner to share peering info..." +while [ ! -f /root/.lotus-shared/miner.addr ]; do + sleep 5 +done +echo "Resuming..." # if not already initialized -if [ ! -f /root/.lotus-local-net/config.toml ]; then +if [ ! -f $LOTUS_PATH/config.toml ]; then # init node config - mkdir $HOME/.lotus-local-net - lotus config default > $HOME/.lotus-local-net/config.toml + mkdir $LOTUS_PATH + lotus config default > $LOTUS_PATH/config.toml # add bootstrap peer info if available if [ -f /root/.lotus-shared/miner.addr ]; then MINER_ADDR=\"$(cat /root/.lotus-shared/miner.addr)\" # add bootstrap peer id to config file - sed -i "/^\[Libp2p\]/a \ \ BootstrapPeers = [$MINER_ADDR]" $HOME/.lotus-local-net/config.toml + sed -i "/^\[Libp2p\]/a \ \ BootstrapPeers = [$MINER_ADDR]" $LOTUS_PATH/config.toml else echo "Bootstrap peer info not found, unable to configure. Manual peering will be required." fi fi # start node -lotus daemon --genesis=/devgen.car +lotus daemon --genesis=/root/.lotus-shared/devgen.car diff --git a/app/data/config/fixturenet-plugeth/plugins/README.md b/app/data/config/fixturenet-plugeth/plugins/README.md new file mode 100644 index 00000000..aa5aac1b --- /dev/null +++ b/app/data/config/fixturenet-plugeth/plugins/README.md @@ -0,0 +1 @@ +See: https://docs.plugeth.org/ diff --git a/app/data/config/mainnet-eth/scripts/run-geth.sh b/app/data/config/mainnet-eth/scripts/run-geth.sh index 3844ef99..c249618b 100755 --- a/app/data/config/mainnet-eth/scripts/run-geth.sh +++ b/app/data/config/mainnet-eth/scripts/run-geth.sh @@ -23,8 +23,6 @@ cleanup() { echo "Done" } -trap 'cleanup' SIGINT SIGTERM - $START_CMD \ --datadir="${CERC_ETH_DATADIR}" \ --authrpc.addr="0.0.0.0" \ diff --git a/app/data/container-build/cerc-fixturenet-eth-genesis/Dockerfile b/app/data/container-build/cerc-fixturenet-eth-genesis/Dockerfile deleted file mode 100644 index 7445b026..00000000 --- a/app/data/container-build/cerc-fixturenet-eth-genesis/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen - -FROM golang:1.20-alpine as builder - -RUN apk add --no-cache python3 py3-pip - -COPY genesis /opt/genesis - -# Install ethereum-genesis-generator tools -COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/ -COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/ -COPY --from=ethgen /apps /apps -RUN cd /apps/el-gen && pip3 install -r requirements.txt -# web3==5.24.0 used by el-gen is broken on python 3.11 -RUN pip3 install --upgrade "web3==6.5.0" - -# Build genesis config -RUN apk add --no-cache make bash envsubst jq -RUN cd /opt/genesis && make genesis-el - -# Snag the genesis block info. -RUN go install github.com/cerc-io/eth-dump-genblock@latest -RUN eth-dump-genblock /opt/genesis/build/el/geth.json > /opt/genesis/build/el/genesis_block.json - -FROM alpine:latest - -COPY --from=builder /opt/genesis /opt/genesis diff --git a/app/data/container-build/cerc-fixturenet-eth-genesis/build.sh b/app/data/container-build/cerc-fixturenet-eth-genesis/build.sh deleted file mode 100755 index e2fd1126..00000000 --- a/app/data/container-build/cerc-fixturenet-eth-genesis/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -# Build cerc/fixturenet-eth-genesis - -source ${CERC_CONTAINER_BASE_DIR}/build-base.sh - -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -docker build -t cerc/fixturenet-eth-genesis:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR diff --git a/app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile b/app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile index 946dd957..dc81eb06 100644 --- a/app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile +++ b/app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile @@ -1,21 +1,39 @@ -FROM cerc/fixturenet-eth-genesis:local as fnetgen -FROM cerc/go-ethereum:local as geth +FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen # Using the same golang image as used to build geth: https://github.com/cerc-io/go-ethereum/blob/HEAD/Dockerfile -FROM golang:1.20-alpine as delve +FROM golang:1.18-alpine as delve RUN go install github.com/go-delve/delve/cmd/dlv@latest +FROM cerc/go-ethereum:local as geth + FROM alpine:3.17 +RUN apk add --no-cache python3 python3-dev py3-pip curl wget jq build-base gettext libintl openssl bash bind-tools postgresql-client -RUN apk add --no-cache bash wget python3 bind-tools postgresql-client +COPY --from=delve /go/bin/dlv /usr/local/bin/ +COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/ +COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/ +COPY --from=ethgen /apps /apps +RUN cd /apps/el-gen && pip3 install -r requirements.txt + +COPY genesis /opt/testnet COPY run-el.sh /opt/testnet/run.sh -COPY --from=delve /go/bin/dlv /usr/local/bin/ -COPY --from=geth /usr/local/bin/geth /usr/local/bin/ -COPY --from=fnetgen /opt/genesis /opt/testnet +RUN cd /opt/testnet && make genesis-el -# Initialize the geth db with our config +COPY --from=geth /usr/local/bin/geth /usr/local/bin/ + +# Snag the genesis block info. RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey +RUN cp -rp ~/ethdata ~/tmpeth && \ + geth --datadir ~/tmpeth init /opt/testnet/build/el/geth.json && \ + geth --datadir ~/tmpeth --http & \ + sleep 5 && \ + curl -q --location 'localhost:8545' \ + --header 'Content-Type: application/json' \ + --data '{ "jsonrpc": "2.0", "id": 14, "method": "eth_getBlockByNumber", "params": ["0x0", false] }' \ + -o /opt/testnet/build/el/genesis_block.json && \ + killall -9 geth && \ + rm -rf ~/tmpeth ENTRYPOINT ["/opt/testnet/run.sh"] diff --git a/app/data/container-build/cerc-fixturenet-eth-genesis/genesis/Makefile b/app/data/container-build/cerc-fixturenet-eth-geth/genesis/Makefile similarity index 100% rename from app/data/container-build/cerc-fixturenet-eth-genesis/genesis/Makefile rename to app/data/container-build/cerc-fixturenet-eth-geth/genesis/Makefile diff --git a/app/data/container-build/cerc-fixturenet-eth-genesis/genesis/accounts/import_keys.sh b/app/data/container-build/cerc-fixturenet-eth-geth/genesis/accounts/import_keys.sh similarity index 100% rename from app/data/container-build/cerc-fixturenet-eth-genesis/genesis/accounts/import_keys.sh rename to app/data/container-build/cerc-fixturenet-eth-geth/genesis/accounts/import_keys.sh diff --git a/app/data/container-build/cerc-fixturenet-eth-genesis/genesis/accounts/mnemonic_to_csv.py b/app/data/container-build/cerc-fixturenet-eth-geth/genesis/accounts/mnemonic_to_csv.py similarity index 100% rename from app/data/container-build/cerc-fixturenet-eth-genesis/genesis/accounts/mnemonic_to_csv.py rename to app/data/container-build/cerc-fixturenet-eth-geth/genesis/accounts/mnemonic_to_csv.py diff --git a/app/data/container-build/cerc-fixturenet-eth-genesis/genesis/el/build_el.sh b/app/data/container-build/cerc-fixturenet-eth-geth/genesis/el/build_el.sh similarity index 100% rename from app/data/container-build/cerc-fixturenet-eth-genesis/genesis/el/build_el.sh rename to app/data/container-build/cerc-fixturenet-eth-geth/genesis/el/build_el.sh diff --git a/app/data/container-build/cerc-fixturenet-eth-genesis/genesis/el/el-config.yaml b/app/data/container-build/cerc-fixturenet-eth-geth/genesis/el/el-config.yaml similarity index 100% rename from app/data/container-build/cerc-fixturenet-eth-genesis/genesis/el/el-config.yaml rename to app/data/container-build/cerc-fixturenet-eth-geth/genesis/el/el-config.yaml diff --git a/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile b/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile index eb791c68..87f9bb60 100644 --- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile +++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile @@ -1,6 +1,6 @@ FROM cerc/lighthouse-cli:local AS lcli FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen -FROM cerc/fixturenet-eth-genesis:local AS fnetgen +FROM cerc/fixturenet-eth-geth:local AS fnetgeth FROM cerc/lighthouse:local @@ -19,8 +19,8 @@ COPY --from=lcli /usr/local/bin/lcli /usr/local/bin/lcli COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/eth2-testnet-genesis COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/eth2-val-tools COPY --from=ethgen /apps /apps -COPY --from=fnetgen /opt/genesis/el /opt/testnet/el -COPY --from=fnetgen /opt/genesis/build/el /opt/testnet/build/el +COPY --from=fnetgeth /opt/testnet/el /opt/testnet/el +COPY --from=fnetgeth /opt/testnet/build/el /opt/testnet/build/el RUN cd /opt/testnet && make genesis-cl diff --git a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env index 081f8f78..f2060a9a 100644 --- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env +++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env @@ -44,7 +44,7 @@ EXECUTION_ENDPOINT=${EXECUTION_ENDPOINT:-http://localhost:8551} ETH1_GENESIS_JSON=${ETH1_GENESIS_JSON:-"../build/el/geth.json"} ETH1_GENESIS_BLOCK_JSON=${ETH1_GENESIS_BLOCK_JSON:-"../build/el/genesis_block.json"} ETH1_CONFIG_YAML=${ETH1_CONFIG_YAML:-"../el/el-config.yaml"} -ETH1_BLOCK_HASH=${ETH1_BLOCK_HASH:-`cat $ETH1_GENESIS_BLOCK_JSON | jq -r '.hash' | cut -d'x' -f2`} +ETH1_BLOCK_HASH=${ETH1_BLOCK_HASH:-`cat $ETH1_GENESIS_BLOCK_JSON | jq -r '.result.hash' | cut -d'x' -f2`} ETH1_CHAIN_ID=${ETH1_CHAIN_ID:-`cat $ETH1_GENESIS_JSON | jq -r '.config.chainId'`} ETH1_TTD=${ETH1_TTD:-`cat $ETH1_GENESIS_JSON | jq -r '.config.terminalTotalDifficulty'`} diff --git a/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile b/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile new file mode 100644 index 00000000..ba92294b --- /dev/null +++ b/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile @@ -0,0 +1,34 @@ +FROM cerc/lighthouse-cli:local AS lcli +FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen +FROM cerc/fixturenet-plugeth-plugeth:local AS fnetgeth + +FROM cerc/lighthouse:local + +# cerc/lighthouse is based on Ubuntu +RUN apt-get update && apt-get -y upgrade && apt-get install -y --no-install-recommends \ + libssl-dev ca-certificates \ + curl socat iproute2 telnet wget jq \ + build-essential python3 python3-dev python3-pip gettext-base \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +COPY genesis /opt/testnet +COPY run-cl.sh /opt/testnet/run.sh + +COPY --from=lcli /usr/local/bin/lcli /usr/local/bin/lcli +COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/eth2-testnet-genesis +COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/eth2-val-tools +COPY --from=ethgen /apps /apps +COPY --from=fnetgeth /opt/testnet/el /opt/testnet/el +COPY --from=fnetgeth /opt/testnet/build/el /opt/testnet/build/el + +RUN cd /opt/testnet && make genesis-cl + +# Work around some bugs in lcli where the default path is always used. +RUN mkdir -p /root/.lighthouse && cd /root/.lighthouse && ln -s /opt/testnet/build/cl/testnet + +RUN mkdir -p /scripts +COPY scripts/status-internal.sh /scripts +COPY scripts/status.sh /scripts + +ENTRYPOINT ["/opt/testnet/run.sh"] diff --git a/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/build.sh b/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/build.sh new file mode 100755 index 00000000..dd823cd0 --- /dev/null +++ b/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/build.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +# Build cerc/fixturenet-plugeth-lighthouse + +source ${CERC_CONTAINER_BASE_DIR}/build-base.sh + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +if [ ! -d "${SCRIPT_DIR}/genesis" ]; then + cp -frp ${SCRIPT_DIR}/../cerc-fixturenet-eth-lighthouse/genesis ${SCRIPT_DIR}/genesis +fi + +if [ ! -e "${SCRIPT_DIR}/run-cl.sh" ]; then + cp -fp ${SCRIPT_DIR}/../cerc-fixturenet-eth-lighthouse/run-cl.sh ${SCRIPT_DIR}/ +fi + +if [ ! -d "${SCRIPT_DIR}/scripts" ]; then + cp -frp ${SCRIPT_DIR}/../cerc-fixturenet-eth-lighthouse/scripts ${SCRIPT_DIR}/ +fi + +docker build -t cerc/fixturenet-plugeth-lighthouse:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR diff --git a/app/data/container-build/cerc-fixturenet-plugeth-plugeth/Dockerfile b/app/data/container-build/cerc-fixturenet-plugeth-plugeth/Dockerfile index e8dcb98b..9469943f 100644 --- a/app/data/container-build/cerc-fixturenet-plugeth-plugeth/Dockerfile +++ b/app/data/container-build/cerc-fixturenet-plugeth-plugeth/Dockerfile @@ -1,25 +1,42 @@ -FROM cerc/fixturenet-eth-genesis:local as fnetgen +FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen -# Using the same golang image as used to build geth: https://github.com/cerc-io/go-ethereum/blob/HEAD/Dockerfile -FROM golang:1.20-alpine as delve +FROM golang:1.19-alpine as delve RUN go install github.com/go-delve/delve/cmd/dlv@latest -FROM cerc/plugeth-statediff:local as statediff -# FIXME: fork of plugeth, use stock after upstreaming patches FROM cerc/plugeth:local as geth +FROM cerc/plugeth-statediff:local as statediff FROM alpine:3.17 +RUN apk add --no-cache python3 python3-dev py3-pip curl wget jq build-base gettext libintl openssl bash bind-tools postgresql-client -RUN apk add --no-cache bash wget python3 bind-tools postgresql-client +COPY --from=delve /go/bin/dlv /usr/local/bin/ +COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/ +COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/ +COPY --from=ethgen /apps /apps +RUN cd /apps/el-gen && pip3 install -r requirements.txt + +COPY genesis /opt/testnet COPY run-el.sh /opt/testnet/run.sh -COPY --from=delve /go/bin/dlv /usr/local/bin/ -COPY --from=geth /usr/local/bin/geth /usr/local/bin/ -COPY --from=fnetgen /opt/genesis /opt/testnet +RUN cd /opt/testnet && make genesis-el + +COPY --from=geth /usr/local/bin/geth /usr/local/bin/ + +RUN mkdir -p /usr/local/lib/plugeth/ COPY --from=statediff /usr/local/lib/statediff.so /usr/local/lib/plugeth/ -# Initialize the geth db with our config +# Snag the genesis block info. RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey +RUN cp -rp ~/ethdata ~/tmpeth && \ + geth --datadir ~/tmpeth init /opt/testnet/build/el/geth.json && \ + geth --datadir ~/tmpeth --http & \ + sleep 5 && \ + curl -q --location 'localhost:8545' \ + --header 'Content-Type: application/json' \ + --data '{ "jsonrpc": "2.0", "id": 14, "method": "eth_getBlockByNumber", "params": ["0x0", false] }' \ + -o /opt/testnet/build/el/genesis_block.json && \ + killall -9 geth && \ + rm -rf ~/tmpeth ENTRYPOINT ["/opt/testnet/run.sh"] diff --git a/app/data/container-build/cerc-fixturenet-plugeth-plugeth/build.sh b/app/data/container-build/cerc-fixturenet-plugeth-plugeth/build.sh index 6074ed1d..d1641bc6 100755 --- a/app/data/container-build/cerc-fixturenet-plugeth-plugeth/build.sh +++ b/app/data/container-build/cerc-fixturenet-plugeth-plugeth/build.sh @@ -6,6 +6,10 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +if [ ! -d "${SCRIPT_DIR}/genesis" ]; then + cp -frp ${SCRIPT_DIR}/../cerc-fixturenet-eth-geth/genesis ${SCRIPT_DIR}/genesis +fi + if [ ! -e "${SCRIPT_DIR}/run-el.sh" ]; then cp -fp ${SCRIPT_DIR}/../cerc-fixturenet-eth-geth/run-el.sh ${SCRIPT_DIR}/ fi diff --git a/app/data/container-build/cerc-lighthouse/Dockerfile b/app/data/container-build/cerc-lighthouse/Dockerfile index a5559f68..2cd95ad4 100644 --- a/app/data/container-build/cerc-lighthouse/Dockerfile +++ b/app/data/container-build/cerc-lighthouse/Dockerfile @@ -1,7 +1,7 @@ ARG TAG_SUFFIX="-modern" FROM sigp/lighthouse:v4.3.0${TAG_SUFFIX} -RUN apt-get update; apt-get install bash netcat curl less jq wget -y; +RUN apt-get update; apt-get install bash netcat curl less jq -y; WORKDIR /root/ ADD start-lighthouse.sh . diff --git a/app/data/container-build/cerc-plugeth-statediff/build.sh b/app/data/container-build/cerc-plugeth-statediff/build.sh deleted file mode 100755 index f1a9ffd5..00000000 --- a/app/data/container-build/cerc-plugeth-statediff/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -# Build cerc/plugeth-statediff -source ${CERC_CONTAINER_BASE_DIR}/build-base.sh -docker build -t cerc/plugeth-statediff:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth-statediff diff --git a/app/data/container-build/cerc-plugeth/build.sh b/app/data/container-build/cerc-plugeth/build.sh deleted file mode 100755 index 7c778877..00000000 --- a/app/data/container-build/cerc-plugeth/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -# Build cerc/plugeth -source ${CERC_CONTAINER_BASE_DIR}/build-base.sh -docker build -t cerc/plugeth:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth diff --git a/app/data/repository-list.txt b/app/data/repository-list.txt index e2cd263b..a9a85342 100644 --- a/app/data/repository-list.txt +++ b/app/data/repository-list.txt @@ -37,5 +37,3 @@ git.vdb.to/cerc-io/test-project github.com/Fantom-foundation/go-opera github.com/cerc-io/lasso github.com/paradigmxyz/reth -git.vdb.to/cerc-io/plugeth -git.vdb.to/cerc-io/plugeth-statediff diff --git a/app/data/stacks/fixturenet-eth-loaded/stack.yml b/app/data/stacks/fixturenet-eth-loaded/stack.yml index 7f6684d1..dd7e05fd 100644 --- a/app/data/stacks/fixturenet-eth-loaded/stack.yml +++ b/app/data/stacks/fixturenet-eth-loaded/stack.yml @@ -11,7 +11,6 @@ containers: - cerc/go-ethereum - cerc/lighthouse - cerc/lighthouse-cli - - cerc/fixturenet-eth-genesis - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse - cerc/ipld-eth-server diff --git a/app/data/stacks/fixturenet-eth-tx/stack.yml b/app/data/stacks/fixturenet-eth-tx/stack.yml index f8cdcfed..35e43575 100644 --- a/app/data/stacks/fixturenet-eth-tx/stack.yml +++ b/app/data/stacks/fixturenet-eth-tx/stack.yml @@ -10,7 +10,6 @@ containers: - cerc/go-ethereum - cerc/lighthouse - cerc/lighthouse-cli - - cerc/fixturenet-eth-genesis - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse - cerc/tx-spammer diff --git a/app/data/stacks/fixturenet-eth/stack.yml b/app/data/stacks/fixturenet-eth/stack.yml index 5432e6d3..ae06e2d2 100644 --- a/app/data/stacks/fixturenet-eth/stack.yml +++ b/app/data/stacks/fixturenet-eth/stack.yml @@ -9,7 +9,6 @@ containers: - cerc/go-ethereum - cerc/lighthouse - cerc/lighthouse-cli - - cerc/fixturenet-eth-genesis - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse - cerc/foundry diff --git a/app/data/stacks/fixturenet-lotus/README.md b/app/data/stacks/fixturenet-lotus/README.md index 28df8264..fd2a020e 100644 --- a/app/data/stacks/fixturenet-lotus/README.md +++ b/app/data/stacks/fixturenet-lotus/README.md @@ -12,7 +12,7 @@ $ laconic-so --stack fixturenet-lotus build-containers ``` ## 3. Deploy the stack ``` -$ laconic-so --stack fixturenet-lotus deploy up +$ laconic-so --stack fixturenet-lotus deploy --cluster lotus up ``` Correct operation should be verified by checking the container logs with: ``` @@ -25,4 +25,4 @@ or by checking the chain status on each node: $ laconic-so --stack fixturenet-lotus deploy exec lotus-miner "lotus status" $ laconic-so --stack fixturenet-lotus deploy exec lotus-node-1 "lotus status" $ laconic-so --stack fixturenet-lotus deploy exec lotus-node-2 "lotus status" -``` \ No newline at end of file +``` diff --git a/app/data/stacks/fixturenet-optimism/stack.yml b/app/data/stacks/fixturenet-optimism/stack.yml index 00ccd7fc..c483b8dc 100644 --- a/app/data/stacks/fixturenet-optimism/stack.yml +++ b/app/data/stacks/fixturenet-optimism/stack.yml @@ -11,7 +11,6 @@ containers: - cerc/go-ethereum - cerc/lighthouse - cerc/lighthouse-cli - - cerc/fixturenet-eth-genesis - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse - cerc/foundry diff --git a/app/data/stacks/fixturenet-plugeth-tx/stack.yml b/app/data/stacks/fixturenet-plugeth-tx/stack.yml index 85c1274c..50700e9b 100644 --- a/app/data/stacks/fixturenet-plugeth-tx/stack.yml +++ b/app/data/stacks/fixturenet-plugeth-tx/stack.yml @@ -2,28 +2,27 @@ version: "1.2" name: fixturenet-plugeth-tx decription: "plugeth Ethereum Fixturenet w/ tx-spammer" repos: - - git.vdb.to/cerc-io/plugeth@statediff-wip - - git.vdb.to/cerc-io/plugeth-statediff + - github.com/cerc-io/tx-spammer + - github.com/dboreham/foundry - github.com/cerc-io/lighthouse - github.com/cerc-io/ipld-eth-db@v5 - github.com/cerc-io/ipld-eth-server@v5 - - github.com/cerc-io/tx-spammer - - github.com/dboreham/foundry + - git.vdb.to/cerc-io/plugeth@statediff-wip + - git.vdb.to/cerc-io/plugeth-statediff@dev-local-build containers: - - cerc/plugeth-statediff - - cerc/plugeth - - cerc/fixturenet-eth-genesis - - cerc/fixturenet-plugeth-plugeth - cerc/lighthouse - cerc/lighthouse-cli - - cerc/fixturenet-eth-lighthouse + - cerc/plugeth-statediff + - cerc/plugeth + - cerc/fixturenet-plugeth-plugeth + - cerc/fixturenet-plugeth-lighthouse - cerc/tx-spammer - cerc/foundry - cerc/ipld-eth-db - cerc/ipld-eth-server pods: - - fixturenet-plugeth - ipld-eth-db - ipld-eth-server - - tx-spammer + - fixturenet-plugeth - foundry + - tx-spammer diff --git a/app/data/stacks/fixturenet-pocket/stack.yml b/app/data/stacks/fixturenet-pocket/stack.yml index dc8fed15..0e39ed89 100644 --- a/app/data/stacks/fixturenet-pocket/stack.yml +++ b/app/data/stacks/fixturenet-pocket/stack.yml @@ -10,7 +10,6 @@ containers: - cerc/go-ethereum - cerc/lighthouse - cerc/lighthouse-cli - - cerc/fixturenet-eth-genesis - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse - cerc/pocket