Skip to content

Commit

Permalink
Merge branch 'main' into eureka-cpu/37
Browse files Browse the repository at this point in the history
  • Loading branch information
eureka-cpu committed Dec 3, 2024
2 parents e9b67e4 + 5832e47 commit a4a5137
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 11 deletions.
4 changes: 2 additions & 2 deletions bin/install.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e

cargo install cargo-binstall@1.0.1
cargo install cargo-binstall
cargo binstall cargo-risczero
cargo risczero install

Expand All @@ -17,4 +17,4 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
cargo install bonsol-cli --git https://github.com/anagrambuild/bonsol --features linux
fi
elif [[ "$OSTYPE" == "darwin"* ]]; then
cargo install bonsol-cli --git https://github.com/anagrambuild/bonsol --features mac
cargo install bonsol-cli --git https://github.com/anagrambuild/bonsol --features mac
2 changes: 1 addition & 1 deletion charts/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: bonsol-node
description: A Solana Verifiable compute coprocessor node
type: application
version: 1.0.0
version: 2.0.0
appVersion: "1.0.0"
4 changes: 3 additions & 1 deletion charts/templates/deployment-tester.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ spec:
bonsol deploy -y -m {{ include "bonsol-tester.manifestPath" . }} -t url --url $SIMPLE_IMAGE
while :
do
bonsol execute -f {{ include "bonsol-tester.executionReqPath" . }} -x 1000 -m 10000 -w
date '+%Y/%m/%d %H:%M:%S'
bonsol execute -f {{ include "bonsol-tester.executionReqPath" . }} -x 1000 -m 10000
echo "Sleeping 300 seconds ..."
sleep 300
done
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ provernode:
## order to run the pod on Kubernetes node with GPU.
##
image:
repository: ghcr.io/anagrambuild/bonsol-node@sha256
tag: 05d33ce69b8db9cd0755fa6ff474db8b51cc680c874ff36a17de814e70e31eae
repository: ghcr.io/anagrambuild/bonsol-node
tag: cuda-main-0.2.1
pullPolicy: "IfNotPresent"
imagePullSecrets: []

Expand Down
4 changes: 2 additions & 2 deletions docs/docs/shared/build.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
With the Bonsol cli installed we can now build our zk program using the following command.

```bash
bonsol build -z ./path-to-your-program
bonsol build --zk-program-path ./path-to-your-program
```

This will create a manifest.json file in the root of your program directory. This manifest file contains all the information needed to deploy your program.
Expand All @@ -23,4 +23,4 @@ Example manifest.json
}
```

If you run into any errors with the command you can check the [CLI Errors](/docs/reference/cli-commands#errors) section for more information.
If you run into any errors with the command you can check the [CLI Errors](/docs/reference/cli-commands#errors) section for more information.
17 changes: 16 additions & 1 deletion docs/docs/shared/deploy.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,23 @@ bonsol deploy -m ./path-to-your-manifest.json -t {s3|shadow-drive|url}
#### S3
You can upload your program to s3 and have it be accessible by the relayer network. This is the recommended way to deploy your program.

Upload your program to s3.
```bash
bonsol deploy -m ./path-to-your-manifest.json -t s3 --access-key {your access key} --secret-key {your secret key}
aws s3api create-bucket \
--bucket {bucket_name} \
--region {region} \
--create-bucket-configuration LocationConstraint={region}
```

```bash
bonsol deploy \
--deploy-type s3 \
--bucket {bucket_name} \
--access-key {access-key} \
--secret-key {secret-key} \
--region {region} \
--manifest-path collatz/manifest.json \
--storage-account s3://{bucket_name}
```

#### ShadowDrive
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/shared/init-new-bonsol.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ With the bonsol cli installed we can create a new bonsol program using the follo
```bash
mkdir zkprograms
cd zkprograms
bonsol init collatz
bonsol init --project-name collatz
```
This will create a new directory called `collatz` and initialize a new bonsol program in it. Your directory structure should look like this:
```
Expand All @@ -23,4 +23,4 @@ When you generate a blank bonsol program it will look like this:
input_order = ["Public"]
```
This section is used when building the program to specify the types and order of the inputs.
The valid options are ["Public", "Private", "PublicProof"].
The valid options are ["Public", "Private", "PublicProof"].

0 comments on commit a4a5137

Please sign in to comment.