Merge branch 'main' into crowdin-fixes

Chia-Network · Jul 17, 2024 · b7c9584 · b7c9584
2 parents ce2ecdd + a6a3d41
commit b7c9584
Show file tree

Hide file tree

Showing 60 changed files with 561 additions and 293 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,6 +9,7 @@ updates:
       interval: "weekly"
       day: "tuesday"
     open-pull-requests-limit: 10
+    rebase-strategy: auto
     labels:
       - dependencies
       - go
@@ -25,6 +26,7 @@ updates:
       interval: "weekly"
       day: "tuesday"
     open-pull-requests-limit: 10
+    rebase-strategy: auto
     labels:
       - dependencies
       - python
@@ -37,6 +39,7 @@ updates:
       interval: "weekly"
       day: "tuesday"
     open-pull-requests-limit: 10
+    rebase-strategy: auto
     labels:
       - dependencies
       - github_actions
@@ -49,18 +52,20 @@ updates:
       interval: "weekly"
       day: "tuesday"
     open-pull-requests-limit: 10
+    rebase-strategy: auto
     labels:
       - dependencies
       - javascript
       - "Changed"
-    reviewers: ["cmmarslender", "emlowe"]
+    reviewers: ["cmmarslender", "ChiaMineJP"]
 
   - package-ecosystem: cargo
     directory: /
     schedule:
       interval: "weekly"
       day: "tuesday"
     open-pull-requests-limit: 10
+    rebase-strategy: auto
     labels:
       - dependencies
       - rust

diff --git a/.github/workflows/delete-review.yml b/.github/workflows/delete-review.yml
@@ -50,14 +50,14 @@ jobs:
           url: ${{ secrets.VAULT_URL }}
           token: ${{ env.VAULT_TOKEN }}
           secrets: |
-            secret/data/fmt/k8s/fmt-k8s-public api_server_url | K8S_API_SERVER_URL;
+            secret/data/fmt/k8s/k8s-fmt api_server_url | K8S_API_SERVER_URL;
 
       - name: Login to k8s cluster
         uses: Chia-Network/actions/vault/k8s-login@main
         with:
           vault_url: ${{ secrets.VAULT_URL }}
           vault_token: ${{ env.VAULT_TOKEN }}
-          backend_name: fmt-k8s-public
+          backend_name: k8s-fmt
           role_name: github-actions
           cluster_url: ${{ env.K8S_API_SERVER_URL }}
 

diff --git a/.github/workflows/deploy-review.yml b/.github/workflows/deploy-review.yml
@@ -84,7 +84,7 @@ jobs:
           tags: |
             type=sha,format=long
       - name: Build Docker Container
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64
@@ -118,14 +118,14 @@ jobs:
           url: ${{ secrets.VAULT_URL }}
           token: ${{ env.VAULT_TOKEN }}
           secrets: |
-            secret/data/fmt/k8s/fmt-k8s-public api_server_url | K8S_API_SERVER_URL;
+            secret/data/fmt/k8s/k8s-fmt api_server_url | K8S_API_SERVER_URL;
 
       - name: Login to k8s cluster
         uses: Chia-Network/actions/vault/k8s-login@main
         with:
           vault_url: ${{ secrets.VAULT_URL }}
           vault_token: ${{ env.VAULT_TOKEN }}
-          backend_name: fmt-k8s-public
+          backend_name: k8s-fmt
           role_name: github-actions
           cluster_url: ${{ env.K8S_API_SERVER_URL }}
 

diff --git a/.prettierrc b/.prettierrc
@@ -1,6 +1,14 @@
 overrides:
-  - files: ["*.md", "*.mdx"]
+  - files: ["*.yaml", "*.yml", "*.toml", "*.json", "*.ini"]
     options:
-      "tabWidth": 2
-      "singleQuote": true
-      "jsxSingleQuote": true
+      tabWidth: 2
+      singleQuote: false
+      experimentalTernaries: true
+      useTabs: false
+  - files: ["*.md"]
+    options:
+      singleQuote: false
+  - files: ["*.js", "*.jsx", "*.ts", "*.tsx", "*.cjs", "*.mjs"]
+    options:
+      printWidth: 120
+      singleQuote: true
diff --git a/.prettierrc.yml b/.prettierrc.yml
@@ -0,0 +1,14 @@
+overrides:
+  - files: ["*.yaml", "*.yml", "*.toml", "*.json", "*.ini"]
+    options:
+      tabWidth: 2
+      singleQuote: false
+      experimentalTernaries: true
+      useTabs: false
+  - files: ["*.md"]
+    options:
+      singleQuote: false
+  - files: ["*.js", "*.jsx", "*.ts", "*.tsx", "*.cjs", "*.mjs"]
+    options:
+      printWidth: 120
+      singleQuote: true
diff --git a/docs/academy/primitives/academy-offers.md b/docs/academy/primitives/academy-offers.md
@@ -0,0 +1,98 @@
+---
+title: Offers
+slug: /academy-offers
+---
+
+In this lesson, we talk about Chia Offers and how they enables safe peer-to-peer trading.
+
+## Learning objectives
+
+- **Peer-to-peer trading**: Understand what offers are and how they enable P2P trading.
+- **Managing offer files**: Learn how to share, accept, and cancel offers.
+
+---
+
+## Content
+
+<div class="videoWrapper">
+<iframe width="100%" height="504" src="https://www.youtube.com/embed/O7Anp-oPV_A" frameborder="0" allowfullscreen="allowfullscreen"></iframe>
+</div>
+
+---
+
+## Script
+
+<details>
+
+<summary> Expand for the full script </summary>
+
+0:00
+Chia Offers are used to trade assets between two parties safely and securely in a direct, peer-to-peer transaction. They can be used to trade any combination of assets including XCH, CATs, and NFTs.
+
+0:20
+When an offer is accepted, the trade happens atomically, meaning the entirety of the trade settles simultaneously with no counterparty risk. The creator of an offer specifies the assets they wish to offer as well as the assets they wish to receive.
+
+0:40
+An offer file is then created, represented as a string of characters containing an incomplete and partially signed spend bundle. The creator can then share this offer file through any means, such as email, QR code, and offer file exchange services. Anyone that sees an offer file and wants to accept the trade can do so by signing and completing the other side of the spend bundle and submit it to the blockchain to be settled atomically.
+
+1:00
+Assets with smart contracts attached such as NFTs that include creator royalties are also enforced. If a creator wishes to cancel an existing offer, they can simply spend any of the assets offered to invalidate it.
+
+1:20
+Offers can also be set to automatically expire after a certain amount of time if nobody takes it. Offer files allow for true peer-to-peer transactions, introducing a new way to create safe and decentralized liquid markets for assets on the Chia blockchain.
+
+</details>
+
+---
+
+## Common gotchas
+
+- **Locked coins:** Some wallets including the GUI Reference Wallet will indicate part of the balance of an asset as "locked" or "unspendable" if an Offer was created offering that asset. In truth, those coins aren't actually unspendable but if they _are_ spent, any offer(s) that use those coins will be invalid. In order to not lock up more than the offered amount, one can split their coins into smaller amounts prior to creating an offer.
+- **Canceling open offers:** If an offer has been previously shared (e.g. uploaded to dexie) and the creator wishes to cancel it, they need to cancel with the "Cancel on blockchain" function enabled to ensure the offer is truly invalidated and not just deleted locally.
+- **Blockchain fees:** Accepting an offer is an on-chain transaction and hence requires a transaction fee to be prioritized when blocks are full. The creator can embed fees as part of the offer file but the buyer can also optionally include a transaction fee as well.
+
+---
+
+## Knowledge check
+
+:::tip Question 1 - Supported assets
+
+True or False; An offer file is only for trading NFTs.
+
+:::
+
+<details>
+
+<summary> Answer (expand when ready to see the answer)  </summary>
+
+False. An offer file can be used to trade any combination of assets including (but not limited to) XCH, CATs, and NFTs. Offer files can also be used with other types of coins such as Verifiable Credentials or DataLayer singletons.
+
+</details>
+
+:::tip Question 2 - NFT Royalties
+
+True or False; When creating an offer for NFTs, creator royalties (if any) must be included.
+
+:::
+
+<details>
+
+<summary> Answer (expand when ready to see the answer)  </summary>
+
+True. If an NFT specifies a creator royalty, this amount must be included as part of the requested assets to be considered valid. Royalties are applied to XCH and CATs that are a part of the offer. Wallets will automatically calculate and include these coins to be sent to the NFT creator.
+
+</details>
+
+---
+
+## Additional resources
+
+### Links
+
+- More about [primitives](https://docs.chia.net/guides/primitives/): guides for each primitive, and how to use them.
+- CLI [Guide](https://docs.chia.net/guides/crash-course/cats-offers-nfts/#offers): documentation on how to interact with offers with the CLI.
+- Chialisp [detailed documentation](https://chialisp.com/): detailed information on all aspects of chialisp.
+- Support [in discord](https://discord.gg/chia): for further support join our discord server and ask in the #chialisp or #support channels.
+- Offer file [exchanges](https://dexie.space): a bulletin board system for sharing and discovering offer files.
+
+---
diff --git a/docs/coin-set-model/clvm-vs-evm.md b/docs/coin-set-model/clvm-vs-evm.md
@@ -3,7 +3,7 @@ title: CLVM vs EVM
 slug: /clvm-vs-evm
 ---
 
-We'll start with a brief description of CLVM. For details on the inner workings of CLVM, see our [CLVM reference](https://chialisp.com/clvm 'CLVM reference on chialisp.com').
+We'll start with a brief description of CLVM. For details on the inner workings of CLVM, see our [CLVM reference](https://chialisp.com/clvm "CLVM reference on chialisp.com").
 
 - CLVM is the compiled, minimal version of ChiaLisp that is used by the Chia network.
 - CLVM is built out of cons boxes and atoms. Cons boxes contain two items, which can be either an atom or another cons box.

diff --git a/docs/consensus/forks.md b/docs/consensus/forks.md
@@ -5,12 +5,12 @@ slug: /consensus-forks
 
 The following table is a comprehensive list of all forks (planned and activated) on Chia's blockchain. It was last updated on 2023-09-10.
 
-| Activation Block | Activation Date | Type | Build | Status                         | Description                                                                                                                                                    |
-| :--------------- | :-------------- | :--- | :---- | :----------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `2 300 000`      | 2022-07-22      | Soft | 1.3.0 | Activated                      | [Disallow negative division](https://www.chia.net/2022/03/04/divided-we-fork/)                                                                                 |
-| `3 630 000`      | 2023-05-07      | Soft | 1.7.0 | Activated                      | [Restrict `AGG_SIG_UNSAFE` message](https://github.com/Chia-Network/post-mortem/blob/main/2023-05/2023-05-08-AGG_SIG_UNSAFE-can-mimic-AGG_SIG_ME-condition.md) |
-| `3 886 635`      | 2023-07-01      | Soft | 1.8.0 | Activated                      | [CHIP-14](https://github.com/Chia-Network/chips/blob/main/CHIPs/chip-0014.md) -- `ASSERT_BEFORE_*` conditions                                                  |
-| `4 510 000`      | 2023-11-12      | Soft | 2.0.0 | Activated                      | [CHIP-11](https://github.com/Chia-Network/chips/blob/main/CHIPs/chip-0011.md) -- BLS/SECP CLVM Operators                                                       |
-| `5 496 000`      | 2024-06         | Hard | 2.1.0 | Released, <br/> Not Activated  | [CHIP-12](https://github.com/Chia-Network/chips/blob/main/CHIPs/chip-0012.md) -- Decrease plot filter                                                          |
-| `5 716 000`      | 2024-07         | Soft | 2.3.0 | Released, <br/> Not Activated  | [CHIP-25](https://github.com/Chia-Network/chips/pull/98) -- Chialisp Message Conditions                                                                        |
-| `5 940 000`      | 2024-09         | Soft | N/A   | Proposed, <br/> Not in a Build | [CHIP-34](https://github.com/Chia-Network/chips/pull/116) -- keccak and base64 CLVM operators                                                                  |
+| Activation Block | Activation Date | Type | Build | Status                        | Description                                                                                                                                                    |
+| :--------------- | :-------------- | :--- | :---- | :---------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `2 300 000`      | 2022-07-22      | Soft | 1.3.0 | Activated                     | [Disallow negative division](https://www.chia.net/2022/03/04/divided-we-fork/)                                                                                 |
+| `3 630 000`      | 2023-05-07      | Soft | 1.7.0 | Activated                     | [Restrict `AGG_SIG_UNSAFE` message](https://github.com/Chia-Network/post-mortem/blob/main/2023-05/2023-05-08-AGG_SIG_UNSAFE-can-mimic-AGG_SIG_ME-condition.md) |
+| `3 886 635`      | 2023-07-01      | Soft | 1.8.0 | Activated                     | [CHIP-14](https://github.com/Chia-Network/chips/blob/main/CHIPs/chip-0014.md) -- `ASSERT_BEFORE_*` conditions                                                  |
+| `4 510 000`      | 2023-11-12      | Soft | 2.0.0 | Activated                     | [CHIP-11](https://github.com/Chia-Network/chips/blob/main/CHIPs/chip-0011.md) -- BLS/SECP CLVM Operators                                                       |
+| `5 496 000`      | 2024-06-13      | Hard | 2.1.0 | Activated                     | [CHIP-12](https://github.com/Chia-Network/chips/blob/main/CHIPs/chip-0012.md) -- Decrease plot filter                                                          |
+| `5 716 000`      | 2024-07         | Soft | 2.3.0 | Released, <br/> Not Activated | [CHIP-25](https://github.com/Chia-Network/chips/pull/98) -- Chialisp Message Conditions                                                                        |
+| `5 940 000`      | 2024-09         | Soft | 2.4.0 | Released, <br/> Not Activated | Disallow infinity G1 points                                                                                                                                    |
diff --git a/docs/getting-started/bridge-guide.md b/docs/getting-started/bridge-guide.md
@@ -1,11 +1,17 @@
 ---
-title: Warp.green Bridge Guide
+title: XCH Bridge Guide
 slug: /bridge-guide
 ---
 
 ## Intro
 
-The [Warp.green bridge](https://www.warp.green/) is a messaging protocol that enables bridging assets between Chia and other blockchains. It is an open-source project located on [GitHub](https://github.com/warpdotgreen). It was developed by Warp.green, which is not affiliated with Chia Network, Inc.
+A _cryptocurrency bridge_ is a powerful tool that enables seamless transfers of digital assets between different blockchain networks, breaking down the barriers of blockchain interoperability. The first Chia blockchain bridge by Warp.Green is now available, paving the way for anyone to access XCH.
+
+As the first of many bridges to come, Warp.Green marks an exciting milestone in our journey toward greater access to chia (XCH). To help you get started, here's a introductory guide on how to use the Warp.Green bridge.
+
+## The Warp.green Bridge
+
+The [Warp.green bridge](https://www.warp.green/) is a messaging protocol that enables bridging assets between Chia and other blockchains. It is an open-source project located on [GitHub](https://github.com/warpdotgreen). It was developed by Warp.green, which is not affiliated with Chia Network Inc.
 
 This guide will show you how to send ETH from the [Base](https://www.base.org/) blockchain (an Ethereum L2) to the Chia blockchain. The transfer will take a total of 15-20 minutes, though the initial setup could take considerably longer if you are not familiar with the technologies involved.
 
@@ -21,7 +27,7 @@ Finally, note that the bridge is set up to allow for bridging _any_ Chia or Ethe
 
 ## Set up MetaMask
 
-[MetaMask](https://metamask.io/) is one of the most popular wallets for storing digital assets such as ETH, and it supports the Base blockchain. We will use MetaMask for this guide, so if you want to follow along, you will need to install it as a web browser extension. But don't worry -- if you want to use a different Base wallet, the instructions will likely be similar.
+[MetaMask](https://metamask.io/) is one of the most popular wallets for storing digital assets such as ETH, and it supports the Base blockchain. We will use MetaMask for this guide, so if you want to follow along, you will need to install it as a web browser extension. But don't worry – if you want to use a different Base wallet, the instructions will likely be similar.
 
 After you have installed MetaMask, click the browser extension button ("1" in the following image), then click the dropdown to change blockchains ("2"):
 

diff --git a/docs/getting-started/introduction.md b/docs/getting-started/introduction.md
@@ -51,7 +51,7 @@ There are many other innovations in Chia, some of which include:
 - **BLS signatures**, which allow aggregating all of a block's signatures together.
 - **Scalability and performance** improvements, which allow running a Chia node on a Raspberry Pi.
 - **Weight proofs and light clients**, which enable fast syncing from a mobile device. For more info, see [light clients](/light-clients).
-- **Chia Asset Tokens** (CATs) are fungible tokens that can be minted from standard XCH. The possibilities are endless! [Read more on CATs](https://chialisp.com/cats) or watch a [CATs video intro](https://www.youtube.com/watch?v=yxagP_VC8BE). Additionally, a community member has created [TAIL Database](https://www.taildatabase.com/ 'TAIL database'), which contains a list of CATs in the wild.
-- **Offer files** enable the peer-to-peer exchange of assets, including standard XCH, as well as CATs. [Read more on Offers](https://chialisp.com/offers) or watch a [brief intro video](https://youtu.be/Z2FoZSNtttM 'Offers intro on YouTube').
+- **Chia Asset Tokens** (CATs) are fungible tokens that can be minted from standard XCH. The possibilities are endless! [Read more on CATs](https://chialisp.com/cats) or watch a [CATs video intro](https://www.youtube.com/watch?v=yxagP_VC8BE). Additionally, a community member has created [TAIL Database](https://www.taildatabase.com/ "TAIL database"), which contains a list of CATs in the wild.
+- **Offer files** enable the peer-to-peer exchange of assets, including standard XCH, as well as CATs. [Read more on Offers](https://chialisp.com/offers) or watch a [brief intro video](https://youtu.be/Z2FoZSNtttM "Offers intro on YouTube").
 - **NFTs** enable and drive real-world applications of digital ownership through true marketplace independence, consistent provenance, and digital permanence. We laid out our [vision for NFTs on Chia](https://www.chia.net/2022/05/11/our-vision-for-chia-nfts.en.html) and launched our [NFT1 standard](https://www.chia.net/2022/06/29/1.4.0-introducing-the-chia-nft1-standard.en.html) in June 2022.
 - This documentation will explain the motivation and implementation of the different components of the Chia system to a technical audience, and provide in-depth explanations of how everything works. If you would like to skip to how to make dApps (decentralized apps) on Chia, please visit the [Chialisp](https://chialisp.com) website.
diff --git a/docs/guides/cat/cat-creation-tutorial.md b/docs/guides/cat/cat-creation-tutorial.md
@@ -1,5 +1,5 @@
 ---
-slug: '/guides/cat-creation-tutorial'
+slug: /guides/cat-creation-tutorial
 title: CAT Creation Tutorial
 ---