Skip to content

Commit 0004647

Browse files
Merge branch 'mainnet' into mwong/transfer-dropdown
Signed-off-by: Mike Turner <[email protected]>
2 parents 8a77dad + 2a7ebbf commit 0004647

File tree

241 files changed

+20051
-9053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+20051
-9053
lines changed

.circleci/config.yml

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ version: 2.1
22

33

44
orbs:
5-
node: circleci/node@5.1.0
5+
node: circleci/node@7.0.0
66

77

88
executors:
99
rust-node:
1010
docker:
11-
- image: cimg/rust:1.73-node
11+
- image: cimg/rust:1.80-node
1212

1313

1414
commands:
@@ -40,7 +40,9 @@ commands:
4040
- cargo_fetch:
4141
working_directory: wasm
4242
- node/install-packages:
43-
pkg-manager: yarn
43+
check-cache: always
44+
pkg-manager: yarn-berry
45+
with-cache: false
4446

4547

4648
setup-sdk:
@@ -73,14 +75,33 @@ jobs:
7375
yarn test
7476
7577
78+
e2e-testnet:
79+
executor: rust-node
80+
steps:
81+
- setup-sdk
82+
- run:
83+
working_directory: sdk/e2e/testnet
84+
command: |
85+
yarn start
86+
87+
e2e-mainnet:
88+
executor: rust-node
89+
steps:
90+
- setup-sdk
91+
- run:
92+
working_directory: sdk/e2e/mainnet
93+
command: |
94+
yarn start
95+
96+
7697
template-node:
7798
executor: rust-node
7899
steps:
79100
- setup-sdk
80101
- run:
81102
working_directory: create-leo-app/template-node
82103
command: |
83-
yarn start
104+
yarn dev
84105
85106
template-node-ts:
86107
executor: rust-node
@@ -89,7 +110,7 @@ jobs:
89110
- run:
90111
working_directory: create-leo-app/template-node-ts
91112
command: |
92-
yarn start
113+
yarn dev
93114
94115
template-extension:
95116
executor: rust-node
@@ -119,7 +140,8 @@ jobs:
119140
- run:
120141
working_directory: wasm
121142
command: |
122-
cargo clippy
143+
cargo clippy --features testnet
144+
cargo clippy --features mainnet
123145
124146
check-fmt:
125147
executor: rust-node
@@ -130,7 +152,7 @@ jobs:
130152
- run:
131153
working_directory: wasm
132154
command: |
133-
cargo fmt -- --check
155+
cargo fmt --all -- --check
134156
135157
136158
workflows:
@@ -144,6 +166,12 @@ workflows:
144166
- sdk-test:
145167
requires:
146168
- sdk
169+
- e2e-testnet:
170+
requires:
171+
- sdk
172+
- e2e-mainnet:
173+
requires:
174+
- sdk
147175
- template-node:
148176
requires:
149177
- sdk

.github/ISSUE_TEMPLATE/bug.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ labels: bug
1010
<!--
1111
What's the bug in the Aleo SDK that you found?
1212
How serious is this bug and what is affected?
13-
13+
1414
To report a security issue in the Aleo SDK, please email [email protected].
1515
-->
1616

.github/workflows/staging-website.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
uses: actions-rs/toolchain@v1
1919
with:
2020
profile: minimal
21-
toolchain: nightly-2024-05-14
21+
toolchain: nightly-2025-01-16
2222
override: true
2323
components: rustfmt, rust-src
2424

25-
- uses: actions/cache@v2
25+
- uses: actions/cache@v4
2626
with:
2727
path: |
2828
~/.cargo/registry

.github/workflows/test-website.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
uses: actions-rs/toolchain@v1
1616
with:
1717
profile: minimal
18-
toolchain: nightly-2024-05-14
18+
toolchain: nightly-2025-01-16
1919
override: true
2020
components: rustfmt, rust-src
2121

22-
- uses: actions/cache@v2
22+
- uses: actions/cache@v4
2323
with:
2424
path: |
2525
~/.cargo/registry

.github/workflows/website.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Website
22
on:
33
push:
44
branches:
5-
- testnet3
5+
- mainnet
66

77
jobs:
88
deploy:
@@ -18,11 +18,11 @@ jobs:
1818
uses: actions-rs/toolchain@v1
1919
with:
2020
profile: minimal
21-
toolchain: nightly-2024-05-14
21+
toolchain: nightly-2025-01-16
2222
override: true
2323
components: rustfmt, rust-src
2424

25-
- uses: actions/cache@v2
25+
- uses: actions/cache@v4
2626
with:
2727
path: |
2828
~/.cargo/registry

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
**/node_modules
66
**/target
77
**/dist
8+
**/tmp
89
storage*/
910
**/.next
1011

@@ -18,4 +19,5 @@ rust/src/program/.DS_Store
1819
# Local Netlify folder
1920
.netlify
2021

21-
package-lock.json
22+
package-lock.json
23+
.yarn

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: "node-modules"

PUBLISH.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
## Publish instructions
2+
3+
Replace `$VERSION` with the desired new version (e.g. `0.7.0`):
4+
5+
```bash
6+
npm login
7+
yarn change-version $VERSION
8+
yarn deploy
9+
```

README.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<a href="https://developer.aleo.org"> <img alt="Website" src="https://img.shields.io/badge/Developer_Docs-online-blue"></a>
2+
<a href="https://docs.leo-lang.org"> <img alt="Website" src="https://img.shields.io/badge/Developer_Docs-online-blue"></a>
33
<a href="https://circleci.com/gh/ProvableHQ/sdk"><img src="https://circleci.com/gh/ProvableHQ/sdk.svg?style=svg"></a>
44
<a href="https://discord.com/invite/aleo"><img src="https://img.shields.io/discord/700454073459015690?logo=discord"/></a>
55
<a href="https://github.com/ProvableHQ/sdk#%EF%B8%8F-contributors"><img src="https://img.shields.io/badge/contributors-23-ee8449"/></a>
@@ -13,10 +13,11 @@ several TypeScript & JavaScript libraries which provide the following functional
1313
1. [Aleo account management](https://provable.tools/account)
1414
2. [Web-based program execution and deployment](https://provable.tools/develop)
1515
3. [Aleo credit transfers](https://provable.tools/transfer)
16-
4. [Management of program state and data](https://provable.tools/record)
16+
4. [Management of program state and data](https://provable.tools/protocol)
1717
5. [Communication with the Aleo network](https://provable.tools/rest)
18+
6. [Aleo Cryptographic Primitives](https://provable.tools/algebra)
1819

19-
All of this functionality is demonstrated on [Provable.tools](https://provable.tools).
20+
All of this functionality is demonstrated on [Provable.tools](https://provable.tools).
2021

2122

2223
The Aleo SDK is divided into three TypeScript/JavaScript packages:
@@ -29,7 +30,7 @@ The official Aleo SDK providing JavaScript/TypeScript tools for creating zero-kn
2930

3031
### ⚡ Build your own app
3132

32-
Start here with the [Aleo SDK Readme](https://github.com/ProvableHQ/sdk#readme) to get started building your
33+
Start here with the [Aleo SDK Readme](https://github.com/ProvableHQ/sdk#readme) to get started building your
3334
first zero-knowledge web app.
3435

3536
#### Source: [`Aleo SDK`](https://www.npmjs.com/package/@provablehq/sdk)
@@ -40,14 +41,12 @@ first zero-knowledge web app.
4041
Create-leo-app provides zero-knowledge web app examples in common web frameworks such as React. Developers looking to
4142
start with working examples should start here.
4243

43-
#### Source: [`sdk/create-leo-app`](https://github.com/ProvableHQ/sdk/tree/testnet3/create-leo-app)
44+
#### Source: [`sdk/create-leo-app`](https://github.com/ProvableHQ/sdk/tree/mainnet/create-leo-app)
4445

4546
## 3. Aleo Wasm - Zero-Knowledge Algorithms in JavaScript + WebAssembly
4647
<a href="https://www.npmjs.com/package/@provablehq/wasm"> <img alt="Create Leo App" src="https://img.shields.io/npm/l/%40provablehq%2Fwasm?label=NPM%20-%20Aleo%20Wasm&labelColor=green&color=blue"></a>
47-
<a href="https://www.npmjs.com/package/@provablehq/nodejs"> <img alt="Create Leo App" src="https://img.shields.io/npm/l/%40provablehq%2Fnodejs?label=NPM%20-%20Aleo%20Nodejs&labelColor=green&color=blue"></a>
48-
<a href="https://crates.io/crates/aleo-wasm"> <img alt="Aleo-Wasm" src="https://img.shields.io/crates/v/aleo-wasm.svg?color=neon"></a>
4948

50-
Aleo Wasm is a Rust crate which compiles the Aleo source code responsible for creating and executing zero-knowledge programs into
49+
Aleo Wasm is a Rust crate which compiles the Aleo source code responsible for creating and executing zero-knowledge programs into
5150
WebAssembly.
5251

5352
When compiled with `wasm-pack`, JavaScript bindings are generated for the WebAssembly allowing Aleo zero-knowledge programs to be used in the browser and Node.js. This package is available on NPM (linked above). The Aleo Wasm
@@ -61,15 +60,15 @@ Source: [Aleo Wasm](https://www.npmjs.com/package/@provablehq/wasm)
6160

6261
## 📚 Documentation
6362

64-
#### [API Documentation](https://developer.aleo.org/sdk/typescript/overview)
63+
#### [API Documentation](https://docs.leo-lang.org/sdk/typescript/overview)
6564
API Documentation, tutorials for the Aleo SDK, and documentation on how to build Leo and Aleo Instructions programs can
66-
be found on the [Aleo Developer Docs](https://developer.aleo.org/sdk/typescript/overview) page.
65+
be found on the [Leo Developer Docs](https://docs.leo-lang.org/sdk/typescript/overview) page.
6766

68-
#### [SDK Readme](https://github.com/ProvableHQ/sdk/tree/testnet3/sdk#readme)
67+
#### [SDK Readme](https://github.com/ProvableHQ/sdk/tree/mainnet/sdk#readme)
6968
The SDK readme provides concepts core to executing zero-knowledge programs in the web and several detailed examples of
7069
how to use the SDK to build web apps using Aleo.
7170

72-
#### [Aleo Wasm Readme](https://github.com/ProvableHQ/sdk/tree/testnet3/wasm#readme)
71+
#### [Aleo Wasm Readme](https://github.com/ProvableHQ/sdk/tree/mainnet/wasm#readme)
7372
The Aleo Wasm readme provides instructions for compiling the Aleo Wasm crate and using it in web projects. Those who
7473
want to build from source or create their own WebAssembly bindings should start here.
7574

create-leo-app/PUBLISH.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)