Skip to content

Commit

Permalink
Merge from main
Browse files Browse the repository at this point in the history
  • Loading branch information
@danieljperry
danieljperry committed Oct 4, 2023
2 parents 622c853 + 2f89bb8 commit 1fe8219
Show file tree
Hide file tree
Showing 148 changed files with 6,947 additions and 1,686 deletions.
9 changes: 9 additions & 0 deletions docs/cli-reference/datalayer.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,15 @@ Options:
| -dp | --data-rpc-port | INTEGER | False | Set the port where the DataLayer is hosting the RPC interface. See rpc_port under wallet in config.yaml |
| -h | --help | None | False | Show a help message and exit |

:::info

The `unsubscribe` command may or may not delete any data, depending on which version of Chia you are running:
* Prior to version 2.1, the command did not delete the .dat files, nor did it delete from the database.
* As of version 2.1, the command deletes the .dat files, but does not delete from the database.
* In a future release, the command will also delete from the database.

:::

Example:

<details>
Expand Down
222 changes: 222 additions & 0 deletions docs/cli-reference/plotters.md
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/cli-reference/vcs.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ Options:
<details>
<summary>Example</summary>

A DID is required in order to mint a new VC. If the proof provider does not already have a DID, use the `did create` command to create one:
A DID is required in order to mint a new VC. If the proof provider does not already have a DID, use the `did create` command to create one. For example:

```bash
chia wallet did create -f 2108245669 -n Provider_DID -m 0.0001
Expand All @@ -173,7 +173,7 @@ Successfully created a DID wallet with name Provider_DID and id 2 on key 2108245
Successfully created a DID did:chia:1n2s77g7rer2v62xzrvd0at6tgx8m4g8t6encghs375r64lc6e5mssdkap3 in the newly created DID wallet
```

Next, mint a new VC. Note that the DID specified with `-d` must be owned by the fingerprint specified with `-f` (or the one selected if `-f` is not used):
Next, mint a new VC. Note that the DID specified with `-d` must be owned by the fingerprint specified with `-f` (or the one selected if `-f` is not used). For example:

```bash
chia wallet vcs mint -f 2108245669 -d did:chia:1n2s77g7rer2v62xzrvd0at6tgx8m4g8t6encghs375r64lc6e5mssdkap3 -m 0.0001
Expand Down Expand Up @@ -208,7 +208,7 @@ Coin ID: 72e522fecc64b539f8979b89e4cf2ffbcf8ba985faf4b701bcc882c6aec9e040
Inner Address: txch1at35qwx6djmadnh9v77a72z8vcaxsle36ke3dj26gcpt2fnh654qsqecnj
```

It is recommended that you save the result of this command. The `Coin ID:` will be required in case the proofs need to be revoked later.
It is recommended that you save the `Launcher ID` because it will be needed if the VC needs to be revoked later.

No proofs have been added yet. This is accomplished with the [update_proofs](#update_proofs) command.

Expand All @@ -228,7 +228,8 @@ Options:
| :------------ | :--------------------- | :------ | :------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| -wp | --wallet-rpc-port | INTEGER | False | Set the port where the Wallet is hosting the RPC interface. See the rpc_port under wallet in config.yaml |
| -f | --fingerprint | INTEGER | False | Set the fingerprint to specify which key to use |
| -p | --parent-coin-id | TEXT | True | The ID of the parent coin of the VC |
| -p | --parent-coin-id | TEXT | True* | The ID of the parent coin of the VC (*optional if VC ID is used) |
| -l | --vc-id TEXT | TEXT | True* | The launcher ID of the VC to revoke (must be tracked by wallet) (*optional if Parent ID is used) |
| -m | --fee | TEXT | False | Blockchain fee for revocation transaction, in XCH |
| | --reuse-puzhash | None | False | If this flag is set, then send the VC back to the same puzzle hash it came from (ignored if `--generate-new-puzhash` is also specified) [Default: generate new puzzle hash] |
| | --generate-new-puzhash | None | False | If this flag is set, then send the VC to a new puzzle hash. This is the default behavior, and setting this flag will override the `--reuse-puzhash` flag if it is also set |
Expand All @@ -240,10 +241,9 @@ Options:
Revoke the proofs from a VC. A few notes:

- The only wallet authorized to call this command is the wallet that contains the DID that created the VC
- The `-p` parameter is the `Coin ID:` of the VC, which was obtainable when the VC was first minted

```bash
chia wallet vcs revoke -p 0x420f69cc8b541be7a0bf1d94ec028a8b2a875ee2cd6721f5316cf1b02519d13a -m 0.0001
chia wallet vcs revoke -l 0x420f69cc8b541be7a0bf1d94ec028a8b2a875ee2cd6721f5316cf1b02519d13a -m 0.0001
```

Response:
Expand Down
146 changes: 129 additions & 17 deletions docs/cli-reference/wallet.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1221,34 +1221,146 @@ Options:
| -h | --help | None | False | Show a help message and exit |

<details>
<summary>Example</summary>
<summary>Example 1: Show a single XCH transaction</summary>

Skip the first five transactions don't paginate:
Start by showing all wallets associated with the current fingerprint:

```bash
chia wallet get_transactions --fingerprint 2121994410 --offset 5 --no-paginate
chia wallet show
```

Response:
Response (truncated):

```bash
Wallet height: 3045395
Sync status: Synced
Balances, fingerprint: 2104826454

Chia Wallet:
-Total Balance: 35.683924454174 txch (35683924454174 mojo)
-Pending Total Balance: 35.683924454174 txch (35683924454174 mojo)
-Spendable: 35.084802204177 txch (35084802204177 mojo)
-Type: STANDARD_WALLET
-Wallet ID: 1

NFT Wallet:
-Total Balance: 0.0
-Pending Total Balance: 0.0
-Spendable: 0.0
-Type: NFT
-Wallet ID: 2

```
Transaction 72ad2d9898be2c6c6f10790239f50ca1dcdb00aff73592d22a163ed965bf5b1b
Status: Confirmed
Amount received: 0.196499999999 XCH
To address: xch1fev2qaclwpcue9kx4p39dzfxpzaavvcz5v3lhx77cxha7f0tjjlsngh5k0
Created at: 2022-11-14 17:58:13

Transaction b04d739fd6a2735662e5741c94a526202e7ce695f1b720b912e575928ede0fc7
Next, obtain a single transaction from wallet `1`, a `STANDARD_WALLET`, by including the `-o` (offset) and `-l` (limit) flags:

```bash
chia wallet get_transactions -i 1 -o 2 -l 1
```

Response:

```bash
Transaction 1a4a2c93e32fd2a5a19b85e6a2114c6a2b972b4ed7d203dc23a1574d6a1383a1
Status: Confirmed
Amount sent: 0.1035 XCH
To address: xch1ht3yzch0h4tglzdu0g6q0x9xzxxlqxy7h83ls6tme63847vl3ausarq3ma
Created at: 2022-11-14 17:58:13
Amount sent: 5 TXCH
To address: txch1z2gtnmph3jp9cz28phchztylrkqhf8c4ckgtjg3ew7ducztxl8gsfqttlc
Created at: 2023-08-01 19:55:51
```

</details>

<details>
<summary>Example 2: Show all transactions from a CAT</summary>

Start by showing all wallets associated with the current fingerprint:

```bash
chia wallet show
```

Response:

```bash
Wallet height: 3045482
Sync status: Synced
Balances, fingerprint: 2104826454

Chia Wallet:
-Total Balance: 35.683924454174 txch (35683924454174 mojo)
-Pending Total Balance: 35.683924454174 txch (35683924454174 mojo)
-Spendable: 35.084802204177 txch (35084802204177 mojo)
-Type: STANDARD_WALLET
-Wallet ID: 1

NFT Wallet:
-Total Balance: 0.0
-Pending Total Balance: 0.0
-Spendable: 0.0
-Type: NFT
-Wallet ID: 2

DID did:chia:1kzxqrt8f2h8psr8zuzen9dxgmxx5v35s0rj3jy637qjannu3zlesds0el5:
-Total Balance: 1.0
-Pending Total Balance: 1.0
-Spendable: 1.0
-Type: DECENTRALIZED_ID
-DID ID: did:chia:1kzxqrt8f2h8psr8zuzen9dxgmxx5v35s0rj3jy637qjannu3zlesds0el5
-Wallet ID: 3

NFT Wallet:
-Total Balance: 0.0
-Pending Total Balance: 0.0
-Spendable: 0.0
-Type: NFT
-DID ID: did:chia:1kzxqrt8f2h8psr8zuzen9dxgmxx5v35s0rj3jy637qjannu3zlesds0el5
-Wallet ID: 4

DataLayer Wallet:
-Total Balance: 0.0
-Pending Total Balance: 0.0
-Spendable: 0.0
-Type: DATA_LAYER
-Wallet ID: 5

CAT f17f88130c635228...:
-Total Balance: 0.034 (34 mojo)
-Pending Total Balance: 0.034 (34 mojo)
-Spendable: 0.034 (34 mojo)
-Type: CAT
-Asset ID: f17f88130c63522821f1a75466849354eee69c414c774bd9f3873ab643e9574d
-Wallet ID: 6

CAT aaee6b63bcbc4aef...:
-Total Balance: 10.0 (10000 mojo)
-Pending Total Balance: 10.0 (10000 mojo)
-Spendable: 10.0 (10000 mojo)
-Type: CAT
-Asset ID: aaee6b63bcbc4aef0a005d31119ad65e5228b0ddff18c5c563fd7a4db54fb084
-Wallet ID: 7

Pool wallet:
-Total Balance: 0.0 (0 mojo)
-Pending Total Balance: 0.0 (0 mojo)
-Spendable: 0.0 (0 mojo)
-Type: POOLING_WALLET
-Wallet ID: 11
```

Next, show all transactions from `Wallet ID` `7`, a CAT wallet:

```bash
chia wallet get_transactions -i 7
```

Transaction eb3d20f16f8f2b3661058fe0c4658abb95b440ab380a273ba4f867af255f2ca7
Response:

```bash
Transaction 38306b461975741641d397330bb34c01681bb242119bd4aa457c06e2080cf257
Status: Confirmed
Amount received: 0.3 XCH
To address: xch1aqg54tdk0lqxp8yhq2jlqyce3heevltpztm8939w5xvpwt8tyfkschugt0
Created at: 2022-11-14 17:44:03
Amount received: 10 CAT aaee6b63bcbc4aef...
To address: txch1stn20rhgmh5wvmyyfj2etdpdp73fla0ga4ymtsejz600dszf392s58kx2s
Created at: 2022-12-14 00:40:39
```

</details>
Expand Down
Loading

0 comments on commit 1fe8219

Please sign in to comment.