Merge commit '6e73f5798098766b9cf31cfd5995767a33565ad5' into 00711-D-google-storage

Signed-off-by: Jeffrey Tang <[email protected]>

# Conflicts:
#	src/commands/network.ts

Author: JeffreyDallas

.github/workflows/zxc-e2e-test.yaml

@@ -167,7 +167,7 @@ jobs:
         if: ${{ runner.os == 'linux' && (inputs.npm-test-script == 'test-e2e-node-local-hedera' || inputs.npm-test-script == 'test-e2e-node-local-ptt' || inputs.npm-test-script == 'test-e2e-node-add-local') && !cancelled() && !failure() }}
         run: |
           cd ..
-          git clone https://github.com/hashgraph/hedera-services.git --depth 1 --branch v0.58.0
+          git clone https://github.com/hashgraph/hedera-services.git --depth 1 --branch v0.58.1
           cd hedera-services
           ls -ltr
           ${{ env.CG_EXEC }} ./gradlew assemble --stacktrace --info

README.md

@@ -25,7 +25,7 @@ An opinionated CLI tool to deploy and manage standalone test networks.
 
 To run a three-node network, you will need to set up Docker Desktop with at least 8GB of memory and 4 CPUs.
 
-![alt text](/docs/content/User/DockerDesktop.png)
+![alt text](images/DockerDesktop.png)
 
 ## Setup
 

HelperTasks.yml renamed to Taskfile.helper.yml

@@ -163,7 +163,7 @@ tasks:
         if [[ "${SOLO_CHART_VERSION}" != "" ]]; then
           export SOLO_CHART_FLAG='--solo-chart-version ${SOLO_CHART_VERSION}'
         fi
-        SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network deploy --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} ${RELEASE_FLAG} ${SOLO_CHART_FLAG} ${VALUES_FLAG} ${SETTINGS_FLAG} ${LOG4J2_FLAG} ${APPLICATION_PROPERTIES_FLAG} -q
+        SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network deploy --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} ${RELEASE_FLAG} ${SOLO_CHART_FLAG} ${VALUES_FLAG} ${SETTINGS_FLAG} ${LOG4J2_FLAG} ${APPLICATION_PROPERTIES_FLAG} ${GENESIS_THROTTLES_FLAG} -q
       - |
         if [[ "${CONSENSUS_NODE_VERSION}" != "" ]]; then
           export CONSENSUS_NODE_FLAG='--release-tag ${CONSENSUS_NODE_VERSION}'

Taskfile.yml

@@ -1,7 +1,7 @@
 version: 3
 includes:
   helper:
-    taskfile: ./HelperTasks.yml
+    taskfile: ./Taskfile.helper.yml
     flatten: true
 env:
   SOLO_NETWORK_SIZE: 2

docs/Taskfile.yaml

@@ -72,7 +72,10 @@ tasks:
       - mkdir -p content/Developer
       - cp ../DEV.md content/Developer/DEV.md
       - mkdir -p content/User
-      - cp ../README.md content/User/README.md
+      - mkdir -p content/User/README
+      - cp ../README.md content/User/README/index.md
+      - mkdir -p content/User/README/images
+      - cp ../images/DockerDesktop.png content/User/README/images/DockerDesktop.png
 
   install:
     cmds:

docs/content/User/DebugLog/debug.md renamed to docs/content/User/DebugLog/index.md

@@ -8,7 +8,7 @@ For Developers working on Hedera Application and platform development:
 
 * [Hedera developer](HederaDeveloper.md)
 * [Platform developer](PlatformDeveloper.md)
-* [Attach JVM debugger and retrieve logs](DebugLog/debug.md)
+* [Attach JVM debugger and retrieve logs](DebugLog/index.md)
 
 For Hedera JavaScript SDK users:
 

docs/content/User/GetStarted.md

@@ -8,7 +8,7 @@ Then we start with launching a local Solo network with the following commands:
 
 ```bash
 # launch a local Solo network with mirror node and hedera explorer
-task default-with-mirror-node
+task default-with-mirror
 ```
 
 Then create a new test account with the following command:
@@ -60,7 +60,7 @@ OPERATOR_KEY="302a300506032b65700321001d8978e647aca1195c54a4d3d5dc469b95666de14e
 HEDERA_NETWORK="local-node"
 ```
 
-Make sure to assign the value of accountId to `OPERATOR\_ID` and the value of privateKey to `OPERATOR\_KEY`.
+Make sure to assign the value of accountId to `OPERATOR_ID` and the value of privateKey to `OPERATOR_KEY`.
 
 Then try the following command to run the test
 

docs/content/User/SDK.md

@@ -1,5 +1,7 @@
 ## Advanced User Guide
+
 For those who would like to have more control or need some customized setups, here are some step by step instructions of how to setup and deploy a solo network.
+
 ### Setup Kubernetes cluster
 
 #### Remote cluster
@@ -28,6 +30,7 @@ Then run the following command to set the kubectl context to the new cluster:
 ```bash
 kind create cluster -n "${SOLO_CLUSTER_NAME}"
 ```
+
 Example output
 
 ```
@@ -48,7 +51,6 @@ Thanks for using kind! 😊
 
 You may now view pods in your cluster using `k9s -A` as below:
 
-
 ```
  Context: kind-solo                                <0> all   <a>       Attach       <ctr… ____  __.________
  Cluster: kind-solo                                          <ctrl-d>  Delete       <l>  |    |/ _/   __   \______
@@ -75,7 +77,6 @@ You may now view pods in your cluster using `k9s -A` as below:
 └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-
 ### Step by Step Instructions
 
 * Initialize `solo` directories:
@@ -136,13 +137,16 @@ Kubernetes Cluster	: kind-solo
 ✔ Generate gRPC TLS Keys
 ✔ Finalize
 ```
+
 PEM key files are generated in `~/.solo/keys` directory.
+
 ```
 hedera-node1.crt    hedera-node3.crt    s-private-node1.pem s-public-node1.pem  unused-gossip-pem
 hedera-node1.key    hedera-node3.key    s-private-node2.pem s-public-node2.pem  unused-tls
 hedera-node2.crt    hedera-node4.crt    s-private-node3.pem s-public-node3.pem
 hedera-node2.key    hedera-node4.key    s-private-node4.pem s-public-node4.pem
 ```
+
 * Setup cluster with shared components
 
 ```

docs/content/User/StepByStepGuide.md

@@ -21,7 +21,7 @@ geekdocDescription: Home page for Solo Documentation
 
 Solo is an opinionated CLI tool to deploy and manage standalone test networks.
 
-{{< button size="large" relref="User/README.md" >}}Getting Started{{< /button >}}
+{{< button size="large" relref="User/README/index.md" >}}Getting Started{{< /button >}}
 
 ## Feature overview
 

docs/content/_index.md

@@ -1,15 +1,15 @@
 ---
 main:
   - name: Getting Started
-    ref: "/User/README.md"
+    ref: "/User/README/index.md"
   - name: Start solo network with single command
     ref: "/User/TaskTool.md"
   - name: Hedera Developer
     ref: "HederaDeveloper.md"
   - name: Platform Developer
     ref: "PlatformDeveloper.md"
   - name: Attach JVM debugger and retrieve logs
-    ref: "/User/DebugLog.md"
+    ref: "/User/DebugLog/index.md"
   - name: Using Solo with Hedera JavaScript SDK
     ref: "/User/SDK.md"
   - name: Using Solo with mirror node

docs/data/menu/main.yml

@@ -10,7 +10,7 @@
 * make sure that your current kubeconfig context is pointing to the cluster that you want to deploy to
 * run `task` which will do the rest and deploy the network and take care of many of the pre-requisites
 
-NOTES: 
+NOTES:
 
 * Some of these examples are for running against large clusters with a lot of resources available.
 * the `env` environment variables if set in your shell will take precedence over what is in the Taskfile.yml. e.g. `export HEDERA_SERVICES_ROOT=<path-to-hedera-services-root>`

examples/README.md

@@ -1,7 +1,7 @@
 version: 3
 includes:
   helper:
-    taskfile: ../HelperTasks.yml
+    taskfile: ../Taskfile.helper.yml
     flatten: true
 
 tasks:

examples/ExamplesTasks.yml renamed to examples/Taskfile.examples.yml

@@ -1,7 +1,7 @@
 version: 3
 includes:
   main:
-    taskfile: ../ExamplesTasks.yml
+    taskfile: ../Taskfile.examples.yml
     flatten: true
 env:
   SOLO_NETWORK_SIZE: 10

examples/custom-network-config/Taskfile.yml

@@ -1,7 +1,7 @@
 version: 3
 includes:
   main:
-    taskfile: ../../ExamplesTasks.yml
+    taskfile: ../../Taskfile.examples.yml
     flatten: true
 vars:
   solo_home_override_dir: "%HOME%/.solo"

examples/performance-tuning/Latitude/Taskfile.yml renamed to examples/performance-tuning/latitude/Taskfile.yml

@@ -1,7 +1,7 @@
 version: 3
 includes:
   main:
-    taskfile: ../../ExamplesTasks.yml
+    taskfile: ../../Taskfile.examples.yml
     flatten: true
 env:
   SOLO_NETWORK_SIZE: 7

examples/performance-tuning/Latitude/application.properties renamed to examples/performance-tuning/latitude/application.properties

@@ -1,7 +1,7 @@
 version: 3
 includes:
   main:
-    taskfile: ../ExamplesTasks.yml
+    taskfile: ../Taskfile.examples.yml
     flatten: true
 vars:
   solo_home_override_dir: "/Users/user/.solo-gke-test"
@@ -17,3 +17,4 @@ env:
   APPLICATION_PROPERTIES_FLAG: "--application-properties {{.USER_WORKING_DIR}}/application.properties"
   HEDERA_SERVICES_ROOT: "/Users/user/source/hedera-services"
   LOCAL_BUILD_FLAG: "--local-build-path {{.HEDERA_SERVICES_ROOT}}/hedera-node/data"
+  GENESIS_THROTTLES_FLAG: "--genesis-throttles-file {{.USER_WORKING_DIR}}/throttles.json"

examples/performance-tuning/Latitude/init-containers-values.yaml renamed to examples/performance-tuning/latitude/init-containers-values.yaml

@@ -15,3 +15,7 @@ hedera.profiles.active=TEST
 staking.periodMins=1
 nodes.updateAccountIdAllowed=true
 blockStream.streamMode=RECORDS
+
+# Override the throttle definitions to be used during genesis.
+# This override is required because release <= 0.58.x use a different default path.
+bootstrap.throttleDefsJson.resource=data/config/genesis-throttles.json