Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: docs restructure #2322

Merged
merged 39 commits into from
Sep 19, 2023
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
124d627
syntax sidebar
catmcgee Sep 15, 2023
40572ad
syntax and roadmap structure
catmcgee Sep 15, 2023
269ae1c
sidebar
catmcgee Sep 15, 2023
2b8ed8c
commented out empty sidebar elements
catmcgee Sep 15, 2023
9faa1d5
redirects
catmcgee Sep 15, 2023
64a8129
filled in some pages
catmcgee Sep 15, 2023
d79a0c6
typo
catmcgee Sep 15, 2023
a6bf573
fix yarn.lock
catmcgee Sep 15, 2023
b9e8eae
merge conflicts
catmcgee Sep 15, 2023
6865c56
Merge branch 'master' into docs-restructure
catmcgee Sep 15, 2023
6cd3450
Merge branch 'master' into docs-restructure
critesjosh Sep 15, 2023
0fd93d8
some cleanup, added note on default accounts, add token contract tuto…
critesjosh Sep 15, 2023
0168a97
clean urls, edits
critesjosh Sep 15, 2023
e3286a8
add titles, notes
critesjosh Sep 15, 2023
49d1dee
add/remove links, update headings
critesjosh Sep 15, 2023
244b5e4
add popular packages to main README
critesjosh Sep 18, 2023
4db7fa4
reference test code, update test
critesjosh Sep 18, 2023
dc789d2
add title
critesjosh Sep 18, 2023
6a215fd
Merge branch 'master' into docs-restructure
critesjosh Sep 18, 2023
b7e3243
update quickstart to use standard token contract
critesjosh Sep 18, 2023
57f2afe
updates
critesjosh Sep 18, 2023
ef50a70
rename sandbox.md to aztecjs.md
critesjosh Sep 18, 2023
b2817a7
remove types.md
critesjosh Sep 18, 2023
6ae0b99
add background
critesjosh Sep 18, 2023
44e2b4f
move template to root so it doesn't appear in the page build
critesjosh Sep 18, 2023
a316292
Merge branch 'master' into docs-restructure
critesjosh Sep 18, 2023
6bed496
Merge branch 'docs-restructure' of https://github.com/AztecProtocol/a…
critesjosh Sep 18, 2023
d7599a0
Merge branch 'master' into docs-restructure
critesjosh Sep 18, 2023
5af1104
move internal docs
critesjosh Sep 18, 2023
d498a62
add redirects
critesjosh Sep 18, 2023
ab3639f
edits
critesjosh Sep 18, 2023
8d52556
rename back to sandbox
critesjosh Sep 18, 2023
134df4c
fix headings
critesjosh Sep 18, 2023
73609d8
use installnargo component
critesjosh Sep 18, 2023
26342bf
Merge branch 'master' into docs-restructure
critesjosh Sep 18, 2023
3949057
minor updates
critesjosh Sep 18, 2023
eddcde1
Merge branch 'master' into docs-restructure
critesjosh Sep 18, 2023
4251b42
fix links
critesjosh Sep 19, 2023
ee8cf3a
various updates
critesjosh Sep 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into docs-restructure
  • Loading branch information
critesjosh authored Sep 18, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 6a215fd3989e05db5d4b3930904a4d0a3634c36c
2 changes: 1 addition & 1 deletion docs/sidebars.js
Original file line number Diff line number Diff line change
@@ -96,7 +96,7 @@ const sidebars = {
"dev_docs/contracts/events",
"dev_docs/contracts/compiling",
"dev_docs/contracts/deploying",
"dev_docs/contracts/example-contract",
"dev_docs/contracts/artifacts",
"dev_docs/contracts/abi",
{
label: "Syntax",
42 changes: 27 additions & 15 deletions yarn-project/end-to-end/src/guides/up_quick_start.sh
Original file line number Diff line number Diff line change
@@ -23,40 +23,52 @@ aztec-cli send _initialize \
--private-key $ALICE_PRIVATE_KEY
# docs:end:deploy

aztec-cli check-deploy --contract-address 0x03b030d48607ba8a0562f0f1f82be26c3f091e45e10f74c2d8cebb80d526a69f
# docs:start:declare-contract
CONTRACT=0x03b030d48607ba8a0562f0f1f82be26c3f091e45e10f74c2d8cebb80d526a69f
# docs:end:declare-contract
# docs:start:mint-private
SECRET="0x29bf6afaf29f61cbcf2a4fa7da97be481fb418dc08bdab5338839974beb7b49f"
SECRET_HASH="0x0a42b1fe22b652cc8610e33bb1128040ce2d2862e7041ff235aa871739822b74"

aztec-cli send mint_private \
--args 1000 $SECRET_HASH \
--contract-abi TokenContractAbi \
--contract-address 0x2d23acefa3ce07b3c308caf78d86c064cdf8957bcea48b38753cf58441796c8c \
--private-key $ALICE_PRIVATE_KEY

aztec-cli send redeem_shield \
--args $ALICE 1000 $SECRET \
--contract-abi TokenContractAbi \
--contract-address 0x2d23acefa3ce07b3c308caf78d86c064cdf8957bcea48b38753cf58441796c8c \
--private-key $ALICE_PRIVATE_KEY
# docs:end:mint-private

# docs:start:get-balance
aztec-cli call balance_of_private \
--args $ALICE \
--contract-abi PrivateTokenContractAbi \
--contract-address $CONTRACT
--contract-abi TokenContractAbi \
--contract-address 0x2d23acefa3ce07b3c308caf78d86c064cdf8957bcea48b38753cf58441796c8c
# docs:end:get-balance

# docs:start:transfer
aztec-cli send transfer \
--args 500 $ALICE $BOB \
--contract-abi PrivateTokenContractAbi \
--contract-address $CONTRACT \
--private-key 0xb2803ec899f76f6b2ac011480d24028f1a29587f8a3a92f7ee9d48d8c085c284
--args $ALICE $BOB 500 0 \
--contract-abi TokenContractAbi \
--contract-address 0x2d23acefa3ce07b3c308caf78d86c064cdf8957bcea48b38753cf58441796c8c \
--private-key $ALICE_PRIVATE_KEY

aztec-cli call balance_of_private \
--args $ALICE \
--contract-abi PrivateTokenContractAbi \
--contract-address $CONTRACT
--contract-abi TokenContractAbi \
--contract-address 0x2d23acefa3ce07b3c308caf78d86c064cdf8957bcea48b38753cf58441796c8c

aztec-cli call balance_of_private \
--args $BOB \
--contract-abi PrivateTokenContractAbi \
--contract-address $CONTRACT
--contract-abi TokenContractAbi \
--contract-address 0x2d23acefa3ce07b3c308caf78d86c064cdf8957bcea48b38753cf58441796c8c
# docs:end:transfer

aztec-cli get-logs

# Test end result
BOB_BALANCE=$(aztec-cli call getBalance --args $BOB --contract-abi PrivateTokenContractAbi --contract-address $CONTRACT)
BOB_BALANCE=$(aztec-cli call balance_of_private --args $BOB --contract-abi TokenContractAbi --contract-address 0x2d23acefa3ce07b3c308caf78d86c064cdf8957bcea48b38753cf58441796c8c)
if ! echo $BOB_BALANCE | grep -q 500; then
echo "Incorrect Bob balance after transaction (expected 500 but got $BOB_BALANCE)"
exit 1
You are viewing a condensed version of this merge commit. You can view the full changes here.