diff --git a/.gitea/workflows/triggers/test-container-registry b/.gitea/workflows/triggers/test-container-registry index e5c11f22..b0585b64 100644 --- a/.gitea/workflows/triggers/test-container-registry +++ b/.gitea/workflows/triggers/test-container-registry @@ -1 +1 @@ -Change this file to trigger running the test-container-registry CI job \ No newline at end of file +Change this file to trigger running the test-container-registry CI job diff --git a/.gitea/workflows/triggers/test-database b/.gitea/workflows/triggers/test-database index 2d1d61d2..f867b40b 100644 --- a/.gitea/workflows/triggers/test-database +++ b/.gitea/workflows/triggers/test-database @@ -1,2 +1,2 @@ Change this file to trigger running the test-database CI job -Trigger test run \ No newline at end of file +Trigger test run diff --git a/.github/workflows/triggers/fixturenet-eth-test b/.github/workflows/triggers/fixturenet-eth-test index 7d12834e..c95c9a8d 100644 --- a/.github/workflows/triggers/fixturenet-eth-test +++ b/.github/workflows/triggers/fixturenet-eth-test @@ -1,2 +1 @@ Change this file to trigger running the fixturenet-eth-test CI job - diff --git a/LICENSE b/LICENSE index bd018522..331f7cfa 100644 --- a/LICENSE +++ b/LICENSE @@ -658,4 +658,4 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see - . \ No newline at end of file + . diff --git a/README.md b/README.md index ef504295..375491bf 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ curl -SL https://github.com/docker/compose/releases/download/v2.11.2/docker-comp chmod +x ~/.docker/cli-plugins/docker-compose ``` -Next decide on a directory where you would like to put the stack-orchestrator program. Typically this would be +Next decide on a directory where you would like to put the stack-orchestrator program. Typically this would be a "user" binary directory such as `~/bin` or perhaps `/usr/local/laconic` or possibly just the current working directory. Now, having selected that directory, download the latest release from [this page](https://git.vdb.to/cerc-io/stack-orchestrator/tags) into it (we're using `~/bin` below for concreteness but edit to suit if you selected a different directory). Also be sure that the destination directory exists and is writable: @@ -78,5 +78,3 @@ See the [CONTRIBUTING.md](/docs/CONTRIBUTING.md) for developer mode install. ## Platform Support Native aarm64 is _not_ currently supported. x64 emulation on ARM64 macos should work (not yet tested). - - diff --git a/docs/fetching-containers.md b/docs/fetching-containers.md index 50a8b5ff..3e3d621c 100644 --- a/docs/fetching-containers.md +++ b/docs/fetching-containers.md @@ -1,9 +1,9 @@ # Fetching pre-built container images -When Stack Orchestrator deploys a stack containing a suite of one or more containers it expects images for those containers to be on the local machine with a tag of the form `:local` Images for these containers can be built from source (and optionally base container images from public registries) with the `build-containers` subcommand. +When Stack Orchestrator deploys a stack containing a suite of one or more containers it expects images for those containers to be on the local machine with a tag of the form `:local` Images for these containers can be built from source (and optionally base container images from public registries) with the `build-containers` subcommand. However, the task of building a large number of containers from source may consume considerable time and machine resources. This is where the `fetch-containers` subcommand steps in. It is designed to work exactly like `build-containers` but instead the images, pre-built, are fetched from an image registry then re-tagged for deployment. It can be used in place of `build-containers` for any stack provided the necessary containers, built for the local machine architecture (e.g. arm64 or x86-64) have already been published in an image registry. ## Usage To use `fetch-containers`, provide an image registry path, a username and token/password with read access to the registry, and optionally specify `--force-local-overwrite`. If this argument is not specified, if there is already a locally built or previously fetched image for a stack container on the machine, it will not be overwritten and a warning issued. ``` $ laconic-so --stack mobymask-v3-demo fetch-containers --image-registry git.vdb.to/cerc-io --registry-username --registry-token --force-local-overwrite -``` \ No newline at end of file +``` diff --git a/docs/gitea-with-laconicd-fixturenet.md b/docs/gitea-with-laconicd-fixturenet.md index f9ed86ab..61391b41 100644 --- a/docs/gitea-with-laconicd-fixturenet.md +++ b/docs/gitea-with-laconicd-fixturenet.md @@ -7,7 +7,7 @@ Deploy a local Gitea server, publish NPM packages to it, then use those packages ```bash laconic-so --stack build-support build-containers laconic-so --stack package-registry setup-repositories -laconic-so --stack package-registry build-containers +laconic-so --stack package-registry build-containers laconic-so --stack package-registry deploy up ``` diff --git a/docs/k8s-deployment-enhancements.md b/docs/k8s-deployment-enhancements.md index 424d529f..d7838058 100644 --- a/docs/k8s-deployment-enhancements.md +++ b/docs/k8s-deployment-enhancements.md @@ -24,4 +24,3 @@ node-tolerations: value: typeb ``` This example denotes that the stack's pods will tolerate a taint: `nodetype=typeb` - diff --git a/docs/release-process.md b/docs/release-process.md index c1c6893f..abe51922 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -26,4 +26,3 @@ $ ./scripts/tag_new_release.sh 1 0 17 $ ./scripts/build_shiv_package.sh $ ./scripts/publish_shiv_package_github.sh 1 0 17 ``` - diff --git a/docs/spec.md b/docs/spec.md index aa09274c..863cfb81 100644 --- a/docs/spec.md +++ b/docs/spec.md @@ -4,9 +4,9 @@ Note: this page is out of date (but still useful) - it will no longer be useful ## Implementation -The orchestrator's operation is driven by files shown below. +The orchestrator's operation is driven by files shown below. -- `repository-list.txt` contains the list of git repositories; +- `repository-list.txt` contains the list of git repositories; - `container-image-list.txt` contains the list of container image names - `pod-list.txt` specifies the set of compose components (corresponding to individual docker-compose-xxx.yml files which may in turn specify more than one container). - `container-build/` contains the files required to build each container image diff --git a/docs/webapp.md b/docs/webapp.md index fcf4ffcb..fdd9c64a 100644 --- a/docs/webapp.md +++ b/docs/webapp.md @@ -7,7 +7,7 @@ compilation and static page generation are separated in the `build-webapp` and ` This offers much more flexibilty than standard Next.js build methods, since any environment variables accessed via `process.env`, whether for pages or for API, will have values drawn from their runtime deployment environment, -not their build environment. +not their build environment. ## Building diff --git a/scripts/publish_shiv_package_github.sh b/scripts/publish_shiv_package_github.sh index 72ce8959..3912581b 100755 --- a/scripts/publish_shiv_package_github.sh +++ b/scripts/publish_shiv_package_github.sh @@ -4,7 +4,7 @@ # https://github.com/cerc-io/github-release-api # User must define: CERC_GH_RELEASE_SCRIPTS_DIR # pointing to the location of that cloned repository -# e.g. +# e.g. # cd ~/projects # git clone https://github.com/cerc-io/github-release-api # cd ./stack-orchestrator diff --git a/scripts/quick-install-linux.sh b/scripts/quick-install-linux.sh index b8642416..ea251c6b 100755 --- a/scripts/quick-install-linux.sh +++ b/scripts/quick-install-linux.sh @@ -94,7 +94,7 @@ sudo apt -y install jq # laconic-so depends on git sudo apt -y install git # curl used below -sudo apt -y install curl +sudo apt -y install curl # docker repo add depends on gnupg and updated ca-certificates sudo apt -y install ca-certificates gnupg diff --git a/scripts/tag_new_release.sh b/scripts/tag_new_release.sh index 193b5d8a..99e91f87 100755 --- a/scripts/tag_new_release.sh +++ b/scripts/tag_new_release.sh @@ -3,7 +3,7 @@ # Uses this script package to tag a new release: # User must define: CERC_GH_RELEASE_SCRIPTS_DIR # pointing to the location of that cloned repository -# e.g. +# e.g. # cd ~/projects # git clone https://github.com/cerc-io/github-release-api # cd ./stack-orchestrator diff --git a/stack_orchestrator/build/build_types.py b/stack_orchestrator/build/build_types.py index 971188fe..6ddbc2ad 100644 --- a/stack_orchestrator/build/build_types.py +++ b/stack_orchestrator/build/build_types.py @@ -26,4 +26,3 @@ class BuildContext: container_build_dir: Path container_build_env: Mapping[str,str] dev_root_path: str - diff --git a/stack_orchestrator/build/fetch_containers.py b/stack_orchestrator/build/fetch_containers.py index ed7d3675..bc4b93a7 100644 --- a/stack_orchestrator/build/fetch_containers.py +++ b/stack_orchestrator/build/fetch_containers.py @@ -79,7 +79,7 @@ def _find_latest(candidate_tags: List[str]): return sorted_candidates[-1] -def _filter_for_platform(container: str, +def _filter_for_platform(container: str, registry_info: RegistryInfo, tag_list: List[str]) -> List[str] : filtered_tags = [] diff --git a/stack_orchestrator/data/compose/docker-compose-fixturenet-blast.yml b/stack_orchestrator/data/compose/docker-compose-fixturenet-blast.yml index e6373796..679013ca 100644 --- a/stack_orchestrator/data/compose/docker-compose-fixturenet-blast.yml +++ b/stack_orchestrator/data/compose/docker-compose-fixturenet-blast.yml @@ -20,7 +20,7 @@ services: depends_on: generate-jwt: condition: service_completed_successfully - env_file: + env_file: - ../config/fixturenet-blast/${NETWORK:-fixturenet}.config blast-geth: image: blastio/blast-geth:${NETWORK:-testnet-sepolia} @@ -51,7 +51,7 @@ services: --nodiscover --maxpeers=0 --rollup.disabletxpoolgossip=true - env_file: + env_file: - ../config/fixturenet-blast/${NETWORK:-fixturenet}.config depends_on: geth-init: @@ -73,7 +73,7 @@ services: --rollup.config="/blast/rollup.json" depends_on: - blast-geth - env_file: + env_file: - ../config/fixturenet-blast/${NETWORK:-fixturenet}.config volumes: diff --git a/stack_orchestrator/data/compose/docker-compose-laconicd.yml b/stack_orchestrator/data/compose/docker-compose-laconicd.yml index 753283bd..772ab34f 100644 --- a/stack_orchestrator/data/compose/docker-compose-laconicd.yml +++ b/stack_orchestrator/data/compose/docker-compose-laconicd.yml @@ -14,4 +14,3 @@ services: - "9090" - "9091" - "1317" - diff --git a/stack_orchestrator/data/compose/docker-compose-mainnet-blast.yml b/stack_orchestrator/data/compose/docker-compose-mainnet-blast.yml index b8f69fab..2e61546f 100644 --- a/stack_orchestrator/data/compose/docker-compose-mainnet-blast.yml +++ b/stack_orchestrator/data/compose/docker-compose-mainnet-blast.yml @@ -19,7 +19,7 @@ services: depends_on: generate-jwt: condition: service_completed_successfully - env_file: + env_file: - ../config/mainnet-blast/${NETWORK:-mainnet}.config blast-geth: image: blastio/blast-geth:${NETWORK:-mainnet} @@ -53,7 +53,7 @@ services: --nodiscover --maxpeers=0 --rollup.disabletxpoolgossip=true - env_file: + env_file: - ../config/mainnet-blast/${NETWORK:-mainnet}.config depends_on: geth-init: @@ -76,7 +76,7 @@ services: --rollup.config="/blast/rollup.json" depends_on: - blast-geth - env_file: + env_file: - ../config/mainnet-blast/${NETWORK:-mainnet}.config volumes: diff --git a/stack_orchestrator/data/compose/docker-compose-mars.yml b/stack_orchestrator/data/compose/docker-compose-mars.yml index 193a90af..461b80b9 100644 --- a/stack_orchestrator/data/compose/docker-compose-mars.yml +++ b/stack_orchestrator/data/compose/docker-compose-mars.yml @@ -17,4 +17,3 @@ services: - URL_NEUTRON_TEST_REST=https://rest-palvus.pion-1.ntrn.tech - URL_NEUTRON_TEST_RPC=https://rpc-palvus.pion-1.ntrn.tech - WALLET_CONNECT_ID=0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x - diff --git a/stack_orchestrator/data/compose/docker-compose-reth.yml b/stack_orchestrator/data/compose/docker-compose-reth.yml index a3973717..26836960 100644 --- a/stack_orchestrator/data/compose/docker-compose-reth.yml +++ b/stack_orchestrator/data/compose/docker-compose-reth.yml @@ -32,4 +32,4 @@ services: volumes: reth_data: lighthouse_data: - shared_data: \ No newline at end of file + shared_data: diff --git a/stack_orchestrator/data/compose/docker-compose-test-database.yml b/stack_orchestrator/data/compose/docker-compose-test-database.yml index 6b99cdab..4093382d 100644 --- a/stack_orchestrator/data/compose/docker-compose-test-database.yml +++ b/stack_orchestrator/data/compose/docker-compose-test-database.yml @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: "-E UTF8 --locale=C" ports: - "5432" - + test-client: image: cerc/test-database-client:local diff --git a/stack_orchestrator/data/config/fixturenet-blast/fixturenet.config b/stack_orchestrator/data/config/fixturenet-blast/fixturenet.config index bd891dbf..1082801c 100644 --- a/stack_orchestrator/data/config/fixturenet-blast/fixturenet.config +++ b/stack_orchestrator/data/config/fixturenet-blast/fixturenet.config @@ -1,2 +1,2 @@ GETH_ROLLUP_SEQUENCERHTTP=https://sequencer.s2.testblast.io -OP_NODE_P2P_BOOTNODES=enr:-J-4QM3GLUFfKMSJQuP1UvuKQe8DyovE7Eaiit0l6By4zjTodkR4V8NWXJxNmlg8t8rP-Q-wp3jVmeAOml8cjMj__ROGAYznzb_HgmlkgnY0gmlwhA-cZ_eHb3BzdGFja4X947FQAIlzZWNwMjU2azGhAiuDqvB-AsVSRmnnWr6OHfjgY8YfNclFy9p02flKzXnOg3RjcIJ2YYN1ZHCCdmE,enr:-J-4QDCVpByqQ8nFqCS9aHicqwUfXgzFDslvpEyYz19lvkHLIdtcIGp2d4q5dxHdjRNTO6HXCsnIKxUeuZSPcEbyVQCGAYznzz0RgmlkgnY0gmlwhANiQfuHb3BzdGFja4X947FQAIlzZWNwMjU2azGhAy3AtF2Jh_aPdOohg506Hjmtx-fQ1AKmu71C7PfkWAw9g3RjcIJ2YYN1ZHCCdmE \ No newline at end of file +OP_NODE_P2P_BOOTNODES=enr:-J-4QM3GLUFfKMSJQuP1UvuKQe8DyovE7Eaiit0l6By4zjTodkR4V8NWXJxNmlg8t8rP-Q-wp3jVmeAOml8cjMj__ROGAYznzb_HgmlkgnY0gmlwhA-cZ_eHb3BzdGFja4X947FQAIlzZWNwMjU2azGhAiuDqvB-AsVSRmnnWr6OHfjgY8YfNclFy9p02flKzXnOg3RjcIJ2YYN1ZHCCdmE,enr:-J-4QDCVpByqQ8nFqCS9aHicqwUfXgzFDslvpEyYz19lvkHLIdtcIGp2d4q5dxHdjRNTO6HXCsnIKxUeuZSPcEbyVQCGAYznzz0RgmlkgnY0gmlwhANiQfuHb3BzdGFja4X947FQAIlzZWNwMjU2azGhAy3AtF2Jh_aPdOohg506Hjmtx-fQ1AKmu71C7PfkWAw9g3RjcIJ2YYN1ZHCCdmE diff --git a/stack_orchestrator/data/config/fixturenet-eth-metrics/grafana/etc/dashboards/fixturenet_dashboard.json b/stack_orchestrator/data/config/fixturenet-eth-metrics/grafana/etc/dashboards/fixturenet_dashboard.json index 21932a24..3ea31bf9 100644 --- a/stack_orchestrator/data/config/fixturenet-eth-metrics/grafana/etc/dashboards/fixturenet_dashboard.json +++ b/stack_orchestrator/data/config/fixturenet-eth-metrics/grafana/etc/dashboards/fixturenet_dashboard.json @@ -1411,4 +1411,4 @@ "uid": "nT9VeZoVk", "version": 2, "weekStart": "" -} \ No newline at end of file +} diff --git a/stack_orchestrator/data/config/fixturenet-optimism/optimism-contracts/deploy-contracts.sh b/stack_orchestrator/data/config/fixturenet-optimism/optimism-contracts/deploy-contracts.sh index 23a2bc30..ce5e2b73 100755 --- a/stack_orchestrator/data/config/fixturenet-optimism/optimism-contracts/deploy-contracts.sh +++ b/stack_orchestrator/data/config/fixturenet-optimism/optimism-contracts/deploy-contracts.sh @@ -65,7 +65,7 @@ if [ -n "$CERC_L1_ADDRESS" ] && [ -n "$CERC_L1_PRIV_KEY" ]; then # Sequencer SEQ=$(echo "$wallet3" | awk '/Address:/{print $2}') SEQ_KEY=$(echo "$wallet3" | awk '/Private key:/{print $3}') - + echo "Funding accounts." wait_for_block 1 300 cast send --from $ADMIN --rpc-url $CERC_L1_RPC --value 5ether $PROPOSER --private-key $ADMIN_KEY diff --git a/stack_orchestrator/data/config/fixturenet-pocket/genesis.json b/stack_orchestrator/data/config/fixturenet-pocket/genesis.json index 4d92d5a6..eb0083c3 100644 --- a/stack_orchestrator/data/config/fixturenet-pocket/genesis.json +++ b/stack_orchestrator/data/config/fixturenet-pocket/genesis.json @@ -56,7 +56,7 @@ "value": "!validator-pubkey" } } - } + } ], "supply": [] }, @@ -269,4 +269,4 @@ "claims": null } } -} \ No newline at end of file +} diff --git a/stack_orchestrator/data/config/keycloak/import/cerc-realm.json b/stack_orchestrator/data/config/keycloak/import/cerc-realm.json index e1e9dc97..062da56b 100644 --- a/stack_orchestrator/data/config/keycloak/import/cerc-realm.json +++ b/stack_orchestrator/data/config/keycloak/import/cerc-realm.json @@ -2084,4 +2084,4 @@ "clientPolicies": { "policies": [] } -} \ No newline at end of file +} diff --git a/stack_orchestrator/data/config/mainnet-blast/import/cerc-realm.json b/stack_orchestrator/data/config/mainnet-blast/import/cerc-realm.json index b6b6b606..d7d82361 100644 --- a/stack_orchestrator/data/config/mainnet-blast/import/cerc-realm.json +++ b/stack_orchestrator/data/config/mainnet-blast/import/cerc-realm.json @@ -2388,4 +2388,4 @@ "clientPolicies": { "policies": [] } -} \ No newline at end of file +} diff --git a/stack_orchestrator/data/config/mainnet-blast/rollup.json b/stack_orchestrator/data/config/mainnet-blast/rollup.json index f59e8323..cd7ed05f 100644 --- a/stack_orchestrator/data/config/mainnet-blast/rollup.json +++ b/stack_orchestrator/data/config/mainnet-blast/rollup.json @@ -29,4 +29,3 @@ "l1_system_config_address": "0x5531dcff39ec1ec727c4c5d2fc49835368f805a9", "protocol_versions_address": "0x0000000000000000000000000000000000000000" } - \ No newline at end of file diff --git a/stack_orchestrator/data/config/mainnet-eth-keycloak/import/cerc-realm.json b/stack_orchestrator/data/config/mainnet-eth-keycloak/import/cerc-realm.json index b6b6b606..d7d82361 100644 --- a/stack_orchestrator/data/config/mainnet-eth-keycloak/import/cerc-realm.json +++ b/stack_orchestrator/data/config/mainnet-eth-keycloak/import/cerc-realm.json @@ -2388,4 +2388,4 @@ "clientPolicies": { "policies": [] } -} \ No newline at end of file +} diff --git a/stack_orchestrator/data/config/mainnet-go-opera/go-opera.env b/stack_orchestrator/data/config/mainnet-go-opera/go-opera.env index 8b137891..e69de29b 100644 --- a/stack_orchestrator/data/config/mainnet-go-opera/go-opera.env +++ b/stack_orchestrator/data/config/mainnet-go-opera/go-opera.env @@ -1 +0,0 @@ - diff --git a/stack_orchestrator/data/config/monitoring/grafana/dashboards/subgraphs-dashboard.json b/stack_orchestrator/data/config/monitoring/grafana/dashboards/subgraphs-dashboard.json index 2bdf04c8..f147ea42 100644 --- a/stack_orchestrator/data/config/monitoring/grafana/dashboards/subgraphs-dashboard.json +++ b/stack_orchestrator/data/config/monitoring/grafana/dashboards/subgraphs-dashboard.json @@ -1901,4 +1901,4 @@ "uid": "b54352dd-35f6-4151-97dc-265bab0c67e9", "version": 18, "weekStart": "" -} \ No newline at end of file +} diff --git a/stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml b/stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml index c1c3e8e2..b39e6c61 100644 --- a/stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml +++ b/stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml @@ -849,7 +849,7 @@ groups: annotations: summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }} isPaused: false - + # Secured Finance - uid: secured_finance_diff_external title: secured_finance_watcher_head_tracking diff --git a/stack_orchestrator/data/config/ponder/deploy-erc20-contract.sh b/stack_orchestrator/data/config/ponder/deploy-erc20-contract.sh index ea8111bb..20a5a916 100755 --- a/stack_orchestrator/data/config/ponder/deploy-erc20-contract.sh +++ b/stack_orchestrator/data/config/ponder/deploy-erc20-contract.sh @@ -14,7 +14,7 @@ echo ACCOUNT_PRIVATE_KEY=${CERC_PRIVATE_KEY_DEPLOYER} >> .env if [ -f ${erc20_address_file} ]; then echo "${erc20_address_file} already exists, skipping ERC20 contract deployment" cat ${erc20_address_file} - + # Keep the container running tail -f fi diff --git a/stack_orchestrator/data/config/watcher-mobymask/mobymask-watcher-db.sql b/stack_orchestrator/data/config/watcher-mobymask/mobymask-watcher-db.sql index c77542bd..640dcceb 100644 --- a/stack_orchestrator/data/config/watcher-mobymask/mobymask-watcher-db.sql +++ b/stack_orchestrator/data/config/watcher-mobymask/mobymask-watcher-db.sql @@ -940,4 +940,3 @@ ALTER TABLE ONLY public.state -- -- PostgreSQL database dump complete -- - diff --git a/stack_orchestrator/data/container-build/cerc-builder-gerbil/README.md b/stack_orchestrator/data/container-build/cerc-builder-gerbil/README.md index 854139b9..ae831c94 100644 --- a/stack_orchestrator/data/container-build/cerc-builder-gerbil/README.md +++ b/stack_orchestrator/data/container-build/cerc-builder-gerbil/README.md @@ -18,4 +18,3 @@ root@7c4124bb09e3:/src# ``` Now gerbil commands can be run. - diff --git a/stack_orchestrator/data/container-build/cerc-builder-js/yarn-local-registry-fixup.sh b/stack_orchestrator/data/container-build/cerc-builder-js/yarn-local-registry-fixup.sh index 95e19194..b84c5d8d 100755 --- a/stack_orchestrator/data/container-build/cerc-builder-js/yarn-local-registry-fixup.sh +++ b/stack_orchestrator/data/container-build/cerc-builder-js/yarn-local-registry-fixup.sh @@ -23,7 +23,7 @@ local_npm_registry_url=$2 versioned_target_package=$(yarn list --pattern ${target_package} --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name') # Use yarn info to get URL checksums etc from the new registry yarn_info_output=$(yarn info --json $versioned_target_package 2>/dev/null) -# First check if the target version actually exists. +# First check if the target version actually exists. # If it doesn't exist there will be no .data.dist.tarball element, # and jq will output the string "null" package_tarball=$(echo $yarn_info_output | jq -r .data.dist.tarball) diff --git a/stack_orchestrator/data/container-build/cerc-go-ethereum-foundry/stateful/foundry.toml b/stack_orchestrator/data/container-build/cerc-go-ethereum-foundry/stateful/foundry.toml index 19903e0b..6c7a965b 100644 --- a/stack_orchestrator/data/container-build/cerc-go-ethereum-foundry/stateful/foundry.toml +++ b/stack_orchestrator/data/container-build/cerc-go-ethereum-foundry/stateful/foundry.toml @@ -4,4 +4,4 @@ out = 'out' libs = ['lib'] remappings = ['ds-test/=lib/ds-test/src/'] -# See more config options https://github.com/gakonst/foundry/tree/master/config \ No newline at end of file +# See more config options https://github.com/gakonst/foundry/tree/master/config diff --git a/stack_orchestrator/data/container-build/cerc-go-ethereum-foundry/stateful/src/Stateful.sol b/stack_orchestrator/data/container-build/cerc-go-ethereum-foundry/stateful/src/Stateful.sol index 137f9a5a..cfcbb96a 100644 --- a/stack_orchestrator/data/container-build/cerc-go-ethereum-foundry/stateful/src/Stateful.sol +++ b/stack_orchestrator/data/container-build/cerc-go-ethereum-foundry/stateful/src/Stateful.sol @@ -20,4 +20,4 @@ contract Stateful { function inc() public { x = x + 1; } -} \ No newline at end of file +} diff --git a/stack_orchestrator/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-10.yml b/stack_orchestrator/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-10.yml index a467903e..1e76d31f 100644 --- a/stack_orchestrator/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-10.yml +++ b/stack_orchestrator/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-10.yml @@ -11,4 +11,4 @@ record: foo: bar tags: - a - - b + - b diff --git a/stack_orchestrator/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-11.yml b/stack_orchestrator/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-11.yml index 3afbd64d..975da6a5 100644 --- a/stack_orchestrator/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-11.yml +++ b/stack_orchestrator/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-11.yml @@ -9,4 +9,4 @@ record: foo: bar tags: - a - - b + - b diff --git a/stack_orchestrator/data/container-build/cerc-laconicd/build.sh b/stack_orchestrator/data/container-build/cerc-laconicd/build.sh index 3d897446..85f6aa6b 100755 --- a/stack_orchestrator/data/container-build/cerc-laconicd/build.sh +++ b/stack_orchestrator/data/container-build/cerc-laconicd/build.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash # Build cerc/laconicd source ${CERC_CONTAINER_BASE_DIR}/build-base.sh -docker build -t cerc/laconicd:local ${build_command_args} ${CERC_REPO_BASE_DIR}/laconicd \ No newline at end of file +docker build -t cerc/laconicd:local ${build_command_args} ${CERC_REPO_BASE_DIR}/laconicd diff --git a/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/start-serving-app.sh b/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/start-serving-app.sh index 2c3d2b11..d28c65e8 100755 --- a/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/start-serving-app.sh +++ b/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/start-serving-app.sh @@ -36,7 +36,7 @@ if [ -f "./run-webapp.sh" ]; then ./run-webapp.sh & tpid=$! wait $tpid -else +else "$SCRIPT_DIR/apply-runtime-env.sh" "`pwd`" .next .next-r mv .next .next.old mv .next-r/.next . diff --git a/stack_orchestrator/data/container-build/cerc-ping-pub/Dockerfile.base b/stack_orchestrator/data/container-build/cerc-ping-pub/Dockerfile.base index 62572c47..816997fe 100644 --- a/stack_orchestrator/data/container-build/cerc-ping-pub/Dockerfile.base +++ b/stack_orchestrator/data/container-build/cerc-ping-pub/Dockerfile.base @@ -5,4 +5,3 @@ WORKDIR /app COPY . . RUN yarn - diff --git a/stack_orchestrator/data/container-build/cerc-ping-pub/scripts/update-explorer-config.sh b/stack_orchestrator/data/container-build/cerc-ping-pub/scripts/update-explorer-config.sh index 812fa5bd..d7f575ce 100755 --- a/stack_orchestrator/data/container-build/cerc-ping-pub/scripts/update-explorer-config.sh +++ b/stack_orchestrator/data/container-build/cerc-ping-pub/scripts/update-explorer-config.sh @@ -22,7 +22,7 @@ fi # infers the directory from which to load chain configuration files # by the presence or absense of the substring "testnet" in the host name # (browser side -- the host name of the host in the address bar of the browser) -# Accordingly we configure our network in both directories in order to +# Accordingly we configure our network in both directories in order to # subvert this lunacy. explorer_mainnet_config_dir=/app/chains/mainnet explorer_testnet_config_dir=/app/chains/testnet diff --git a/stack_orchestrator/data/container-build/cerc-test-database-client/build.sh b/stack_orchestrator/data/container-build/cerc-test-database-client/build.sh index f9a9051f..60a06031 100755 --- a/stack_orchestrator/data/container-build/cerc-test-database-client/build.sh +++ b/stack_orchestrator/data/container-build/cerc-test-database-client/build.sh @@ -2,4 +2,4 @@ # Build cerc/test-container source ${CERC_CONTAINER_BASE_DIR}/build-base.sh SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -docker build -t cerc/test-database-client:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR \ No newline at end of file +docker build -t cerc/test-database-client:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR diff --git a/stack_orchestrator/data/container-build/cerc-webapp-base/scripts/start-serving-app.sh b/stack_orchestrator/data/container-build/cerc-webapp-base/scripts/start-serving-app.sh index 3a114ee0..418c3355 100755 --- a/stack_orchestrator/data/container-build/cerc-webapp-base/scripts/start-serving-app.sh +++ b/stack_orchestrator/data/container-build/cerc-webapp-base/scripts/start-serving-app.sh @@ -8,7 +8,7 @@ CERC_WEBAPP_FILES_DIR="${CERC_WEBAPP_FILES_DIR:-/data}" CERC_ENABLE_CORS="${CERC_ENABLE_CORS:-false}" CERC_SINGLE_PAGE_APP="${CERC_SINGLE_PAGE_APP}" -if [ -z "${CERC_SINGLE_PAGE_APP}" ]; then +if [ -z "${CERC_SINGLE_PAGE_APP}" ]; then # If there is only one HTML file, assume an SPA. if [ 1 -eq $(find "${CERC_WEBAPP_FILES_DIR}" -name '*.html' | wc -l) ]; then CERC_SINGLE_PAGE_APP=true diff --git a/stack_orchestrator/data/stacks/build-support/README.md b/stack_orchestrator/data/stacks/build-support/README.md index 39bd7dca..ac056d4c 100644 --- a/stack_orchestrator/data/stacks/build-support/README.md +++ b/stack_orchestrator/data/stacks/build-support/README.md @@ -6,7 +6,7 @@ JS/TS/NPM builds need an npm registry to store intermediate package artifacts. This can be supplied by the user (e.g. using a hosted registry or even npmjs.com), or a local registry using gitea can be deployed by stack orchestrator. To use a user-supplied registry set these environment variables: -`CERC_NPM_REGISTRY_URL` and +`CERC_NPM_REGISTRY_URL` and `CERC_NPM_AUTH_TOKEN` Leave `CERC_NPM_REGISTRY_URL` un-set to use the local gitea registry. @@ -22,7 +22,7 @@ $ laconic-so --stack build-support build-containers ``` $ laconic-so --stack package-registry setup-repositories -$ laconic-so --stack package-registry build-containers +$ laconic-so --stack package-registry build-containers $ laconic-so --stack package-registry deploy up [+] Running 3/3 ⠿ Network laconic-aecc4a21d3a502b14522db97d427e850_gitea Created 0.0s diff --git a/stack_orchestrator/data/stacks/fixturenet-blast/stack.yml b/stack_orchestrator/data/stacks/fixturenet-blast/stack.yml index 5b0820c2..a039f3d1 100644 --- a/stack_orchestrator/data/stacks/fixturenet-blast/stack.yml +++ b/stack_orchestrator/data/stacks/fixturenet-blast/stack.yml @@ -14,4 +14,3 @@ containers: pods: - fixturenet-blast - foundry - \ No newline at end of file diff --git a/stack_orchestrator/data/stacks/fixturenet-eth-loaded/README.md b/stack_orchestrator/data/stacks/fixturenet-eth-loaded/README.md index 08ae1e37..d50ca47e 100644 --- a/stack_orchestrator/data/stacks/fixturenet-eth-loaded/README.md +++ b/stack_orchestrator/data/stacks/fixturenet-eth-loaded/README.md @@ -3,4 +3,3 @@ A "loaded" version of fixturenet-eth, with all the bells and whistles enabled. TODO: write me - diff --git a/stack_orchestrator/data/stacks/fixturenet-laconicd/README.md b/stack_orchestrator/data/stacks/fixturenet-laconicd/README.md index d939d0a4..17f96f6f 100644 --- a/stack_orchestrator/data/stacks/fixturenet-laconicd/README.md +++ b/stack_orchestrator/data/stacks/fixturenet-laconicd/README.md @@ -12,7 +12,7 @@ $ chmod +x ./laconic-so $ export PATH=$PATH:$(pwd) # Or move laconic-so to ~/bin or your favorite on-path directory ``` ## 2. Prepare the local build environment -Note that this step needs only to be done once on a new machine. +Note that this step needs only to be done once on a new machine. Detailed instructions can be found [here](../build-support/README.md). For the impatient run these commands: ``` $ laconic-so --stack build-support build-containers --exclude cerc/builder-gerbil diff --git a/stack_orchestrator/data/stacks/fixturenet-optimism/README.md b/stack_orchestrator/data/stacks/fixturenet-optimism/README.md index dd681aa5..9c7aa491 100644 --- a/stack_orchestrator/data/stacks/fixturenet-optimism/README.md +++ b/stack_orchestrator/data/stacks/fixturenet-optimism/README.md @@ -52,7 +52,7 @@ laconic-so --stack fixturenet-optimism deploy init --map-ports-to-host any-fixed It is usually necessary to expose certain container ports on one or more the host's addresses to allow incoming connections. Any ports defined in the Docker compose file are exposed by default with random port assignments, bound to "any" interface (IP address 0.0.0.0), but the port mappings can be customized by editing the "spec" file generated by `laconic-so deploy init`. -In addition, a stack-wide port mapping "recipe" can be applied at the time the +In addition, a stack-wide port mapping "recipe" can be applied at the time the `laconic-so deploy init` command is run, by supplying the desired recipe with the `--map-ports-to-host` option. The following recipes are supported: | Recipe | Host Port Mapping | |--------|-------------------| @@ -62,11 +62,11 @@ In addition, a stack-wide port mapping "recipe" can be applied at the time the | localhost-fixed-random | Bind to 127.0.0.1 using a random port number selected at the time the command is run (not checked for already in use)| | any-fixed-random | Bind to 0.0.0.0 using a random port number selected at the time the command is run (not checked for already in use) | -For example, you may wish to use `any-fixed-random` to generate the initial mappings and then edit the spec file to set the `fixturenet-eth-geth-1` RPC to port 8545 and the `op-geth` RPC to port 9545 on the host. +For example, you may wish to use `any-fixed-random` to generate the initial mappings and then edit the spec file to set the `fixturenet-eth-geth-1` RPC to port 8545 and the `op-geth` RPC to port 9545 on the host. Or, you may wish to use `any-same` for the initial mappings -- in which case you'll have to edit the spec to file to ensure the various geth instances aren't all trying to publish to host ports 8545/8546 at once. -### Data volumes +### Data volumes Container data volumes are bind-mounted to specified paths in the host filesystem. The default setup (generated by `laconic-so deploy init`) places the volumes in the `./data` subdirectory of the deployment directory. The default mappings can be customized by editing the "spec" file generated by `laconic-so deploy init`. @@ -101,7 +101,7 @@ docker logs -f ## Example: bridge some ETH from L1 to L2 -Send some ETH from the desired account to the `L1StandardBridgeProxy` contract on L1 to test bridging to L2. +Send some ETH from the desired account to the `L1StandardBridgeProxy` contract on L1 to test bridging to L2. We can use the testing account `0xe6CE22afe802CAf5fF7d3845cec8c736ecc8d61F` which is pre-funded and unlocked, and the `cerc/foundry:local` container to make use of the `cast` cli. diff --git a/stack_orchestrator/data/stacks/fixturenet-optimism/l2-only.md b/stack_orchestrator/data/stacks/fixturenet-optimism/l2-only.md index 4299ca8d..554e28a6 100644 --- a/stack_orchestrator/data/stacks/fixturenet-optimism/l2-only.md +++ b/stack_orchestrator/data/stacks/fixturenet-optimism/l2-only.md @@ -38,7 +38,7 @@ laconic-so --stack fixturenet-optimism deploy init --map-ports-to-host any-fixed It is usually necessary to expose certain container ports on one or more the host's addresses to allow incoming connections. Any ports defined in the Docker compose file are exposed by default with random port assignments, bound to "any" interface (IP address 0.0.0.0), but the port mappings can be customized by editing the "spec" file generated by `laconic-so deploy init`. -In addition, a stack-wide port mapping "recipe" can be applied at the time the +In addition, a stack-wide port mapping "recipe" can be applied at the time the `laconic-so deploy init` command is run, by supplying the desired recipe with the `--map-ports-to-host` option. The following recipes are supported: | Recipe | Host Port Mapping | |--------|-------------------| @@ -48,9 +48,9 @@ In addition, a stack-wide port mapping "recipe" can be applied at the time the | localhost-fixed-random | Bind to 127.0.0.1 using a random port number selected at the time the command is run (not checked for already in use)| | any-fixed-random | Bind to 0.0.0.0 using a random port number selected at the time the command is run (not checked for already in use) | -For example, you may wish to use `any-fixed-random` to generate the initial mappings and then edit the spec file to set the `op-geth` RPC to an easy to remember port like 8545 or 9545 on the host. +For example, you may wish to use `any-fixed-random` to generate the initial mappings and then edit the spec file to set the `op-geth` RPC to an easy to remember port like 8545 or 9545 on the host. -### Data volumes +### Data volumes Container data volumes are bind-mounted to specified paths in the host filesystem. The default setup (generated by `laconic-so deploy init`) places the volumes in the `./data` subdirectory of the deployment directory. The default mappings can be customized by editing the "spec" file generated by `laconic-so deploy init`. diff --git a/stack_orchestrator/data/stacks/fixturenet-payments/ponder-demo.md b/stack_orchestrator/data/stacks/fixturenet-payments/ponder-demo.md index 2ea416b6..bec58cf9 100644 --- a/stack_orchestrator/data/stacks/fixturenet-payments/ponder-demo.md +++ b/stack_orchestrator/data/stacks/fixturenet-payments/ponder-demo.md @@ -128,7 +128,7 @@ Stack components: removed topics transactionHash - transactionIndex + transactionIndex } getEthBlock( @@ -211,14 +211,14 @@ Stack components: hash } log { - id + id } block { number } } metadata { - pageEndsAtTimestamp + pageEndsAtTimestamp isLastPage } } @@ -227,7 +227,7 @@ Stack components: * Open watcher Ponder app endpoint http://localhost:42069 * Try GQL query to see transfer events - + ```graphql { transferEvents (orderBy: "timestamp", orderDirection: "desc") { @@ -251,9 +251,9 @@ Stack components: ```bash export TOKEN_ADDRESS=$(docker exec payments-ponder-er20-contracts-1 jq -r '.address' ./deployment/erc20-address.json) ``` - + * Transfer token - + ```bash docker exec -it payments-ponder-er20-contracts-1 bash -c "yarn token:transfer:docker --token ${TOKEN_ADDRESS} --to 0xe22AD83A0dE117bA0d03d5E94Eb4E0d80a69C62a --amount 5000" ``` diff --git a/stack_orchestrator/data/stacks/fixturenet-pocket/README.md b/stack_orchestrator/data/stacks/fixturenet-pocket/README.md index a818eaa0..14243e51 100644 --- a/stack_orchestrator/data/stacks/fixturenet-pocket/README.md +++ b/stack_orchestrator/data/stacks/fixturenet-pocket/README.md @@ -48,7 +48,7 @@ or see the full logs: $ laconic-so --stack fixturenet-pocket deploy logs pocket ``` ## 5. Send a relay request to Pocket node -The Pocket node serves relay requests at `http://localhost:8081/v1/client/sim` +The Pocket node serves relay requests at `http://localhost:8081/v1/client/sim` Example request: ``` diff --git a/stack_orchestrator/data/stacks/fixturenet-sushiswap-subgraph/README.md b/stack_orchestrator/data/stacks/fixturenet-sushiswap-subgraph/README.md index b1151271..97e1026d 100644 --- a/stack_orchestrator/data/stacks/fixturenet-sushiswap-subgraph/README.md +++ b/stack_orchestrator/data/stacks/fixturenet-sushiswap-subgraph/README.md @@ -154,12 +154,12 @@ http://127.0.0.1:/subgraphs/name/sushiswap/v3-lotus/graphql deployment hasIndexingErrors } - + factories { poolCount id } - + pools { id token0 { diff --git a/stack_orchestrator/data/stacks/graph-node/deploy-subgraph.md b/stack_orchestrator/data/stacks/graph-node/deploy-subgraph.md index 73e200b2..bfc7ad7b 100644 --- a/stack_orchestrator/data/stacks/graph-node/deploy-subgraph.md +++ b/stack_orchestrator/data/stacks/graph-node/deploy-subgraph.md @@ -7,7 +7,7 @@ We will use the [ethereum-gravatar](https://github.com/graphprotocol/graph-tooli - Clone the repo ```bash git clone git@github.com:graphprotocol/graph-tooling.git - + cd graph-tooling ``` @@ -54,11 +54,11 @@ The following steps should be similar for every subgraph - Create and deploy the subgraph ```bash pnpm graph create example --node - + pnpm graph deploy example --ipfs --node ``` - `GRAPH_NODE_DEPLOY_ENDPOINT` and `GRAPH_NODE_IPFS_ENDPOINT` will be available after graph-node has been deployed - - More details can be seen in [Create a deployment](./README.md#create-a-deployment) section + - More details can be seen in [Create a deployment](./README.md#create-a-deployment) section - The subgraph GQL endpoint will be seen after deploy command runs successfully diff --git a/stack_orchestrator/data/stacks/kubo/stack.yml b/stack_orchestrator/data/stacks/kubo/stack.yml index 2552df38..4bfef57a 100644 --- a/stack_orchestrator/data/stacks/kubo/stack.yml +++ b/stack_orchestrator/data/stacks/kubo/stack.yml @@ -1,7 +1,7 @@ version: "1.0" -name: kubo +name: kubo description: "Run kubo (IPFS)" repos: containers: pods: - - kubo + - kubo diff --git a/stack_orchestrator/data/stacks/laconic-dot-com/README.md b/stack_orchestrator/data/stacks/laconic-dot-com/README.md index 3e7ad328..7b8d5632 100644 --- a/stack_orchestrator/data/stacks/laconic-dot-com/README.md +++ b/stack_orchestrator/data/stacks/laconic-dot-com/README.md @@ -2,7 +2,7 @@ ``` laconic-so --stack laconic-dot-com setup-repositories -laconic-so --stack laconic-dot-com build-containers +laconic-so --stack laconic-dot-com build-containers laconic-so --stack laconic-dot-com deploy init --output laconic-website-spec.yml --map-ports-to-host localhost-same laconic-so --stack laconic-dot-com deploy create --spec-file laconic-website-spec.yml --deployment-dir lx-website laconic-so deployment --dir lx-website start diff --git a/stack_orchestrator/data/stacks/lasso/README.md b/stack_orchestrator/data/stacks/lasso/README.md index 226e4e39..ae4328a8 100644 --- a/stack_orchestrator/data/stacks/lasso/README.md +++ b/stack_orchestrator/data/stacks/lasso/README.md @@ -2,6 +2,6 @@ ``` laconic-so --stack lasso setup-repositories -laconic-so --stack lasso build-containers +laconic-so --stack lasso build-containers laconic-so --stack lasso deploy up ``` diff --git a/stack_orchestrator/data/stacks/mainnet-eth-plugeth/README.md b/stack_orchestrator/data/stacks/mainnet-eth-plugeth/README.md index 8ed6bebb..bc92b719 100644 --- a/stack_orchestrator/data/stacks/mainnet-eth-plugeth/README.md +++ b/stack_orchestrator/data/stacks/mainnet-eth-plugeth/README.md @@ -92,7 +92,7 @@ volumes: mainnet_eth_plugeth_geth_1_data: ./data/mainnet_eth_plugeth_geth_1_data mainnet_eth_plugeth_lighthouse_1_data: ./data/mainnet_eth_plugeth_lighthouse_1_data ``` -In addition, a stack-wide port mapping "recipe" can be applied at the time the +In addition, a stack-wide port mapping "recipe" can be applied at the time the `laconic-so deploy init` command is run, by supplying the desired recipe with the `--map-ports-to-host` option. The following recipes are supported: | Recipe | Host Port Mapping | |--------|-------------------| diff --git a/stack_orchestrator/data/stacks/mainnet-eth/README.md b/stack_orchestrator/data/stacks/mainnet-eth/README.md index 2656b75b..586b1067 100644 --- a/stack_orchestrator/data/stacks/mainnet-eth/README.md +++ b/stack_orchestrator/data/stacks/mainnet-eth/README.md @@ -92,7 +92,7 @@ volumes: mainnet_eth_geth_1_data: ./data/mainnet_eth_geth_1_data mainnet_eth_lighthouse_1_data: ./data/mainnet_eth_lighthouse_1_data ``` -In addition, a stack-wide port mapping "recipe" can be applied at the time the +In addition, a stack-wide port mapping "recipe" can be applied at the time the `laconic-so deploy init` command is run, by supplying the desired recipe with the `--map-ports-to-host` option. The following recipes are supported: | Recipe | Host Port Mapping | |--------|-------------------| diff --git a/stack_orchestrator/data/stacks/mainnet-go-opera/README.md b/stack_orchestrator/data/stacks/mainnet-go-opera/README.md index f5e761eb..955a692b 100644 --- a/stack_orchestrator/data/stacks/mainnet-go-opera/README.md +++ b/stack_orchestrator/data/stacks/mainnet-go-opera/README.md @@ -36,9 +36,9 @@ laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | 'mainnet-109331-no-histor laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.034] Maximum peer count total=50 laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.034] Smartcard socket not found, disabling err="stat /run/pcscd/pcscd.comm: no such file or directory" laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.034] Genesis file is a known preset name="Mainnet-109331 without history" -laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.052] Applying genesis state -laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.052] - Reading epochs unit 0 -laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.054] - Reading blocks unit 0 +laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.052] Applying genesis state +laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.052] - Reading epochs unit 0 +laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.054] - Reading blocks unit 0 laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.530] Applied genesis state name=main id=250 genesis=0x4a53c5445584b3bfc20dbfb2ec18ae20037c716f3ba2d9e1da768a9deca17cb4 laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.531] Regenerated local transaction journal transactions=0 accounts=0 laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.532] Starting peer-to-peer node instance=go-opera/v1.1.2-rc.5-50cd051d-1677276206/linux-amd64/go1.19.10 @@ -47,7 +47,7 @@ laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.537] laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.537] IPC endpoint opened url=/root/.opera/opera.ipc laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.538] HTTP server started endpoint=[::]:18545 prefix= cors=* vhosts=localhost laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.538] WebSocket enabled url=ws://[::]:18546 -laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.538] Rebuilding state snapshot +laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.538] Rebuilding state snapshot laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.538] EVM snapshot module=gossip-store at=000000..000000 generating=true laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.538] Resuming state snapshot generation accounts=0 slots=0 storage=0.00B elapsed="189.74µs" laconic-f028f14527b95e2eb97f0c0229d00939-go-opera-1 | INFO [06-20|13:32:33.538] Generated state snapshot accounts=0 slots=0 storage=0.00B elapsed="265.061µs" diff --git a/stack_orchestrator/data/stacks/mainnet-laconic/README.md b/stack_orchestrator/data/stacks/mainnet-laconic/README.md index 67984e5b..8407d70c 100644 --- a/stack_orchestrator/data/stacks/mainnet-laconic/README.md +++ b/stack_orchestrator/data/stacks/mainnet-laconic/README.md @@ -1,2 +1 @@ # Laconic Mainnet Deployment (experimental) - diff --git a/stack_orchestrator/data/stacks/mobymask/stack.yml b/stack_orchestrator/data/stacks/mobymask/stack.yml index 22a30a0f..3ce9c625 100644 --- a/stack_orchestrator/data/stacks/mobymask/stack.yml +++ b/stack_orchestrator/data/stacks/mobymask/stack.yml @@ -5,4 +5,4 @@ repos: containers: - cerc/watcher-mobymask pods: - - watcher-mobymask \ No newline at end of file + - watcher-mobymask diff --git a/stack_orchestrator/data/stacks/monitoring/README.md b/stack_orchestrator/data/stacks/monitoring/README.md index f0d39be6..4f41daa2 100644 --- a/stack_orchestrator/data/stacks/monitoring/README.md +++ b/stack_orchestrator/data/stacks/monitoring/README.md @@ -180,7 +180,7 @@ Set the following env variables in the deployment env config file (`monitoring-d # (Optional, default: http://localhost:3000) GF_SERVER_ROOT_URL= - + # RPC endpoint used by graph-node for upstream head metric # (Optional, default: https://mainnet.infura.io/v3) GRAPH_NODE_RPC_ENDPOINT= diff --git a/stack_orchestrator/data/stacks/test-database/README.md b/stack_orchestrator/data/stacks/test-database/README.md index 1dcdcc7b..aae68cd4 100644 --- a/stack_orchestrator/data/stacks/test-database/README.md +++ b/stack_orchestrator/data/stacks/test-database/README.md @@ -1,3 +1,3 @@ # Test Database Stack -A stack with a database for test/demo purposes. \ No newline at end of file +A stack with a database for test/demo purposes. diff --git a/stack_orchestrator/data/stacks/test/README.md b/stack_orchestrator/data/stacks/test/README.md index aef333fc..b95adfe7 100644 --- a/stack_orchestrator/data/stacks/test/README.md +++ b/stack_orchestrator/data/stacks/test/README.md @@ -1,3 +1,3 @@ # Test Stack -A stack for test/demo purposes. \ No newline at end of file +A stack for test/demo purposes. diff --git a/tests/k8s-deployment-control/run-test.sh b/tests/k8s-deployment-control/run-test.sh index 8ca9064b..c6e43694 100755 --- a/tests/k8s-deployment-control/run-test.sh +++ b/tests/k8s-deployment-control/run-test.sh @@ -116,7 +116,7 @@ echo "deploy create output file test: passed" # Note we also turn up the log level on the scheduler in order to diagnose placement errors # See logs like: kubectl -n kube-system logs kube-scheduler-laconic-f185cd245d8dba98-control-plane kind_config_file=${test_deployment_dir}/kind-config.yml -cat << EOF > ${kind_config_file} +cat << EOF > ${kind_config_file} kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 kubeadmConfigPatches: diff --git a/tests/laconic-network/run-test.sh b/tests/laconic-network/run-test.sh index 47a8de03..8cdfe045 100755 --- a/tests/laconic-network/run-test.sh +++ b/tests/laconic-network/run-test.sh @@ -14,7 +14,7 @@ chain_id="laconic_81337-6" node_moniker_prefix="node" echo "Deleting any existing network directories..." -for (( i=1 ; i<=$node_count ; i++ )); +for (( i=1 ; i<=$node_count ; i++ )); do node_network_dir=${node_dir_prefix}${i} if [[ -d $node_network_dir ]]; then @@ -38,7 +38,7 @@ do done echo "Initalizing ${node_count} nodes networks..." -for (( i=1 ; i<=$node_count ; i++ )); +for (( i=1 ; i<=$node_count ; i++ )); do node_network_dir=${node_dir_prefix}${i} node_moniker=${node_moniker_prefix}${i} @@ -47,7 +47,7 @@ do done echo "Joining ${node_count} nodes to the network..." -for (( i=1 ; i<=$node_count ; i++ )); +for (( i=1 ; i<=$node_count ; i++ )); do node_network_dir=${node_dir_prefix}${i} node_moniker=${node_moniker_prefix}${i} diff --git a/tests/mainnet-eth/run-test.sh b/tests/mainnet-eth/run-test.sh index dd56c183..332d8df7 100755 --- a/tests/mainnet-eth/run-test.sh +++ b/tests/mainnet-eth/run-test.sh @@ -15,7 +15,7 @@ echo "Test version command" reported_version_string=$( $TEST_TARGET_SO version ) echo "Version reported is: ${reported_version_string}" echo "Cloning repositories into: $CERC_REPO_BASE_DIR" -$TEST_TARGET_SO --stack mainnet-eth setup-repositories +$TEST_TARGET_SO --stack mainnet-eth setup-repositories $TEST_TARGET_SO --stack mainnet-eth build-containers $TEST_TARGET_SO --stack mainnet-eth deploy init --output mainnet-eth-spec.yml $TEST_TARGET_SO deploy create --spec-file mainnet-eth-spec.yml --deployment-dir $DEPLOYMENT_DIR diff --git a/tox.ini b/tox.ini index e261061b..239cd79b 100644 --- a/tox.ini +++ b/tox.ini @@ -3,4 +3,3 @@ extend-ignore = E203 exclude = .git,__pycache__,docs/source/conf.py,old,build,dist,venv max-complexity = 25 max-line-length = 132 -