Skip to content

Commit

Permalink
Merge pull request #250 from trilitech/staging
Browse files Browse the repository at this point in the history
Update main from staging Jan 5
  • Loading branch information
timothymcmackin authored Jan 5, 2024
2 parents 2f18abc + 5d9bc64 commit 253583f
Show file tree
Hide file tree
Showing 69 changed files with 164 additions and 2,181 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Trilitech
Copyright (c) 2023-2024 Trilitech

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
17 changes: 11 additions & 6 deletions docs/architecture/accounts.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@
title: Accounts
authors: "Tim McMackin"
last_update:
date: 18 October 2023
date: 29 December 2023
---

Tezos uses two types of accounts:
Tezos uses these types of accounts:

- Classic accounts (also known as _implicit accounts_) with an address, storing tez (ꜩ).
- Classic accounts (also known as _implicit accounts_) store tez (ꜩ) and tickets.
These accounts have addresses that start with "tz1", "tz2", "tz3" or "tz4."
Any wallet application or the Octez command-line tool can create implicit accounts.

- Smart contract accounts (also known as _originated accounts_) with an address, storing code and tez (ꜩ).
Originated accounts have addresses that start with "KT1."
Creating an originated account is part of the process of deploying a smart contract; see [Smart contracts](../smart-contracts).
- Smart contract accounts (also known as _originated accounts_) store immutable code, mutable storage, tez (ꜩ), and tickets.
Smart contracts have addresses that start with "KT1."
See [Smart contracts](../smart-contracts).

- Smart Rollup accounts are another type of originated account.
Their addresses start with `SR1`.
They have a tree of commitments attached to them.
See [Smart Optimistic Rollups](./smart-rollups).
12 changes: 9 additions & 3 deletions docs/developing/information/block-explorers.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: Block Explorers
last_update:
date: 10 July 2023
date: 22 December 2023
---

**What is a blockchain explorer?**
Expand Down Expand Up @@ -35,5 +35,11 @@ Block explorers are also used by:

Here are some commonly used Tezos block explorers:

1. [TzStats](https://tzstats.com/)
2. [TzKT](https://tzkt.io/)
- [TzStats](https://tzstats.com/)
- [TzKT](https://tzkt.io/)
- [Arronax](https://arronax.io)
- [Baking Bad](https://baking-bad.org)
- [Better Call Dev](https://better-call.dev)
- [Explorus](https://explorus.io/)
- [Etherlink Explorer](https://explorer.etherlink.com/)
- [TzFlow](https://tzflow.com/)
274 changes: 0 additions & 274 deletions docs/developing/information/custom-indexers.md

This file was deleted.

487 changes: 122 additions & 365 deletions docs/developing/information/indexers.md

Large diffs are not rendered by default.

172 changes: 0 additions & 172 deletions docs/tutorials/create-an-nft/fa12/index.md

This file was deleted.

Loading

1 comment on commit 253583f

@vercel
Copy link

@vercel vercel bot commented on 253583f Jan 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.