Skip to content

Commit 46f3bad

Browse files
authored
Merge pull request #406 from King31T/bignumber_ipFix
Fix: underline in big number and location of an IP
2 parents 6071cfc + 184b211 commit 46f3bad

File tree

5 files changed

+38
-38
lines changed

5 files changed

+38
-38
lines changed

docs/introduction/overview.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ Only the account of a super representative can create a proposal.
5858
The network parameters can be modified([min,max]):
5959

6060
- 0: MAINTENANCE_TIME_INTERVAL, [3 * 27* 1000, 24 * 3600 * 1000] //super representative votes count time interval, currently 6 * 3600 * 1000 ms
61-
- 1: ACCOUNT_UPGRADE_COST, [0, 100 000 000 000 000 000] //the fee to apply to become a super representative candidate, currently 9999_000_000 SUN
62-
- 2: CREATE_ACCOUNT_FEE, [0, 100 000 000 000 000 000] //the fee to create an account, currently 100_000 SUN
63-
- 3: TRANSACTION_FEE, [0, 100 000 000 000 000 000] //the fee for bandwidth, currently 1_000 SUN/byte
64-
- 4: ASSET_ISSUE_FEE, [0, 100 000 000 000 000 000] //the fee to issue an asset, currently 1024_000_000 SUN
65-
- 5: WITNESS_PAY_PER_BLOCK, [0, 100 000 000 000 000 000] //the block producing reward, currently 32_000_000 SUN
66-
- 6: WITNESS_STANDBY_ALLOWANCE, [0, 100 000 000 000 000 000] //the votes reward for top 127 super representative candidates, currently 115_200_000_000 SUN
67-
- 7: CREATE_NEW_ACCOUNT_FEE_IN_SYSTEM_CONTRACT, //the fee to create an account in system, currently 1_000_000 SUN
61+
- 1: ACCOUNT_UPGRADE_COST, [0, 100 000 000 000 000 000] //the fee to apply to become a super representative candidate, currently 9,999,000,000 SUN
62+
- 2: CREATE_ACCOUNT_FEE, [0, 100 000 000 000 000 000] //the fee to create an account, currently 100,000 SUN
63+
- 3: TRANSACTION_FEE, [0, 100 000 000 000 000 000] //the fee for bandwidth, currently 1,000 SUN/byte
64+
- 4: ASSET_ISSUE_FEE, [0, 100 000 000 000 000 000] //the fee to issue an asset, currently 1,024,000,000 SUN
65+
- 5: WITNESS_PAY_PER_BLOCK, [0, 100 000 000 000 000 000] //the block producing reward, currently 32,000,000 SUN
66+
- 6: WITNESS_STANDBY_ALLOWANCE, [0, 100 000 000 000 000 000] //the votes reward for top 127 super representative candidates, currently 115,200,000,000 SUN
67+
- 7: CREATE_NEW_ACCOUNT_FEE_IN_SYSTEM_CONTRACT, //the fee to create an account in system, currently 1,000,000 SUN
6868
- 8: CREATE_NEW_ACCOUNT_BANDWIDTH_RATE, //the consumption of bandwidth or TRX while creating an account, using together with #7
6969
- 9: ALLOW_CREATION_OF_CONTRACTS, //to enable the VM
7070
- 10: REMOVE_THE_POWER_OF_THE_GR, //to clear the votes of GR
@@ -84,7 +84,7 @@ id: the serial number (0 ~ 18)
8484
value: the parameter value
8585
```
8686

87-
Note: In TRON network, 1 TRX = 1000_000 SUN
87+
Note: In TRON network, 1 TRX = 1,000,000 SUN
8888

8989
### 2.4.3 Vote for a Proposal
9090

@@ -562,21 +562,21 @@ Example (Using wallet-cli):
562562
freezeBalanceV2 frozen_balance [ResourceCode:0 BANDWIDTH,1 ENERGY]
563563
```
564564

565-
Stake TRX to get energy, energy obtained = user's TRX staked amount / total amount of staked TRX in TRON * 50_000_000_000.
565+
Stake TRX to get energy, energy obtained = user's TRX staked amount / total amount of staked TRX in TRON * 50,000,000,000.
566566

567567
Example:
568568

569569
```text
570570
If there are only two users, A stakes 2 TRX, B stakes 2 TRX
571571
the energy they can get is:
572-
A: 25_000_000_000 and energy_limit is 25_000_000_000
573-
B: 25_000_000_000 and energy_limit is 25_000_000_000
572+
A: 25,000,000,000 and energy_limit is 25,000,000,000
573+
B: 25,000,000,000 and energy_limit is 25,000,000,000
574574
575575
when C stakes 1 TRX:
576576
the energy they can get is:
577-
A: 20_000_000_000 and energy_limit is 20_000_000_000
578-
B: 20_000_000_000 and energy_limit is 20_000_000_000
579-
B: 10_000_000_000 and energy_limit is 10_000_000_000
577+
A: 20,000,000,000 and energy_limit is 20,000,000,000
578+
B: 20,000,000,000 and energy_limit is 20,000,000,000
579+
C: 10,000,000,000 and energy_limit is 10,000,000,000
580580
```
581581

582582
** Energy Recovery **
@@ -586,9 +586,9 @@ The energy consumed will reduce to 0 smoothly within 24 hours.
586586
Example:
587587

588588
```text
589-
at one moment, A has used 72_000_000 Energy
589+
at one moment, A has used 72,000,000 Energy
590590
if there is no continuous consumption or TRX stake
591-
one hour later, the energy consumption amount will be 72_000_000 - (72_000_000 * (60*60/60*60*24)) Energy = 69_000_000 Energy
591+
one hour later, the energy consumption amount will be 72,000,000 - (72,000,000 * (60*60/60*60*24)) Energy = 69,000,000 Energy
592592
24 hours later, the energy consumption amount will be 0 Energy
593593
```
594594

@@ -629,16 +629,16 @@ Assume developer undertake 90% energy consumption, and developer has enough ener
629629

630630
Then the way to estimate the fee limit is:
631631
```
632-
1). A = 20000 energy * (1 TRX / 400 energy) = 50 TRX = 50_000_000 SUN,
632+
1). A = 20000 energy * (1 TRX / 400 energy) = 50 TRX = 50,000,000 SUN,
633633
634-
2). B = 20000 energy * (1 TRX / 10000 energy) = 2 TRX = 2_000_000 SUN,
634+
2). B = 20000 energy * (1 TRX / 10000 energy) = 2 TRX = 2,000,000 SUN,
635635
636-
3). Take the greater number of A and B, which is 50_000_000 SUN,
636+
3). Take the greater number of A and B, which is 50,000,000 SUN,
637637
638638
4). Developer undertakes 90% energy consumption, caller undertakes 10% energy consumption,
639639
```
640640

641-
So, the caller is suggested to set fee limit to 50_000_000 SUN * 10% = 5_000_000 SUN
641+
So, the caller is suggested to set fee limit to 50,000,000 SUN * 10% = 5,000,000 SUN
642642

643643
Note:
644644
```
@@ -970,7 +970,7 @@ Note: Due to the change of the total amount of the staked TRX in the network and
970970

971971
## 8.2.1 How to Get Bandwidth Points
972972

973-
1. By staking TRX to get Bandwidth Points, Bandwidth Points = the amount of TRX self-staked / the total amount of TRX staked for Bandwidth Points in the network * 43_200_000_000
973+
1. By staking TRX to get Bandwidth Points, Bandwidth Points = the amount of TRX self-staked / the total amount of TRX staked for Bandwidth Points in the network * 43,200,000,000
974974

975975
2. Every account has a fixed amount of free Bandwidth Points every day, it is defined in #61 network parameter, user can check the value on tronscan(https://tronscan.org/#/sr/committee).
976976

@@ -990,15 +990,15 @@ Bandwidth points consumption sequence for TRC-10 transfer:
990990

991991
3. Bandwidth points TRX staking.
992992

993-
4. Bandwidth points obtained by TRX burning, the rate = the number of bytes of the transaction * 1_000 SUN;
993+
4. Bandwidth points obtained by TRX burning, the rate = the number of bytes of the transaction * 1,000 SUN;
994994

995995
Bandwidth points consumption sequence for other transactions:
996996

997997
1. Free Bandwidth points.
998998

999999
2. Bandwidth points TRX staking.
10001000

1001-
3. Bandwidth points obtained by TRX burning, the rate = the number of bytes of the transaction * 1_000 SUN;
1001+
3. Bandwidth points obtained by TRX burning, the rate = the number of bytes of the transaction * 1,000 SUN;
10021002

10031003
### 8.2.3 Bandwidth Points Recovery
10041004
Every 24 hours, the amount of the usage of Bandwidth points of an account will be reset to 0. For the specific formula:
@@ -1077,7 +1077,7 @@ The token price is determined by the ratio of the balance of the two tokens.
10771077
### 9.6.3 Calculate the Amount of Token You Can Get
10781078
sellTokenQuant is the amount of the first_token you want to sell;
10791079
buyTokenQuant is the amount of second_token you can get;
1080-
supply = 1_000_000_000_000_000_000L;
1080+
supply = 1,000,000,000,000,000,000L;
10811081
supplyQuant = -supply * (1.0 - Math.pow(1.0 + (double) sellTokenQuant/(firstTokenBalance + sellTokenQuant, 0.0005));
10821082
buyTokenQuant = (long)balance * (Math.pow(1.0 + (double) supplyQuant / supply, 2000.0) - 1.0);
10831083

docs/mechanism-algorithm/dex.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ The token price is determined by the ratio of the balance of the two tokens.
5151
`buyTokenQuant` is the amount of `second_token` you can get.
5252

5353
```java
54-
supply = 1_000_000_000_000_000_000L
54+
supply = 1,000,000,000,000,000,000L
5555

5656
supplyQuant = -supply * (1.0 - Math.pow(1.0 + (double) sellTokenQuant/(firstTokenBalance + sellTokenQuant, 0.0005))
5757

docs/mechanism-algorithm/resource.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Such as if the number of bytes of a transaction is 200, so this transaction cons
2424

2525
### 1. How to Get Bandwidth Points
2626

27-
1. By staking TRX to get Bandwidth Points, Bandwidth Points = the amount of TRX self-staked / the total amount of TRX staked for Bandwidth Points in the network * 43_200_000_000
27+
1. By staking TRX to get Bandwidth Points, Bandwidth Points = the amount of TRX self-staked / the total amount of TRX staked for Bandwidth Points in the network * 43,200,000,000
2828
2. Every account has a fixed amount of free Bandwidth Points(600) every day
2929

3030
### 2. Bandwidth Points Consumption
@@ -39,15 +39,15 @@ Bandwidth points consumption sequence for TRC-10 transfer:
3939

4040
3. Bandwidth points TRX staking.
4141

42-
4. Bandwidth points obtained by TRX burning, the rate = the number of bytes of the transaction * 1_000 SUN;
42+
4. Bandwidth points obtained by TRX burning, the rate = the number of bytes of the transaction * 1,000 SUN;
4343

4444
Bandwidth points consumption sequence for other transactions:
4545

4646
1. Free Bandwidth points.
4747

4848
2. Bandwidth points TRX staking.
4949

50-
3. Bandwidth points obtained by TRX burning, the rate = the number of bytes of the transaction * 1_000 SUN;
50+
3. Bandwidth points obtained by TRX burning, the rate = the number of bytes of the transaction * 1,000 SUN;
5151

5252
### 3. Bandwidth Points Recovery
5353

@@ -79,21 +79,21 @@ Example (Using wallet-cli):
7979
freezeBalanceV2 frozen_balance [ResourceCode:0 BANDWIDTH,1 ENERGY]
8080
```
8181

82-
stake TRX to get energy, energy obtained = user's TRX staked amount / total amount of staked TRX in TRON * 180_000_000_000.
82+
stake TRX to get energy, energy obtained = user's TRX staked amount / total amount of staked TRX in TRON * 180,000,000,000.
8383

8484
Example:
8585

8686
```text
8787
If there are only two users, A stakes 2 TRX, B stakes 2 TRX
8888
the energy they can get is:
89-
A: 75_000_000_000 and energy_limit is 90_000_000_000
90-
B: 75_000_000_000 and energy_limit is 90_000_000_000
89+
A: 75,000,000,000 and energy_limit is 90,000,000,000
90+
B: 75,000,000,000 and energy_limit is 90,000,000,000
9191
9292
when C stakes 1 TRX:
9393
the energy they can get is:
94-
A: 60_000_000_000 and energy_limit is 72_000_000_000
95-
B: 60_000_000_000 and energy_limit is 72_000_000_000
96-
C: 30_000_000_000 and energy_limit is 36_000_000_000
94+
A: 60,000,000,000 and energy_limit is 72,000,000,000
95+
B: 60,000,000,000 and energy_limit is 72,000,000,000
96+
C: 30,000,000,000 and energy_limit is 36,000,000,000
9797
```
9898
#### Energy Consumption
9999

@@ -150,10 +150,10 @@ Assume developer undertake 90% energy consumption, and developer has enough ener
150150

151151
Then the way to estimate the fee limit is:
152152

153-
1. A = 20000 energy * 210sun = 4_200_000 sun = 4.2 trx
153+
1. A = 20000 energy * 210sun = 4,200,000 sun = 4.2 trx
154154
2. Developer undertakes 90% energy consumption, caller undertakes 10% energy consumption,
155155

156-
So, the caller is suggested to set fee limit to 4_200_000 sun * 10% = 420_000 sun.
156+
So, the caller is suggested to set fee limit to 4,200,000 sun * 10% = 420,000 sun.
157157

158158
### 3. Energy Calculation (Developer Must Read)
159159

docs/releases/history.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2146,7 +2146,7 @@ After this upgrade, TRON will be fully compatible with the new features introduc
21462146
21472147
###2、Make MAX_FEE_LIMIT configurable as a chain property.
21482148
2149-
After the new version, SR and SRP can initiate a voting request to modify MAX_FEE_LIMIT. The range of MAX_FEE_LIMIT is [0,10000_000_000].
2149+
After the new version, SR and SRP can initiate a voting request to modify MAX_FEE_LIMIT. The range of MAX_FEE_LIMIT is [0,10000000000].
21502150
21512151
- TIP: [TIP-204](https://github.com/tronprotocol/tips/issues/204)
21522152
- Source code: [#3534](https://github.com/tronprotocol/java-tron/pull/3534)

docs/using_javatron/backup_restore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The following table shows the download address of Fullnode data snapshots. Pleas
5353
| -------- | -------- | -------- |
5454
| Official data source (North America: Virginia) | http://34.86.86.229/ | LevelDB, exclude internal transactions (About 1821G on 6 Aug. 2024) |
5555
| Official data source (Singapore) | http://34.143.247.77/ | LevelDB, exclude internal transactions (About 1819G on 5 Aug. 2024) |
56-
| Official data source (Singapore) | http://35.197.17.205/ | RocksDB, exclude internal transactions (About 1799G on 6 Aug. 2024) |
56+
| Official data source (North America: America) | http://35.197.17.205/ | RocksDB, exclude internal transactions (About 1799G on 6 Aug. 2024) |
5757
| Official data source (Singapore) | http://35.247.128.170/ | LevelDB, include internal transactions (About 2000G on 6 Aug. 2024) |
5858
| Official data source ((North America: Virginia)) | http://34.48.6.163/ | LevelDB, exclude internal transactions, include account history TRX balance (About 2288G on 6 Aug. 2024) |
5959

0 commit comments

Comments
 (0)