From d8f8f9a8a646b313399d8a4382e8d2f36bee461b Mon Sep 17 00:00:00 2001 From: Celia18305 <32253925+Celia18305@users.noreply.github.com> Date: Thu, 28 Mar 2019 10:25:29 +0800 Subject: [PATCH] fix issue #791 (#793) * fix issue #791 * follow up * follow up * add example --- en-us/network/private-chain/private-chain.md | 4 ++++ en-us/node/cli/cli.md | 12 +++++++++++- en-us/node/gui/other.md | 2 ++ zh-cn/network/private-chain/private-chain.md | 4 ++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/en-us/network/private-chain/private-chain.md b/en-us/network/private-chain/private-chain.md index 43390a6964..b42f1e869f 100644 --- a/en-us/network/private-chain/private-chain.md +++ b/en-us/network/private-chain/private-chain.md @@ -153,6 +153,10 @@ Here we want to send the NEO from the contract address to the normal address. Open the wallet you want to transfer GAS to and click `Advanced`->`Claim GAS`-> `Claim`. +> [!Note] +> +> GAS has two status, available and unavailable. Once NEO is spent (i.e. transferred out) from the account, the relevant GAS turns to available. Therefore you can transfer GAS to your own account to make them available. + ![image](../../../assets/privatechain_21.png) The next operation is similar to the transfer of the NEO. Copy the code that has insufficient signatures, open the second wallet and the third wallet successively to complete transaction signing and broadcasting. diff --git a/en-us/node/cli/cli.md b/en-us/node/cli/cli.md index d56634928c..9c3928d51e 100644 --- a/en-us/node/cli/cli.md +++ b/en-us/node/cli/cli.md @@ -93,7 +93,11 @@ unavailable: 133.024 Where `unavailable` represents the GAS that cannot be claimed and `available` represents the claimable GAS. -- This command does not show the GAS that has been claimed. Use `list asset` instead. +> [!Note] +> +> - This command does not show the GAS that has been claimed. Use `list asset` instead. +> - GAS has two status, available and unavailable. Once NEO is spent (i.e. transferred out) from the account, the relevant GAS turns to available. Therefore you can transfer GAS to your own account to make them available. +> 👉 `claim gas[all]` @@ -141,6 +145,12 @@ If you are not sure of the asset ID, please enter the list asset command to view The command is used to create a multi-party signed address. m is the minimal number of signatures. For example, creating a multi-party signed address with two public keys, m can be 1 or 2, and the parameter followed are the two parties public keys. +For example: + +``` +import multisigaddress 1 037ebe29fff57d8c177870e9d9eecb046b27fc290ccbac88a0e3da8bac5daa630d 03b34a4be80db4a38f62bb41d63f9b1cb664e5e0416c1ac39db605a8e30ef270cc +``` + 👉 `sign ` This command is used to sign when withdrawing assets from a multi-signed address which requires multiple signatures. The parameter is the json string that records the transaction information. The translation can be broadcasted only after signing is completed. diff --git a/en-us/node/gui/other.md b/en-us/node/gui/other.md index 5173547d51..36a5bb68f7 100644 --- a/en-us/node/gui/other.md +++ b/en-us/node/gui/other.md @@ -4,6 +4,8 @@ GAS is generated with each new block and will be allocated to the address of NEO holders. (The number within the brackets of the balance of assets is the number of GAS that can be claimed) At any time, the NEO holder can initiate a claim to redeem these GAS to the corresponding address of the NEO. At the moment, only the PC version of the client has the functionality to extract GAS. +NEO has two status: unspent and spent. Unclaimed GAS has two status accordingly: unavailable and available. When NEO are transferred to an account, their status are unspent, the GAS generated during this period are unavailable for claiming. When NEO are transferred out their status become spent and related GAS become available. How to make the GAS in your account available? Transfer the NEO to any address in your wallet. + The specific steps are: 1. Transfer all the NEO within the wallet using a transfer operation. (It is possible to send the NEO straight to the current address) Once the claim for the GAS is settled, the GAS can be withdrawn. (Refer to the white paper for technical explanation of this process). diff --git a/zh-cn/network/private-chain/private-chain.md b/zh-cn/network/private-chain/private-chain.md index 36b6a7f650..f8b2ba19b3 100644 --- a/zh-cn/network/private-chain/private-chain.md +++ b/zh-cn/network/private-chain/private-chain.md @@ -157,6 +157,10 @@ NEO 私有链的部署至少需要 4 台服务器才能取得共识，每台服 打开要转入 GAS 的钱包账户，点击 `高级` -> `提取 NeoGas` -> `全部提取`。 +> [!Note] +> +> GAS 有两种状态，可提取和不可提取。当账户中的 NEO 花费后（即转出），其产生的 GAS 会转变成可提取状态。你可以通过给自己转账将 GAS 变为可提取状态，即使钱包里只有一个地址也可以。 + ![](../assets/privatechain_21.jpg) 接下来的操作与转账 NEO 类似，将没有足够签名的代码复制下来，依次打开第二个和第三个钱包，完成交易签名和广播。提取成功后如下图所示。