Skip to content

Commit e9766db

Browse files
authored
Merge pull request #408 from vivian1912/master
account permission management
2 parents 46f3bad + dd8143d commit e9766db

File tree

6 files changed

+12
-16
lines changed

6 files changed

+12
-16
lines changed

docs/clients/wallet-cli-command.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ Balance = 2665198240
203203
```shell
204204
wallet>UpdateAccountPermission [ownerAddress] [permissions]
205205
```
206-
This command is used to assign permissions to other accounts, is utilized for **multi-signature** transactions, which allows other users to access the account with paritcular permission in order to better manage it. There are three types of permissions:
206+
This command is used to manage account permissions, assign permissions to other accounts, is utilized for multi-signature transactions, which allows other users to access the account with paritcular permission in order to better manage it. There are three types of permissions:
207207

208208
* owner: access to the owner of account
209209
* active: access to other features of accounts, and access that authorizes a certain feature. Block production authorization is not included if it's for SR purposes.
@@ -861,7 +861,7 @@ In the example, we picked the account `TB9qhqbev6DpX8mxdf3zDdtSQ6GC6Vb6Ej` to si
861861
after that, it asks you if want to add another sign
862862
,enter y and pick the account `TXBpeye7UQ4dDZEnmGDv4vX37mBYDo1tUE` to finish multi-signing.
863863
864-
The weight of each account is 1 and the granting threshold is 2. When the requirements are met, the transaction is done successfully! This is how multiple accounts user multi-signature when using the same cli.
864+
The weight of each account is 1 and the granting threshold is 2. When the requirements are met, the transaction is done successfully! This example shows how to complete a multi-signed transaction using the same client. When using multiple clients, please refer to the following command.
865865
866866
### AddTransactionSign
867867
Use the instruction addTransactionSign according to the obtained transaction hex string if signing at multiple cli.

docs/introduction/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,9 +1082,9 @@ supplyQuant = -supply * (1.0 - Math.pow(1.0 + (double) sellTokenQuant/(firstToke
10821082
buyTokenQuant = (long)balance * (Math.pow(1.0 + (double) supplyQuant / supply, 2000.0) - 1.0);
10831083

10841084

1085-
# 10. Multi-Signatures
1085+
# 10. Account Permission Management
10861086
Please refer to:
1087-
[Multi-signatures](../mechanism-algorithm/multi-signatures.md)
1087+
[Account Permission Management](../mechanism-algorithm/multi-signatures.md)
10881088

10891089
# 11. Shielded Transaction
10901090
Please refer to:

docs/mechanism-algorithm/multi-signatures.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
# Multi-signature
1+
# Account Permission Management
22

33
## Background
44

5-
Multiple signature functions allow for permission grading, and each permission can correspond to multiple private keys. This makes it possible to achieve multi-person joint control of accounts. This guide walks the user through TRON's multi-signature implementation and design.
6-
7-
Reference: [TIP-16: Account Multi-signature](https://github.com/tronprotocol/TIPs/blob/master/tip-16.md)
5+
[Account permission management](https://github.com/tronprotocol/TIPs/blob/master/tip-16.md) functions allow for permission grading, and each permission can correspond to multiple private keys. This makes it possible to achieve multi-person joint control of accounts. This guide walks the user through TRON's account permission management implementation and design.
86

97
## Concept
108

@@ -52,7 +50,7 @@ message AccountPermissionUpdateContract {
5250
}
5351
```
5452

55-
- `owner_address`: The account applies multi-signatures
53+
- `owner_address`: The address of the account whose permissions are to be modified
5654
- `owner`: Owner permission
5755
- `witness`: Witness permission (if the account is a SR(Super Representative))
5856
- `actives`: Active permission
@@ -277,8 +275,6 @@ public static void main(String[] args) {
277275

278276
(n+1). The node will verify if the sum of the weight of all signatures is bigger than threshold, if true, the transaction is accepted, otherwise, is rejected
279277

280-
Demo: [MultiSignDemo.java](https://github.com/tronprotocol/wallet-cli/blob/multi_sign_V2/src/main/java/org/tron/demo/MultiSignDemo.java)
281-
282278
### Other APIs
283279

284280
Please refer to [HTTP API](../api/http.md) and [RPC API](../api/rpc.md) for more information.

docs/mechanism-algorithm/system-contracts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,9 @@ message ReceiveDescription {
432432
- `c_out`: part of note ciphertext, encryption of the receiver's public key and ephemeral private key.
433433
- `zkproof`: zero-knowledge proof of the receiver's note.
434434

435-
## 27. Multi Signature
435+
## 27. Account Permission Management
436436

437-
[Multi-Signature](./multi-signatures.md)
437+
[Account Permission Management](./multi-signatures.md)
438438

439439
## 28. ClearABIContract
440440
```

docs/using_javatron/toolkit.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ $ nohup java -Xms9G -Xmx9G -XX:ReservedCodeCacheSize=256m \
113113
-XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 \
114114
-jar FullNode.jar -c main_net_config.conf >> start.log 2>&1 &
115115
116-
# Super representitive's FullNode
116+
# Super representative's FullNode
117117
$ nohup java -Xms9G -Xmx9G -XX:ReservedCodeCacheSize=256m \
118118
-XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m \
119119
-XX:MaxDirectMemorySize=1G -XX:+PrintGCDetails \

mkdocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ nav:
2626
- Smart Contract: contracts/contract.md
2727
- System Contract: mechanism-algorithm/system-contracts.md
2828
- Decentralized Exchange: mechanism-algorithm/dex.md
29-
- Multi-Signature: mechanism-algorithm/multi-signatures.md
30-
- For java-tron Developers:
29+
- Account Permission Management: mechanism-algorithm/multi-signatures.md
30+
- For Java-tron Developers:
3131
- Developer Guide: developers/java-tron.md
3232
- TIPs Workflow: developers/tips.md
3333
- Issue Workflow: developers/issue-workflow.md

0 commit comments

Comments
 (0)