@@ -37,7 +37,7 @@ For more info, see our [blog post](https://www.chia.net/2023/03/19/introducing-c
### 第二步：获取一些XCH
-开始联合耕种之前，请确保钱包里面拥有一小笔XCH。 可以向朋友索取mojo（1 mojo等于0.000000000001 XCH），或者到https://faucet.chia.net/获取mojo。 You can use the receive address on the `Tokens` page, and you can also create new receive addresses. Any of the receive addresses can be used; they are all part of the same wallet.
+开始联合耕种之前，请确保钱包里面拥有一小笔XCH。 可以向朋友索取mojo（1 mojo等于0.000000000001 XCH），或者到https://faucet.chia.net/获取mojo。 You can use the receive address on the `Tokens` page, and you can also create new receive addresses. Any of the receive addresses can be used; they are all part of the same wallet. Any of the receive addresses can be used; they are all part of the same wallet.
### 第三步：创建联合耕种农田（Plot NFT）
@@ -59,7 +59,7 @@ chia plotnft create -s local
chia plotnft create -s pool -u https://bar.examplepool.org
```
-请注意，即便选择的是选项1，以后仍然可以加入联合耕种池，并且可以随时切换到其它池。 如果决定加入一个联合耕种池，请输入网址 (必须以 *https://*开头)，然后查看描述。 如果同意, 则开始创建联合耕种农田, 并等待它被确认 (只点击一次)。 这可能需要几分钟的时间才能得到确认，然后出现在“联合耕种”选项卡中。 您只需要 1 个联合耕种农田。
+请注意，即便选择的是选项1，以后仍然可以加入联合耕种池，并且可以随时切换到其它池。 如果决定加入一个联合耕种池，请输入网址 (必须以 _https://_开头)，然后查看描述。 如果同意, 则开始创建联合耕种农田, 并等待它被确认 (只点击一次)。 这可能需要几分钟的时间才能得到确认，然后出现在“联合耕种”选项卡中。 您只需要 1 个联合耕种农田。
#### 使用图形用户界面（GUI）
@@ -71,9 +71,9 @@ Click the `Pooling` icon on the left side of your wallet, and click `JOIN A POOL
@@ -81,7 +81,7 @@ Creating a plot NFT requires an on-chain transaction that will cost one mojo. Yo
@@ -89,7 +89,7 @@ If you entered a valid pool URL, the details will pop up. If everything looks ac
@@ -116,7 +116,7 @@ Detailed instructions can be found in the "How to Plot" page:
### 第五步：管理联合耕种农田。
-You should see your plots in the `Pooling` dialog. The status should say `Pooling``. 在这里，可以看到当前农田的难度，已获得的积分（points）以及联合耕种池认为您拥有的积分（积分余额）。
+You should see your plots in the `Pooling` dialog. The status should say `Pooling``. 在这里，可以看到当前农田的难度，已获得的积分（points）以及联合耕种池认为您拥有的积分（积分余额）。 The status should say `Pooling`. 在这里，可以看到当前农田的难度，已获得的积分（points）以及联合耕种池认为您拥有的积分（积分余额）。
@@ -128,7 +128,7 @@ You should see your plots in the `Pooling` dialog. The status should say `Poolin
积分是一种计算地块找到了多少证明的方式。 每个K32地块每天平均会获得10个积分，与难度无关。 积分与Chia（XCH）不同。 积分只是反映了进行了多少耕种的值。 可以将其视为一种会计工具。 根据您获得的积分数，由联合耕种池定期发放XCH，并将您的积分重置为0，这是矿池的责任。
-To change pools, click on the `CHANGE POOL` button and enter the new pool URL. 请注意，更改联合耕种池有一个等待期，可能会持续几分钟到一小时左右。 请在此过程中不要关闭应用程序。 可以随意更改联合耕种池，而且不需要进行注册或支付任何罚款。 请注意，如果更改了联合耕种池，之前的耕种池不再有义务继续向你支付收益。
+To change pools, click on the `CHANGE POOL` button and enter the new pool URL. 请注意，更改联合耕种池有一个等待期，可能会持续几分钟到一小时左右。 请注意，更改联合耕种池有一个等待期，可能会持续几分钟到一小时左右。 请在此过程中不要关闭应用程序。 可以随意更改联合耕种池，而且不需要进行注册或支付任何罚款。 请注意，如果更改了联合耕种池，之前的耕种池不再有义务继续向你支付收益。
您应该确保在过去24小时内的积分数是准确的。 每天每个k32地块应该获得大约10个积分，所以如果有100个k32的地块，每天应该获得大约1000个积分。 确保您的积分在持续增长。 支付后，积分余额将重置为零。 积分将随机出现，因为查找证明也是随机的。 因此，预计会有很多变化，并且会有好运和坏运的时候。
@@ -144,7 +144,7 @@ To change pools, click on the `CHANGE POOL` button and enter the new pool URL.
### 多台电脑
-You can take your 24-word seed phrase and enter it into a different computer, and when it is synched, the current Plot NFTs and pool information will be automatically downloaded from the blockchain. All information about your pool, plot NFTs, and smart contract addresses is completely backed up on the blockchain, and can be recovered using the seed phrase.
+You can take your 24-word seed phrase and enter it into a different computer, and when it is synched, the current Plot NFTs and pool information will be automatically downloaded from the blockchain. All information about your pool, plot NFTs, and smart contract addresses is completely backed up on the blockchain, and can be recovered using the seed phrase. All information about your pool, plot NFTs, and smart contract addresses is completely backed up on the blockchain, and can be recovered using the seed phrase.
### 多个密钥
@@ -156,7 +156,7 @@ You can take your 24-word seed phrase and enter it into a different computer, an
### 区块链手续费
-Blockchain fees are paid to the creator of the block (farmers), to incentivize them to include your transaction. If the blockchain is busy, you might have to pay small a small fee to get your transaction included. (Creating a plot NFT and changing pools both require an on-chain transaction.)
+Blockchain fees are paid to the creator of the block (farmers), to incentivize them to include your transaction. If the blockchain is busy, you might have to pay small a small fee to get your transaction included. (Creating a plot NFT and changing pools both require an on-chain transaction.) If the blockchain is busy, you might have to pay small a small fee to get your transaction included. (Creating a plot NFT and changing pools both require an on-chain transaction.)
### 无效状态
@@ -238,11 +238,11 @@ chia plotnft show
### 什么是联合耕种农田？
-一个联合耕种农田（plot NFT）是区块链上的智能币或代币，允许用户管理他们在耕种池中的成员资格。 Users can assign the plot NFT to any pool they want, at any point. 在生成地块时，可以选择一个农田，并且该地块将永远与该农田绑定在一起。 农田是“非同质化”的，因为它们不可互换；每个农田代表一个独特的耕种池合约。
+一个联合耕种农田（plot NFT）是区块链上的智能币或代币，允许用户管理他们在耕种池中的成员资格。 Users can assign the plot NFT to any pool they want, at any point. 在生成地块时，可以选择一个农田，并且该地块将永远与该农田绑定在一起。 在生成地块时，可以选择一个农田，并且该地块将永远与该农田绑定在一起。 农田是“非同质化”的，因为它们不可互换；每个农田代表一个独特的耕种池合约。
### 需要支付XCH来创建联合耕种农田或切换耕种池吗？
-Each plot NFT you create will require 1 mojo (1 trillionth of a XCH) + transaction fee. 切换耕种池只需要支付交易手续费。 如果您没有任何XCH，可以从Chia的官方水龙头获得100个mojo：https://faucet.chia.net/
+Each plot NFT you create will require 1 mojo (1 trillionth of a XCH) + transaction fee. 切换耕种池只需要支付交易手续费。 切换耕种池只需要支付交易手续费。 如果您没有任何XCH，可以从Chia的官方水龙头获得100个mojo：https://faucet.chia.net/
### 可以同时在旧土地和新地块上耕种吗？
@@ -260,7 +260,7 @@ Each plot NFT you create will require 1 mojo (1 trillionth of a XCH) + transacti
Chia has three major differences from most other crypto pooling protocol:
-1. Joining pools is permissionless. 在加入之前不需要在耕种池(矿池)服务器上注册账户。
+1. Joining pools is permissionless. 在加入之前不需要在耕种池(矿池)服务器上注册账户。 在加入之前不需要在耕种池(矿池)服务器上注册账户。
2. Farmers receive 1/8 of the block reward plus transaction fees, while the pool receives 7/8 of the reward to redistribute (minus pool fees) amongst all pool participants.
3. The farmer with the winning proof will farm the block, not the pool server.
@@ -321,8 +321,8 @@ Python
### How does one calculate a farmer's space?
-A farmer's space can be estimated by the number of points submitted over each unit of time, or points/second. 每个k32地块平均每天获得10个积分（points）。 所以每个地块的算力为 `10 / 86400 = 0.0001157 points/second`。 Per byte, that is `L = 0.0001157 / 108884400275 = 1.06259482265 * 10^-15`. To calculate total space `S`, take the total number of points found `P`, and the time period in seconds `T` and do `S = P / (L*T)`.
-For example for 340 points in 6 hours, use `P=340, T=21600, L=1.06259482265e-15`, `S = 340/(21600*1.06259482265e-15) = 14,813,492,786,900 bytes`. Dividing by `1024^4` we get `13.4727932044 TiB`.
+A farmer's space can be estimated by the number of points submitted over each unit of time, or points/second. 每个k32地块平均每天获得10个积分（points）。 每个k32地块平均每天获得10个积分（points）。 所以每个地块的算力为 `10 / 86400 = 0.0001157 points/second`。 Per byte, that is `L = 0.0001157 / 108884400275 = 1.06259482265 * 10^-15`. Per byte, that is `L = 0.0001157 / 108884400275 = 1.06259482265 * 10^-15`. To calculate total space `S`, take the total number of points found `P`, and the time period in seconds `T` and do `S = P / (L*T)`.
+For example for 340 points in 6 hours, use `P=340, T=21600, L=1.06259482265e-15`, `S = 340/(21600*1.06259482265e-15) = 14,813,492,786,900 bytes`. Dividing by `1024^4` we get `13.4727932044 TiB`. Dividing by `1024^4` we get `13.4727932044 TiB`.
:::info
diff --git a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/getting-started/bridge-guide.md b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/getting-started/bridge-guide.md
new file mode 100644
index 0000000000..bd82089fee
--- /dev/null
+++ b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/getting-started/bridge-guide.md
@@ -0,0 +1,333 @@
+---
+title: XCH Bridge Guide
+slug: /bridge-guide
+---
+
+## Intro
+
+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.
+
+:::info
+
+It is also possible to bridge assets from Ethereum to Chia, but we chose the Base chain for this guide because it tends to have lower fees.
+
+In addition, it is possible to bridge assets in the other direction: from Chia to Ethereum/Base. This guide doesn't demonstrate this functionality, but the basic technique is quite similar.
+
+Finally, note that the bridge is set up to allow for bridging _any_ Chia or Ethereum asset. However, only a limited number of assets are currently supported. A list of supported assets is maintained at [warp.green/bridge/assets](https://www.warp.green/bridge/assets).
+
+:::
+
+## 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.
+
+After you have installed MetaMask, click the browser extension button ("1" in the following image), then click the dropdown to change blockchains ("2"):
+
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
@@ -130,31 +130,64 @@ You will be taken to your wallet, which will show a zero-XCH balance. There will
### Fund your wallet
-If you think you will ever want to join a pool (recommended for small and medium farms), you will need at least one mojo (one trillionth of an XCH). To help with this, we have set up an online faucet. To use the faucet, you will need a receive address. Click `RECEIVE` to display one:
+If you think you will ever want to join a pool (recommended for small and medium farms), you will need at least one mojo (one trillionth of an XCH). To help with this, we have set up an online faucet at [faucet.chia.net](https://faucet.chia.net/).
-
-
+1. In the top right corner select logout:
+
-
@@ -249,7 +282,7 @@ If your faucet payout has not arrived after more than 10 minutes, someone on [Di
:::
-If you entered a valid pool URL, the details will pop up. For example, this pool has a fee of 1%. If everything looks acceptable, click `CREATE`:
+If you entered a valid pool URL, the details will pop up. For example, this pool has a fee of 1%. If everything looks acceptable, click `CREATE`: For example, this pool has a fee of 1%. If everything looks acceptable, click `CREATE`:
@@ -257,7 +290,7 @@ If you entered a valid pool URL, the details will pop up. For example, this pool
@@ -315,7 +348,7 @@ Next, you will need to choose a plotter. When creating a single plot, `Chia Proo
When building a larger farm, the plotter you choose will depend greatly on your available hardware. It may help to experiment with multiple plotters to get a feel for which ones work best for your setup. For details on each of the available plotters, see our [Plotting Software](/plotting-software) section.
-:::
+:::
@@ -357,7 +390,7 @@ Next, you need to select the temporary and final directories for your plot. The
- **SSD** -- Most farmers choose to use an enterprise NVMe SSD for the temporary storage. These SSDs can handle large amounts of reads and writes in their lifetimes.
- **HDD** -- If you don't mind plotting slowly, you can choose a directory located on an HDD.
-The final directory is where the plot will be copied after it has been created. Most farmers will choose to use an HDD as the final directory. However, for this tutorial an NVMe SSD was used for both the temporary and final directories.
+The final directory is where the plot will be copied after it has been created. The final directory is where the plot will be copied after it has been created. Most farmers will choose to use an HDD as the final directory. However, for this tutorial an NVMe SSD was used for both the temporary and final directories.
:::warning
@@ -373,7 +406,7 @@ You will also need to choose how many plots to create. Certain plotters can be o
diff --git a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/getting-started/installation.md b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/getting-started/installation.md
index e31ecc85d3..38733f2bad 100644
--- a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/getting-started/installation.md
+++ b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/getting-started/installation.md
@@ -8,13 +8,13 @@ import TabItem from '@theme/TabItem';
:::info
-This page will go into the details of the various different ways to install Chia. If you already installed Chia as part of the Farming Guide, then feel free to skip ahead to the [Plotting Basics](/plotting-basics) page.
+This page will go into the details of the various different ways to install Chia. This page will go into the details of the various different ways to install Chia. If you already installed Chia as part of the Farming Guide, then feel free to skip ahead to the [Plotting Basics](/plotting-basics) page.
:::
There are various ways to install Chia, with the best method depending on what you intend to do:
-- If you simply wish to use the Chia wallet, or to run a farm on a single personal computer, then we recommend installing the GUI from our [official downloads page](https://www.chia.net/downloads) for Windows and MacOS, and for Linux users to install the package [as described below](#using-the-cli). The GUI is the simplest way to interact with the Chia client and ideal for most non-developer use cases.
+- If you simply wish to use the Chia wallet, or to run a farm on a single personal computer, then we recommend installing the GUI from our [official downloads page](https://www.chia.net/downloads) for Windows and MacOS, and for Linux users to install the package [as described below](#using-the-cli). The GUI is the simplest way to interact with the Chia client and ideal for most non-developer use cases. The GUI is the simplest way to interact with the Chia client and ideal for most non-developer use cases.
- If you intend to run a dedicated Chia full node on a server and connect to it programmatically using the [RPC interface](/rpc), the best method would be to install and run Chia via the command line on a proper server environment.
@@ -38,7 +38,7 @@ Chia plot files are at least 108GB in size (for K32). To plot successfully requi
### Sleep kills plots
-If the computer or hard drives go to sleep during the plotting process, it will fail, and you will need to start over. Please ensure all sleep, hibernate and power saving modes for your computer and hard drives are disabled before starting the Chia plotting process. In the future, Chia will have a resume plot feature. In the meantime, if you do get a failed plot, delete all `*.tmp` files before starting a new plot.
+If the computer or hard drives go to sleep during the plotting process, it will fail, and you will need to start over. Please ensure all sleep, hibernate and power saving modes for your computer and hard drives are disabled before starting the Chia plotting process. In the future, Chia will have a resume plot feature. In the meantime, if you do get a failed plot, delete all `*.tmp` files before starting a new plot. Please ensure all sleep, hibernate and power saving modes for your computer and hard drives are disabled before starting the Chia plotting process. In the future, Chia will have a resume plot feature. In the meantime, if you do get a failed plot, delete all `*.tmp` files before starting a new plot.
---
@@ -110,7 +110,7 @@ sudo dnf install chia-blockchain
:::note
Make sure you have [Python 3.10](https://www.python.org/downloads/release/python-3109) and [Git](https://git-scm.com/downloads) installed.
-:::
+:::
```bash
# Create virtual environment
@@ -146,7 +146,35 @@ values={[
:::note
Make sure you have [Python 3.10](https://www.python.org/downloads/release/python-3109) and [Git](https://git-scm.com/downloads) installed.
-:::
+:::
+
+```bash
+# Download chia-blockchain
+git clone https://github.com/Chia-Network/chia-blockchain -b latest --recurse-submodules
+
+# Change directory
+cd chia-blockchain
+
+# Install dependencies
+sh install.sh
+
+# Activate virtual environment
+. ./activate
+
+# Initialize
+chia init
+```
+
+The following is how you update to the latest version:
+
+```bash
+# Change directory
+cd chia-blockchain
+
+# Activate the virtual environment
+. :::note
+Make sure you have [Python 3.10](https://www.python.org/downloads/release/python-3109) and [Git](https://git-scm.com/downloads) installed.
+:::
```bash
# Download chia-blockchain
@@ -197,6 +225,10 @@ sh install.sh
# Activate the virtual environment
. ./activate
+# Initialize the new version
+chia init
+``` ./activate
+
# Initialize the new version
chia init
```
@@ -206,7 +238,7 @@ chia init
:::note
Make sure you have [Python 3.10](https://www.python.org/downloads/release/python-3109) and [Git](https://git-scm.com/downloads) installed.
-:::
+:::
```bash
# Download chia-blockchain
@@ -240,6 +272,9 @@ chia stop -d all
# Deactivate the virtual environment
deactivate
+# Remove the current virtual environment
+rm -r venv
+
# Pull the latest version
git fetch
git checkout latest
@@ -426,6 +461,16 @@ See [install from source](/installation#from-source) for detailed instruction.
#### Install from binary package
+```bash
+# Install chia-blockchain as a binary package
+python -m venv venv
+ln -s venv/bin/activate
+. #### Install from source - Amazon Linux 2
+
+See [install from source](/installation#from-source) for detailed instruction.
+
+#### Install from binary package
+
```bash
# Install chia-blockchain as a binary package
python -m venv venv
@@ -552,19 +597,136 @@ pkg install screen tmux
git clone https://github.com/Chia-Network/chia-blockchain.git -b latest
# or with SSH:
git clone git@github.com:Chia-Network/chia-blockchain.git -b latest
-# Note: you can specify the branch by adding "--branch
@@ -96,3 +96,11 @@ When acquiring NFTs or tokens, you may need to make an offer for them. Offers ar
By using offers you are embracing the decentralized nature of the Chia blockchain.
[Read more about offers](https://chialisp.com/offers).
+
+## Run Chia Services in the Background
+
+Starting in version 2.3.0, this is possible. When you attempt to close the application, the confirmation window will now display a checkbox. If you want to continue running your full node, harvester, farmer, etc after closing the GUI, be sure to check the checkbox, as demonstrated in the following image:
+
+
+ 
+
NEXT when you are finished. Click `NEXT` when you are finished.
:::warning
-If someone obtains a copy of these words, they can steal your entire wallet, including all of its funds. Be sure to store your recovery phrase in a safe place.
+If someone obtains a copy of these words, they can steal your entire wallet, including all of its funds. Be sure to store your recovery phrase in a safe place. Be sure to store your recovery phrase in a safe place.
:::
@@ -91,7 +91,7 @@ Chia Asset Tokens (CATs) are fungible assets on Chia's blockchain. In Chia parla
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
+
@@ -34,17 +34,13 @@ Constructing a secure permissionless blockchain using proofs of space is much mo
The Bitcoin blockchain is secure [GKL15] as long as the hashing power $hash_h$ (measured in hashes per second) contributed by honest parties is larger than the hashing power $hash_a$ available to an adversary, i.e.,
-$$
-hash_h > hash_a
-$$
+$$ hash_h > hash_a $$
@@ -21,7 +21,7 @@ As mentioned in the introduction, just replacing proofs of work in Bitcoin with
In longest-chain blockchains the challenge used to determine the miner/farmer who can add a block is derived from the chain itself. In Bitcoin, where the challenge for a block is simply the hash of the previous block, a miner can influence the PoW challenge by trying out different transaction sets or time stamps. While such "grinding" through different challenges gives no advantage in PoW based cryptocurrencies, it's a problem once we use an efficient proof system.
-To prevent such grinding we adopt an approach from Spacemint [PKF+18] and _split the chain_ in two parts which we'll call trunk and foliage. The trunk contains only canonical proofs, and the challenges depend only on values contained in the trunk. This way the only choice a farmer has to influence the challenge is by withholding a winning block. The foliage contains all the remaining "grindeable" content, in particular transactions and time-stamps.
+To prevent such grinding we adopt an approach from Spacemint [PKF+18] and _split the chain_ in two parts which we'll call trunk and foliage. The trunk contains only canonical proofs, and the challenges depend only on values contained in the trunk. This way the only choice a farmer has to influence the challenge is by withholding a winning block. The foliage contains all the remaining "grindeable" content, in particular transactions and time-stamps. The trunk contains only canonical proofs, and the challenges depend only on values contained in the trunk. This way the only choice a farmer has to influence the challenge is by withholding a winning block. The foliage contains all the remaining "grindeable" content, in particular transactions and time-stamps.
## 2.2 Double-Dipping
@@ -29,7 +29,7 @@ Even once grinding is no longer an option, an adversary can in private create an
To limit the impact of double-dipping an early version [CP19] of $\textrm{{\sf Chia}}$ consensus specified that also the honest parties do a very limited form of double-dipping and try to extend the best $3$ blocks they see at every depth, this rule was (by simulations) shown to increase the space required by an adversary from the $26.9\%$ mentioned above, to $38.5\%$.
-The deployed $\textrm{{\sf Chia}}$ protocol uses _correlated randomness_ to limit the impact of double dipping. This elegant idea was introduced in [BDK+19], and basically suggest to only use every $k$th block to compute the challenges.[^1] The authors of [BDK+19] determine the exact fraction of the _resource_ the adversary must control to break security as a function of $k$ (as mentioned, it's $2.718$ for $k=1$, and goes to $1$ as $k$ increases). $\textrm{{\sf Chia}}$ uses a variant where a challenge depends on one out of _at least_ (not exactly) $k=16$ blocks. Their analysis also applies to this setting, and with $k=16$ states that by double dipping the adversary can boost their resource by a factor of $1.47$, which means they must control at least a $\frac{1}{1+1.47}=0.405$ fraction of the resource for an attack.
+The deployed $\textrm{{\sf Chia}}$ protocol uses _correlated randomness_ to limit the impact of double dipping. The deployed $\textrm{{\sf Chia}}$ protocol uses _correlated randomness_ to limit the impact of double dipping. This elegant idea was introduced in [BDK+19], and basically suggest to only use every $k$th block to compute the challenges.[^1] The authors of [BDK+19] determine the exact fraction of the _resource_ the adversary must control to break security as a function of $k$ (as mentioned, it's $2.718$ for $k=1$, and goes to $1$ as $k$ increases). $\textrm{{\sf Chia}}$ uses a variant where a challenge depends on one out of _at least_ (not exactly) $k=16$ blocks. Their analysis also applies to this setting, and with $k=16$ states that by double dipping the adversary can boost their resource by a factor of $1.47$, which means they must control at least a $\frac{1}{1+1.47}=0.405$ fraction of the resource for an attack. $\textrm{{\sf Chia}}$ uses a variant where a challenge depends on one out of _at least_ (not exactly) $k=16$ blocks. Their analysis also applies to this setting, and with $k=16$ states that by double dipping the adversary can boost their resource by a factor of $1.47$, which means they must control at least a $\frac{1}{1+1.47}=0.405$ fraction of the resource for an attack.
The resource considered in [BDK+19] is simply stake, while in $\textrm{{\sf Chia}}$ it's the product of space and VDF speed. Concerning VDFs, while for the honest parties the only thing that matters is the _speed_ of the three VDFs controlled by the fastest honest time lord, for an adversary the speed as well as the number of VDFs available to them matter. In the security analysis we can simply assume the adversary controls an unbounded number of VDFs, as that's when the analysis from [BDK+19] applies. This is how eq.(2) $space_h\cdot vdf_h > space_a \cdot vdf_a \cdot 1.47$ in §1.1 was derived.
@@ -44,6 +44,6 @@ A major issue with longest-chain blockchains based on efficient proof systems i
Existing proposals to achieve security under such _dynamic availability_ include check-pointing, which is problematic as parties that join for the first time or have not followed the chain for a longer period need additional trust assumptions to decide which chain to follow. Unlike for grinding and double-dipping, the attacks that become possible due to bootstrapping are quite different for proofs of space and proofs of stake. In the latter one must consider old keys that hold no stake in the current chain, but still can be used to bootstrap from a past block. To address this it was suggested to have honest parties use key-evolution schemes [BGK+18] so the current keys cannot be used to create blocks in the past. Key-evolution is problematic as it's clearly not rational for honest parties to do; they could sell their keys or lose their stake in case of a deep reorg.
-The essence of the bootstrapping problem is the fact that one cannot ensure that time has passed in-between the creation of subsequent blocks. $\textrm{{\sf Chia}}$ solves this problem by combining proofs of space with _proofs of time_, concretely, verifiable delay functions (VDFs), which enforce that some inherently sequential computation (which requires time linear in the length of the computation) was performed in-between the creation of blocks. $\textrm{{\sf Chia}}$ combines those three countermeasures (splitting the chain, correlated randomness and proofs of time) into a single design which is secure if the resources controlled by the honest parties satisfy the bound from Eq.
+The essence of the bootstrapping problem is the fact that one cannot ensure that time has passed in-between the creation of subsequent blocks. The essence of the bootstrapping problem is the fact that one cannot ensure that time has passed in-between the creation of subsequent blocks. $\textrm{{\sf Chia}}$ solves this problem by combining proofs of space with _proofs of time_, concretely, verifiable delay functions (VDFs), which enforce that some inherently sequential computation (which requires time linear in the length of the computation) was performed in-between the creation of blocks. $\textrm{{\sf Chia}}$ combines those three countermeasures (splitting the chain, correlated randomness and proofs of time) into a single design which is secure if the resources controlled by the honest parties satisfy the bound from Eq. $\textrm{{\sf Chia}}$ combines those three countermeasures (splitting the chain, correlated randomness and proofs of time) into a single design which is secure if the resources controlled by the honest parties satisfy the bound from Eq.
[^1]: Using the same challenge for $k>1$ blocks has already been suggested in [PKF+18], but this is a different requirement (as the challenge can still depend on all blocks) and adds much less security than correlated randomness for small $k$.
diff --git a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/green-paper/rational-attackers.md b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/green-paper/rational-attackers.md
index 551137c968..c26f12b576 100644
--- a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/green-paper/rational-attackers.md
+++ b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/green-paper/rational-attackers.md
@@ -8,9 +8,9 @@ slug: /rational-attackers
In §2 we discussed how costless simulation opens attack vectors for double spending in longest-chain blockchains and how these are addressed in $\textrm{{\sf Chia}}$. To show security we assumed that a sufficient fraction of the resource is controlled by _honest_ parties who follow the protocol rules. In reality it's unrealistic to assume that parties will behave altruistically, instead we need to argue that it's _rational_ for parties to follow the protocol rules. Unfortunately costless simulation also makes this task much more challenging than in a PoW based system.
-In analogy to _selfish mining_ in Bitcoin, we refer to strategies by which a party gets more rewards than they would by following the protocol rules as _selfish farming_. To argue that rational parties will behave honestly it's necessary to bound the efficacy of selfish mining/farming strategies.
+In analogy to _selfish mining_ in Bitcoin, we refer to strategies by which a party gets more rewards than they would by following the protocol rules as _selfish farming_. To argue that rational parties will behave honestly it's necessary to bound the efficacy of selfish mining/farming strategies. To argue that rational parties will behave honestly it's necessary to bound the efficacy of selfish mining/farming strategies.
-In §3.1 below we first discuss selfish mining and why we don't observe it in Bitcoin even though it's possible in principle. As directly analyzing the security of a longest-chain protocol against selfish mining/farming is very challenging we take a modular approach. In §3.2 we first identify two properties – _no slowdown_ and _delayed gratification_ illustrated in Figure 5 – which are satisfied by Bitcoin, and then show in §3.3 that they imply robustness against selfish mining (through the notion of chain quality) of the level as achieved by Bitcoin. In §3.4 and §3.5 we then sketch how those notions are achieved in $\textrm{{\sf Chia}}$.
+In §3.1 below we first discuss selfish mining and why we don't observe it in Bitcoin even though it's possible in principle. As directly analyzing the security of a longest-chain protocol against selfish mining/farming is very challenging we take a modular approach. In §3.1 below we first discuss selfish mining and why we don't observe it in Bitcoin even though it's possible in principle. As directly analyzing the security of a longest-chain protocol against selfish mining/farming is very challenging we take a modular approach. In §3.2 we first identify two properties – _no slowdown_ and _delayed gratification_ illustrated in Figure 5 – which are satisfied by Bitcoin, and then show in §3.3 that they imply robustness against selfish mining (through the notion of chain quality) of the level as achieved by Bitcoin. In §3.4 and §3.5 we then sketch how those notions are achieved in $\textrm{{\sf Chia}}$. In §3.4 and §3.5 we then sketch how those notions are achieved in $\textrm{{\sf Chia}}$.
## 3.1 Selfish Mining in Bitcoin
@@ -26,25 +26,25 @@ While Bitcoin prevents double spending assuming a majority of the hashing power
The Bitcoin blockchain is split in epochs, each with a targeted duration of two weeks, and only at the end of an epoch the difficulty is reset to accommodate for the variation of the hashing power. Assuming the network is reliable, within an epoch, a selfish miner cannot create more blocks than they would get by honest mining. This follows from a crucial property of proofs of work: there's no way to find more proofs of a given difficulty (and thus blocks) in a given time window than simply following the protocol and always working on the known longest chain. The only thing selfish mining does in Bitcoin is to make honest parties waste their hashing power, so after the next difficulty reset (which only happens every 2 weeks) the difficulty is lower than it should be, and only at this point the selfish miner makes some extra profit. Another property of PoW based chains like Bitcoin is that an adversary cannot slow down chain growth. We capture these two desirable properties separately below.
-**Delayed Gratification:** A chain where an adversary cannot increase the number of blocks they find in expectation within an epoch of same difficulty by deviating from the honest strategy is said to have the _delayed gratification_ property. In $\textrm{{\sf Chia}}$, by "not deviating" we mean that the adversary simply runs an honest farmer using its available space, and additionally, should the adversary control VDFs that are faster than the fastest honest time lord, they are also assumed to run a time lord. Intuitively, delayed gratification is a good deterrent to selfish mining by itself as it limits selfish mining to adversaries who follow a "long term" agenda.
+**Delayed Gratification:** A chain where an adversary cannot increase the number of blocks they find in expectation within an epoch of same difficulty by deviating from the honest strategy is said to have the _delayed gratification_ property. In $\textrm{{\sf Chia}}$, by "not deviating" we mean that the adversary simply runs an honest farmer using its available space, and additionally, should the adversary control VDFs that are faster than the fastest honest time lord, they are also assumed to run a time lord. Intuitively, delayed gratification is a good deterrent to selfish mining by itself as it limits selfish mining to adversaries who follow a "long term" agenda. In $\textrm{{\sf Chia}}$, by "not deviating" we mean that the adversary simply runs an honest farmer using its available space, and additionally, should the adversary control VDFs that are faster than the fastest honest time lord, they are also assumed to run a time lord. Intuitively, delayed gratification is a good deterrent to selfish mining by itself as it limits selfish mining to adversaries who follow a "long term" agenda.
**No Slowdown:** A chain where an adversary (no matter what fraction of the resource they control) cannot slow down the expected block arrival time by interacting with the chain is said to have the _no slowdown_ property.
## 3.3 Chain Quality
-A longest-chain blockchain is said to have _chain quality_ $\rho$ if the fraction of blocks mined by honest miners is at least $\rho$ (with high probability and considering a sufficiently large number of blocks). Chain quality was introduced in [GKL15] as a metric to quantify how susceptible a chain is to selfish mining. Ideally, assuming an adversarial miner who controls an $\alpha$ fraction of the resource, the chain quality should be $\rho=1-\alpha$ as this means that the adversary cannot increase its fraction of blocks by deviating.
+A longest-chain blockchain is said to have _chain quality_ $\rho$ if the fraction of blocks mined by honest miners is at least $\rho$ (with high probability and considering a sufficiently large number of blocks). Chain quality was introduced in [GKL15] as a metric to quantify how susceptible a chain is to selfish mining. Ideally, assuming an adversarial miner who controls an $\alpha$ fraction of the resource, the chain quality should be $\rho=1-\alpha$ as this means that the adversary cannot increase its fraction of blocks by deviating. Chain quality was introduced in [GKL15] as a metric to quantify how susceptible a chain is to selfish mining. Ideally, assuming an adversarial miner who controls an $\alpha$ fraction of the resource, the chain quality should be $\rho=1-\alpha$ as this means that the adversary cannot increase its fraction of blocks by deviating.
By the Proposition below delayed gratification and the no slowdown property imply a bound on _chain quality_ which matches the bound proven for Bitcoin (when ignoring network delays).
---
-**Proposition 1** (Delayed Gratification and No Slowdown implies Chain Quality). _Consider a longest-chain protocol which has the delayed gratification and no slowdown property against an adversary who controls an $\alpha$ fraction of the global resource, then the chain quality is $1-\frac{\alpha}{1-\alpha}$ (compared to the ideal $1-\alpha$)._
+**Proposition 1** (Delayed Gratification and No Slowdown implies Chain Quality). **Proposition 1** (Delayed Gratification and No Slowdown implies Chain Quality). _Consider a longest-chain protocol which has the delayed gratification and no slowdown property against an adversary who controls an $\alpha$ fraction of the global resource, then the chain quality is $1-\frac{\alpha}{1-\alpha}$ (compared to the ideal $1-\alpha$)._
-_Proof._ Consider an adversarial miner ${\cal A}$ with an $\alpha$ fraction of the resource and let $\ell$ denote the (expected) number of blocks to be found if everyone would mine honestly. By the no slowdown property, no matter what ${\cal A}$ does the number of blocks found is at least $\ell'\ge (1-\alpha)\cdot\ell$. By delayed gratification, at most $\alpha\cdot\ell$ of those blocks were created by ${\cal A}$, we get a chain quality of
+_Proof._ Consider an adversarial miner ${\cal A}$ with an $\alpha$ fraction of the resource and let $\ell$ denote the (expected) number of blocks to be found if everyone would mine honestly. By the no slowdown property, no matter what ${\cal A}$ does the number of blocks found is at least $\ell'\ge (1-\alpha)\cdot\ell$. By delayed gratification, at most $\alpha\cdot\ell$ of those blocks were created by ${\cal A}$, we get a chain quality of By the no slowdown property, no matter what ${\cal A}$ does the number of blocks found is at least $\ell'\ge (1-\alpha)\cdot\ell$. By delayed gratification, at most $\alpha\cdot\ell$ of those blocks were created by ${\cal A}$, we get a chain quality of
-$$
-\begin{aligned} \textit{chain quality}&=\frac{\text{honest blocks}}{\text{total blocks}}\\ &=\frac{\ell' - \alpha \cdot \ell}{\ell'}\\ &=1-\frac{\alpha\cdot\ell}{\ell'}\\ &\ge 1-\frac{\alpha\cdot\ell}{(1-\alpha)\cdot \ell}\\ &=1-\frac{\alpha}{1-\alpha} \hspace{10em}\square \end{aligned}
-$$
+$$ \begin{aligned} \textit{chain quality}&=\frac{\text{honest blocks}}{\text{total blocks}}\\
+&=\frac{\ell' - \alpha \cdot \ell}{\ell'}\\ &=1-\frac{\alpha\cdot\ell}{\ell'}\\
+&\ge 1-\frac{\alpha\cdot\ell}{(1-\alpha)\cdot \ell}\\ &=1-\frac{\alpha}{1-\alpha} \hspace{10em}\square \end{aligned} $$
---
@@ -113,7 +113,7 @@ For example the difference in the $g$-greedy and the $D$-distance greedy protoco
Unlike the chain specification, which can only be changed by a hard fork once the chain is deployed, the chain selection rule can easily be adapted by the farmers and/or time lords even after the launch. Finding a chain-selection rule for the $\textsf{Chia}$ chain which provably achieves no-slowdown is an interesting open problem.
-Under the additional assumption that an adversary does not control VDFs which are _faster_ than the fastest honest time lord, a very simple chain selection rule achieving no-slowdown exists: always follow the chain with accumulated most VDF steps. Of course this rule would be terrible in practice as security completely breaks if the adversary has an even slightly faster VDF than the fastest honest time lord. For example, such an adversary could create an "empty" chain by refusing to infuse any blocks.
+Under the additional assumption that an adversary does not control VDFs which are _faster_ than the fastest honest time lord, a very simple chain selection rule achieving no-slowdown exists: always follow the chain with accumulated most VDF steps. Of course this rule would be terrible in practice as security completely breaks if the adversary has an even slightly faster VDF than the fastest honest time lord. For example, such an adversary could create an "empty" chain by refusing to infuse any blocks. Of course this rule would be terrible in practice as security completely breaks if the adversary has an even slightly faster VDF than the fastest honest time lord. For example, such an adversary could create an "empty" chain by refusing to infuse any blocks.
A more sensible rule is to simply follow the _heaviest_ fork like in Bitcoin. Unfortunately, unlike in Bitcoin, in $\textsf{Chia}$ the heaviest fork is not necessarily the fork which will be heaviest in the future assuming all honest parties adapt it: a fork $A$ might have one more block infused than some fork $B$, but if $B$ is way ahead in the VDF computation extending $B$ might give a better chain (in expectation) in the future. Thus, when using this rule, by releasing $B$ an adversary might slow down the chain. The currently deployed chain selection rule for farmers and time lords is basically to follow the heaviest fork, but with some heuristics to avoid clear cases where switching to a heavier chain is slowing down growth.
diff --git a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/green-paper/recovering-from-51-percent-attacks.md b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/green-paper/recovering-from-51-percent-attacks.md
index c80a4ab305..8b20242a42 100644
--- a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/green-paper/recovering-from-51-percent-attacks.md
+++ b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/green-paper/recovering-from-51-percent-attacks.md
@@ -10,11 +10,15 @@ In this Section we have a look at two closely related security properties of lon
We discussed in §2 the main security issues of a PoSpace based longest-chain blockchain arise from the fact that PoSpace is an efficient proof system. PoSpace shares those security challenges with PoStake, and all three countermeasures summarized in Figure 3 (namely splitting the chain to prevent grinding, correlated randomness to prevent double-dipping and using VDFs to prevent bootstrapping) can readily be applied in the stake setting, correlated randomness was even originally proposed for stake [BDK+19]. But as we'll discuss below, when it comes to security under dynamic availability or 51% attacks there are fundamental differences between space and stake. In particular, using proofs of space in combination with VDFs one can handle both attacks basically as well as with proofs of work, while proofs of stake cannot, even in combination with VDFs.
+{' '}
+
@@ -548,7 +565,7 @@ CAT 3ba9e16dca39f3fb...:
-Wallet ID: 5
```
-From the CLI, run a standard `send` command. In this example, we will use the following flags:
+From the CLI, run a standard `send` command. In this example, we will use the following flags: In this example, we will use the following flags:
- `-i` -- The `Wallet ID` of the CR-CAT
- `-a` -- The number of CR-CATs to send
@@ -563,11 +580,12 @@ Response:
```bash
Submitting transaction...
+Submitting transaction...
Transaction submitted to nodes: [{'peer_id': 'b3d9de85d29931c10050b56c7afb91c99141943fc81ff2d1a8425e52be0d08ab', 'inclusion_status': 'SUCCESS', 'error_msg': None}]
Run 'chia wallet get_transaction -f 3152280463 -tx 0xab577bdce7fdd1be8b4e0634ad69aa5cff66f6d9dc7d26e0119d1a3a740f91e8' to get status
```
-After a few minutes, run the command from the previous command's output to view the transaction. For example:
+After a few minutes, run the command from the previous command's output to view the transaction. For example: For example:
```bash
chia wallet get_transaction -f 3152280463 -tx 0xab577bdce7fdd1be8b4e0634ad69aa5cff66f6d9dc7d26e0119d1a3a740f91e8
@@ -581,6 +599,8 @@ Status: Confirmed
Amount sent: 100 CAT 3ba9e16dca39f3fb...
To address: txch1yzjq802ym3lv9aupl6nyvv6s24fdm9wpnte2rvhk04arr3jyt4js2287gz
Created at: 2023-09-22 09:21:25
+To address: txch1yzjq802ym3lv9aupl6nyvv6s24fdm9wpnte2rvhk04arr3jyt4js2287gz
+Created at: 2023-09-22 09:21:25
```
**After switching to the VC Holder's wallet**, you should see the CR-CATs that are pending approval (in this case `100.0 (100000 mojo)`):
@@ -618,7 +638,7 @@ CAT 3ba9e16dca39f3fb...:
-Wallet ID: 3
```
-The VC Holder still needs to approve the new CR-CATs in order to add them to the wallet balance. This is accomplished with the `approve_r_cats` command. In this example, we will use the following flags:
+The VC Holder still needs to approve the new CR-CATs in order to add them to the wallet balance. This is accomplished with the `approve_r_cats` command. In this example, we will use the following flags: This is accomplished with the `approve_r_cats` command. In this example, we will use the following flags:
- `-i` -- The `Wallet ID` of the CR-CAT
- `-a` -- The amount to approve
@@ -680,7 +700,7 @@ In this example, as the **Authorized Provider**, click `CREATE AN OFFER` from th
@@ -690,7 +710,7 @@ Next, fill out the Offer Builder. For this example, we will offer to trade 99 CR
After creating the Offer, Authorized Provider can save it as a local file or post it to a marketplace.
-For this example, we will change to the **VC Holder** wallet and load the Offer file. This wallet contains a VC with the required proof to hold this CR-CAT (`test_proof1`). Enter an optional blockchain fee and click `ACCEPT OFFER`:
+For this example, we will change to the **VC Holder** wallet and load the Offer file. This wallet contains a VC with the required proof to hold this CR-CAT (`test_proof1`). Enter an optional blockchain fee and click `ACCEPT OFFER`: In this example, the recipient is the VC Holder's wallet. This wallet holds the credential with the required proof (`test_proof1`) for holding this CR-CAT. Because the proof exists, a green `APPROVE` button will appear. Enter an optional blockchain fee and click `ACCEPT OFFER`:
@@ -698,7 +718,7 @@ For this example, we will change to the **VC Holder** wallet and load the Offer
@@ -706,7 +726,7 @@ While the on-chain transaction to accept the Offer is pending, the 99 CR-CATs wi
@@ -718,7 +738,7 @@ At this point, the VC Holder wallet has full possession of the CR-CATs.
### CLI Offers
-Offers for CR-CATs can also be created and accepted via the CLI. For this example, the **Authorized Provider** will create an Offer using the following flags:
+Offers for CR-CATs can also be created and accepted via the CLI. Offers for CR-CATs can also be created and accepted via the CLI. For this example, the **Authorized Provider** will create an Offer using the following flags:
- `-o` -- The Offer amount, using the syntax `
diff --git a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/clawback/clawback-primitive-guide.md b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/clawback/clawback-primitive-guide.md
index ef9a719981..d17d335e02 100644
--- a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/clawback/clawback-primitive-guide.md
+++ b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/clawback/clawback-primitive-guide.md
@@ -8,7 +8,7 @@ import TabItem from '@theme/TabItem';
## Intro
-This document will show you how to use Chia's standalone clawback primitive. 欢迎钱包开发者将其整合到开发的GUI钱包中。
+This document will show you how to use Chia's standalone clawback primitive. 欢迎钱包开发者将其整合到开发的GUI钱包中。 欢迎钱包开发者将其整合到开发的GUI钱包中。
有关其他技术资源，请参阅以下内容：
@@ -18,17 +18,17 @@ This document will show you how to use Chia's standalone clawback primitive. 欢
:::warning 一些重要提醒
-- The standalone clawback primitive doesn't implement wallet functionality to handle incoming clawbacks and resync deleted coin stores. Rather, it's for developers to understand the process of how clawbacks work.
-- Chia Network, Inc has added a user-friendly implementation of the clawback primitive to version 1.8.2 of the reference wallet.
+- The standalone clawback primitive doesn't implement wallet functionality to handle incoming clawbacks and resync deleted coin stores. Rather, it's for developers to understand the process of how clawbacks work. Rather, it's for developers to understand the process of how clawbacks work.
+- Chia Network Inc has added a user-friendly implementation of the clawback primitive to version 1.8.2 of the reference wallet.
- A **synced full node** AND a synced wallet are required to use the clawback primitive.
-- You are recommended to test the clawback primitive on either the testnet or a simulator before moving to mainnet. For your reference, this guide will use testnet10.
+- You are recommended to test the clawback primitive on either the testnet or a simulator before moving to mainnet. For your reference, this guide will use a testnet.
- The clawback primitive currently only supports XCH/TXCH. It does not support CATs or NFTs. The `-w` flag will be ignored if it points to a non-XCH (or TXCH) wallet.
:::
---
-### 关于可撤回交易（clawback）
+## 关于可撤回交易（clawback）
可撤回交易原语的目的是防止将Chia资产发送到一个错误的地址。 可撤回交易的原理很简单：它是一种中间硬币，直到时间锁定过期之前，无法发送到目标地址。 与此同时，发送者可以"撤回"该硬币，将其以标准XCH的形式退回到他们的钱包中。
@@ -43,7 +43,7 @@ This document will show you how to use Chia's standalone clawback primitive. 欢
- It contains Alice's address as its clawback destination (Alice -- and no one else -- can modify this later)
- It contains Bob's address as its final destination (Bob -- and no one else -- can modify this later)
- The clawback coin therefore contains the following logic for how it may be spent:
- - Before 1 hour has elapsed since the coin's creation, Alice can use [p2_1_of_n](https://github.com/Chia-Network/chia-blockchain/blob/main/chia/wallet/puzzles/p2_m_of_n_delegate_direct.clvm) to spend the coin using the same public/private key pair that created the coin. When the coin is spent in this way, a new coin is created using [p2_puzzle_hash](https://github.com/Chia-Network/chia-blockchain/blob/main/chia/wallet/puzzles/p2_puzzle_hash.clvm). Typically, this coin will be created in Alice's wallet, but it could be created in another wallet instead. The new coin uses the standard Chia puzzle. This is the `clawback` case.
+ - Before 1 hour has elapsed since the coin's creation, Alice can use [p2_1_of_n](https://github.com/Chia-Network/chia-blockchain/blob/main/chia/wallet/puzzles/p2_m_of_n_delegate_direct.clvm) to spend the coin using the same public/private key pair that created the coin. When the coin is spent in this way, a new coin is created using [p2_puzzle_hash](https://github.com/Chia-Network/chia-blockchain/blob/main/chia/wallet/puzzles/p2_puzzle_hash.clvm). Typically, this coin will be created in Alice's wallet, but it could be created in another wallet instead. The new coin uses the standard Chia puzzle. This is the `clawback` case. When the coin is spent in this way, a new coin is created using [p2_puzzle_hash](https://github.com/Chia-Network/chia-blockchain/blob/main/chia/wallet/puzzles/p2_puzzle_hash.clvm). Typically, this coin will be created in Alice's wallet, but it could be created in another wallet instead. The new coin uses the standard Chia puzzle. This is the `clawback` case.
- Before 1 hour has elapsed since the coin's creation, nobody other than Alice may spend it
- After 1 hour, the timelock elapses. At this point Bob can spend the clawback coin. When this spend occurs, by default a new standard XCH coin is created in Bob's wallet. Bob can also pass in a different address than the one he originally specified if he so chooses.
- Note that the coin's clawback logic is in place for the life of the coin. This means that until the coin is spent, Alice is able to claw it back. This is true regardless of the coin's age. Because of this, after the timelock expires, Bob must spend the clawback coin in order to receive the XCH in his wallet. After this spend has completed, the clawback coin no longer exists, and the spend is final.
@@ -66,7 +66,7 @@ The values used in the commands from this guide are just examples. You will need
---
-### Install the clawback primitive
+## Install the clawback primitive
The clawback primitive is included in the `Chia-Network` organization's `chia-clawback-primitive` GitHub repository.
@@ -105,6 +105,7 @@ python -m venv venv
```bash
python3 -m venv venv
. ./venv/bin/activate
+``` ./venv/bin/activate
```
@@ -113,6 +114,7 @@ python3 -m venv venv
```bash
python3 -m venv venv
. ./venv/bin/activate
+``` ./venv/bin/activate
```
@@ -142,7 +144,7 @@ At this point, you are ready to use the clawback primitive.
---
-### Create a clawback coin
+## Create a clawback coin
For this example, we will use two wallets: a Sender and a Recipient. The Sender has a balance of 10 TXCH and the Recipient has 0 TXCH.
@@ -209,7 +211,7 @@ Timelock: 600 seconds
Time left: 518 seconds
```
-### Claw back a coin
+## Claw back a coin
This guide will continue from the previous section, where we created a new clawback coin, which has not yet been spent. As a reminder, these are the clawback coin's details:
@@ -280,7 +282,7 @@ Chia Wallet:
At this point, the clawback coin no longer exists. The Sender is of course free to create new clawback coins as they see fit.
-### Claim a clawback coin
+## Claim a clawback coin
In this section, we'll show how to claim a clawback coin. First, the Sender creates a new clawback coin with a 60-second timelock:
@@ -392,7 +394,7 @@ However, there is a small window of time where the timer has expired, but a bloc
You are trying to claim the coin too early
```
-In this case, the Recipient needs to wait for one more transaction block to be farmed before proceeding with the `claim` call. As a reminder, a new transaction block is farmed every 52 seconds, on average.
+In this case, the Recipient needs to wait for one more transaction block to be farmed before proceeding with the `claim` call. As a reminder, a new transaction block is farmed every 52 seconds, on average. As a reminder, a new transaction block is farmed every 52 seconds, on average.
:::
@@ -442,11 +444,11 @@ The spend is now complete and can no longer be clawed back. The funds are stored
---
-### Other cases
+## Other cases
So far, we have shown the standard clawback and completion spends. There are also a few edge cases and errors worth discussing.
-#### Sender performs a clawback after the timelock
+### Sender performs a clawback after the timelock
After the timelock expires, the Recipient may claim the clawback coin. Until this is done, the Sender can still claw back the coin.
@@ -532,7 +534,7 @@ Chia Wallet:
Because the Sender can always claw back a clawback coin while it exists, the Recipient cannot assume that they will receive the clawback coin, even after the timelock has expired. However, after the Recipient has claimed the clawback coin and it has appeared in the Recipient's wallet as regular XCH/TXCH, the coin can no longer be clawed back.
-#### Recipient attempts to claim clawback coin before timelock has expired
+### Recipient attempts to claim clawback coin before timelock has expired
Before the timelock expires, a clawback coin may not be spent to its Recipient's address. For example, let's say the following clawback coin exists. Note that its `Time left:` is still greater than 0 seconds:
@@ -564,7 +566,7 @@ Result:
You are trying to claim the coin too early
```
-#### Someone other than the Sender attempts to claw back a coin
+### Someone other than the Sender attempts to claw back a coin
For this example, the Sender creates a new clawback coin:
@@ -653,7 +655,7 @@ Traceback (most recent call last):
ValueError: Couldn't find a matching key for puzzle hash: ee3144040e80747af2f6ec56ed7567d22ca83ea3470e09bb9d95347a80cd2d29.
```
-#### Someone other than the Recipient attempts to claim a clawback spend
+### Someone other than the Recipient attempts to claim a clawback spend
For this example, someone other than the Recipient is made aware of the Coin ID of a pending clawback coin:
@@ -715,7 +717,7 @@ Traceback (most recent call last):
ValueError: Couldn't find a matching key for puzzle hash: c08dfae2aab3b3b3cbffdd4c1f1e4bf2df278785e5ca67524d6e518e79f134c3.
```
-#### Sender claws back coin to a new wallet
+### Sender claws back coin to a new wallet
The Sender has the option of performing a clawback where the coin is sent to any wallet. Let's say the Sender creates a clawback coin:
@@ -763,7 +765,7 @@ Chia Wallet:
-Wallet ID: 1
```
-#### Recipient claims a clawback coin in a new wallet address
+### Recipient claims a clawback coin in a new wallet address
The Recipient also has the option of spending a clawback coin to a new address.
@@ -833,7 +835,7 @@ Chia Wallet:
-Wallet ID: 1
```
-#### Sender or Recipient attempts to show a clawback coin before it has been created
+### Sender or Recipient attempts to show a clawback coin before it has been created
Two important rules to keep in mind:
diff --git a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/clawback/clawback-user-guide.md b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/clawback/clawback-user-guide.md
index 62fcaa8bfe..cda71653b8 100644
--- a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/clawback/clawback-user-guide.md
+++ b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/clawback/clawback-user-guide.md
@@ -8,7 +8,7 @@ import TabItem from '@theme/TabItem';
## Intro
-This document is a guide for using the clawback functionality introduced in version 1.8.2 of Chia's reference wallet. _Clawback_ is a new feature that offers protection against sending XCH to the wrong address.
+This document is a guide for using the clawback functionality introduced in version 1.8.2 of Chia's reference wallet. This document is a guide for using the clawback functionality introduced in version 1.8.2 of Chia's reference wallet. _Clawback_ is a new feature that offers protection against sending XCH to the wrong address.
If you are a developer or a CLI user, see the following resources for more info:
@@ -18,8 +18,8 @@ If you are a developer or a CLI user, see the following resources for more info:
In order to use Chia clawbacks, you must have:
-- Version 1.8.2 or later of Chia's reference light wallet or full node. See our [downloads page](https://www.chia.net/downloads/) to obtain a copy.
-- A sufficient amount of XCH or TXCH to send a transaction and pay fees. If you do not have a sufficient amount, you can obtain some from our [mainnet](https://faucet.chia.net/) and [testnet](https://testnet10-faucet.chia.net/) faucets.
+- Version 1.8.2 or later of Chia's reference light wallet or full node. See our [downloads page](https://www.chia.net/downloads/) to obtain a copy. See our [downloads page](https://www.chia.net/downloads/) to obtain a copy.
+- A sufficient amount of XCH or TXCH to send a transaction and pay fees. A sufficient amount of XCH or TXCH to send a transaction and pay fees. If you do not have a sufficient amount, you can obtain some from our [mainnet](https://faucet.chia.net/) and [testnet](https://testnet10-faucet.chia.net/) faucets.
---
@@ -35,11 +35,11 @@ The following demonstrates an example workflow of this process:
- The sender and receiver both see the pending 1-XCH transaction in their wallets
- The sender can choose to return the 1 XCH to his/her wallet (this is a _clawback_)
- The receiver cannot yet claim the money
- - The sender and receiver could communicate off-chain. For example, the sender could call the receiver and ask if the pending transaction appears in their wallet.
+ - The sender and receiver could communicate off-chain. The sender and receiver could communicate off-chain. For example, the sender could call the receiver and ask if the pending transaction appears in their wallet.
- If yes, then both parties can be confident that the money was sent to the correct address
- If no, then the money was sent to an incorrect address, so the sender will claw it back
4. After 10 minutes, if the sender has not clawed the 1 XCH back, the receiver can claim it
-5. After the receiver has claimed the money, it appears in both wallets as a normal transaction. At this point, the transaction is complete; clawback is no longer possible
+5. After the receiver has claimed the money, it appears in both wallets as a normal transaction. At this point, the transaction is complete; clawback is no longer possible At this point, the transaction is final. It can no longer be clawed back.
The "intermediate location" is actually a coin with two rules:
@@ -56,7 +56,7 @@ This guide will show you how to perform the above workflow.
### Review Settings
-Before initiating a clawback transaction, it's a good idea to review your wallet's settings. Click `Settings` (the gear icon in the lower-left corner of your wallet) and click the `CUSTODY` menu.
+Before initiating a clawback transaction, it's a good idea to review your wallet's settings. Click `Settings` (the gear icon in the lower-left corner of your wallet) and click the `CUSTODY` menu. Click `Settings` (the gear icon in the lower-left corner of your wallet) and click the `CUSTODY` menu.
From this menu:
@@ -82,8 +82,8 @@ From the `SEND` menu as shown below, enter the recipient's address, the amount t
:::note
-- Prior to initiating the transaction, the sender's wallet from this example contained 5 TXCH. The amount to be sent was 1 TXCH.
-- This example was executed on Chia's testnet, which has higher fee requirements than mainnet. For this reason, a large fee of 100 million mojos was added.
+- Prior to initiating the transaction, the sender's wallet from this example contained 5 TXCH. The amount to be sent was 1 TXCH. The amount to be sent was 1 TXCH.
+- This example was executed on Chia's testnet, which has higher fee requirements than mainnet. For this reason, a large fee of 100 million mojos was added. For this reason, a large fee of 100 million mojos was added.
:::
@@ -100,7 +100,7 @@ After you have entered these parameters, click the dropdown for `Add option to c
---
-Add the time (days, minutes, hours) during which the transaction will be able to be clawed back. In this case, we'll use 10 minutes.
+Add the time (days, minutes, hours) during which the transaction will be able to be clawed back. In this case, we'll use 10 minutes. In this case, we'll use 10 minutes.
Optionally add a memo to describe this transaction, and click `SEND`.
@@ -115,7 +115,7 @@ Optionally add a memo to describe this transaction, and click `SEND`.
---
-The transaction has been added to the mempool. This means that it is still in the `Pending` state for inclusion on the blockchain. At this point, there is no indication in the GUI that this is a clawback transaction.
+The transaction has been added to the mempool. This means that it is still in the `Pending` state for inclusion on the blockchain. The transaction has been added to the mempool. This means that it is still in the `Pending` state for inclusion on the blockchain. At this point, there is no indication in the GUI that this is a clawback transaction.
@@ -339,8 +339,8 @@ Keeping all of this in mind, **it is typically safe to insert data sets of up to
Chia DataLayer doesn't have a GUI. The commands in this tutorial will use the command line interface (CLI). As a reminder, here is the complete reference for the CLI, as well as all available Remote Procedure Calls (RPCs):
-- [DataLayer RPC API](/datalayer-rpc/ 'DataLayer RPC API')
-- [DataLayer CLI Reference](/datalayer-cli/ 'DataLayer CLI Reference')
+- [DataLayer RPC API](/datalayer-rpc/ "DataLayer RPC API")
+- [DataLayer CLI Reference](/datalayer-cli/ "DataLayer CLI Reference")
### Create a data store
diff --git a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/nft/nft-bulk-mint.md b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/nft/nft-bulk-mint.md
index eb165805fc..1f00e9b0a8 100644
--- a/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/nft/nft-bulk-mint.md
+++ b/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/nft/nft-bulk-mint.md
@@ -23,7 +23,7 @@ The number of NFTs per spend bundle is hard-coded at 25 in this tool. It may be
RuntimeError on Windows
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
@@ -146,7 +146,7 @@ If you used this guide to set up the sample dApp, this was the link you obtained
@@ -242,7 +242,7 @@ Returning to the sample dApp, a new dialog with the response will appear. In thi