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

Update main from staging #123

Merged
merged 48 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
87cd235
any experience
timothymcmackin Sep 14, 2023
264dcc2
This command is different for jsligo
timothymcmackin Sep 14, 2023
8429870
wip
timothymcmackin Sep 15, 2023
8ceae9e
Minting and manipulating NFTs
timothymcmackin Sep 18, 2023
b7943f0
remove outdated
timothymcmackin Sep 18, 2023
3ec168a
WIP on doing this on ghostnet
timothymcmackin Sep 18, 2023
d608ec7
Intro, learning objectives, what is an NFT
timothymcmackin Sep 18, 2023
46d703c
Needs node 18
timothymcmackin Sep 18, 2023
ba62950
Mint on testnet
timothymcmackin Sep 18, 2023
ca476f8
Summary
timothymcmackin Sep 18, 2023
e5c743a
Remove old TODOs
timothymcmackin Sep 18, 2023
43a6456
New URL
timothymcmackin Sep 18, 2023
7ebf808
metadata and contracts
timothymcmackin Sep 18, 2023
f5c06b5
Keep creation steps together
timothymcmackin Sep 18, 2023
9f86ea8
euros are not capitalized
timothymcmackin Sep 19, 2023
8a7c086
Move freezing till later
timothymcmackin Sep 19, 2023
f46c191
Got to fund the wallet
timothymcmackin Sep 19, 2023
56712e9
more tweaks
timothymcmackin Sep 19, 2023
7049597
wip
timothymcmackin Sep 7, 2023
41f0e7b
wip
timothymcmackin Sep 8, 2023
8f9b9ac
wip
timothymcmackin Sep 8, 2023
d4a730f
wip
timothymcmackin Sep 8, 2023
88b7589
wip
timothymcmackin Sep 11, 2023
8b82811
Add wallet connect button
timothymcmackin Sep 11, 2023
eed4912
Other code in utils.ts
timothymcmackin Sep 11, 2023
78daf8c
working on the swapping tokens steps
timothymcmackin Sep 11, 2023
4c57c28
swapping code explanations will need review
timothymcmackin Sep 11, 2023
c62116e
last part of the swapping tokens topic
timothymcmackin Sep 11, 2023
b7360e4
This is really about UI design
timothymcmackin Sep 12, 2023
241e8ef
Add fountational files here
timothymcmackin Sep 12, 2023
ec162dc
Adding liquidity
timothymcmackin Sep 12, 2023
b47fb76
Removing liquidity
timothymcmackin Sep 12, 2023
9029432
This should be a string instead of a list
timothymcmackin Sep 14, 2023
81c6c73
testnets' public RPC endpoints
timothymcmackin Sep 19, 2023
52706b8
Merge pull request #113 from trilitech/fix/jsligo-dry-run-command
timothymcmackin Sep 19, 2023
c18b48f
App won't run at this stage
timothymcmackin Sep 19, 2023
5b2b6a4
Tweaks
timothymcmackin Sep 19, 2023
62c9233
Remove testnetApi
timothymcmackin Sep 19, 2023
8837855
Added in previous section
timothymcmackin Sep 19, 2023
b8a6f96
Code indentations
timothymcmackin Sep 19, 2023
29725cb
Clarification on permission/approve security restriction
timothymcmackin Sep 20, 2023
740bb98
Tweaks on review
timothymcmackin Sep 20, 2023
ee24745
Put an intro entry in the TOC
timothymcmackin Sep 20, 2023
9a31408
Typo: consensus model
timothymcmackin Oct 3, 2023
a91b59f
Merge pull request #114 from trilitech/feat/nft-tutorial
timothymcmackin Oct 9, 2023
e043f30
Merge pull request #112 from trilitech/typos
timothymcmackin Oct 9, 2023
a1817f7
Merge pull request #117 from trilitech/fix/consensus-model-typo
timothymcmackin Oct 9, 2023
6d7a2e3
Merge pull request #106 from trilitech/feat/update-web-app-tutorial
timothymcmackin Oct 9, 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
Binary file added public/images/nft-create/created-pinata-key.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/nft-create/new-key-output.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/nft-create/pinned-nft-meta.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/nft-create/show-balance-bob.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 11 additions & 3 deletions src/components/Layout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -326,15 +326,23 @@ const tutorialNavigation = [
href: '/tutorials/build-your-first-app',
children: [
{
title: 'Wallets and user tokens',
title: "Introduction",
href: '/tutorials/build-your-first-app',
},
{
title: 'Part 1: Setting up the application',
href: '/tutorials/build-your-first-app/setting-up-app'
},
{
title: 'Part 2: Accessing wallets and tokens',
href: '/tutorials/build-your-first-app/wallets-tokens',
},
{
title: 'Swapping tokens',
title: 'Part 3: Swapping tokens',
href: '/tutorials/build-your-first-app/swapping-tokens',
},
{
title: 'Adding and removing liquidity',
title: 'Part 4: Adding and removing liquidity',
href: '/tutorials/build-your-first-app/adding-removing-liquidity',
},
],
Expand Down
2 changes: 1 addition & 1 deletion src/pages/tezos-basics/tezos-blockchain-overview/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Anyone who holds XTZ — the chain's native token — can propose changes to how

## Tezos uses proof of stake

The proof-of-stake consensus model consensus model eliminates the need for high energy use, making it the "green" choice for blockchains. Instead of competing to achieve consensus as in proof-of-work models, Tezos nodes (called *bakers*) stake Tezos tokens to earn the right to create blocks and receive rewards. Users who want to participate without running a node themselves can delegate tokens to a baker for a share of the rewards. The bakers and delegators keep control of their tokens and can remove them at any time. Tezos's approach to consensus has been described as [Liquid Proof of Stake](https://medium.com/tezos/liquid-proof-of-stake-aec2f7ef1da7).
The proof-of-stake consensus model eliminates the need for high energy use, making it the "green" choice for blockchains. Instead of competing to achieve consensus as in proof-of-work models, Tezos nodes (called *bakers*) stake Tezos tokens to earn the right to create blocks and receive rewards. Users who want to participate without running a node themselves can delegate tokens to a baker for a share of the rewards. The bakers and delegators keep control of their tokens and can remove them at any time. Tezos's approach to consensus has been described as [Liquid Proof of Stake](https://medium.com/tezos/liquid-proof-of-stake-aec2f7ef1da7).

The proof-of-stake model improves scalability and encourages incentive alignment. It also increases the cost of 51% attacks and avoids environmentally wasteful proof-of-work. Tezos launched in June 2018 as one of the first major proof-of-stake networks.

Expand Down
Loading
Loading