Skip to content

Commit

Permalink
revised
Browse files Browse the repository at this point in the history
  • Loading branch information
ybhgenius committed May 23, 2018
1 parent a9850af commit 7a3ae57
Show file tree
Hide file tree
Showing 46 changed files with 42 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ To become a recommended Super Representative candidate, candidates must meet the

Please give us the name of your social media account, which could be Twitter, Telegram, Reddit, etc. There should be at least 500 followers/subscribers to your account.

**Note: The information mentioned above will be posted on Tron’s official website (http://tronsr.org/) and our Reddit page (https://www.reddit.com/r/Tronix/) once provided us.**
**Note: The information mentioned above will be posted on TRON’s official website (http://tronsr.org/) and our Reddit page (https://www.reddit.com/r/TRONix/) once provided us.**

### Step 2.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ Others

A: No wallets are capable. Only exchanges.

15. Q: In regards to Tron wallets, how many wallets are currently created.
15. Q: In regards to TRON wallets, how many wallets are currently created.

A: As far as I know, we already have a cli wallet, a web wallet and an ios wallet. And I believe after the programming contest there will be plenty well-designed wallets.

Expand Down
4 changes: 2 additions & 2 deletions English_Documentation/TRON_BUG-BOUNTY.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

# BUG-BOUNTY

## Event introduction
## Introduction

Starting now, community members can participate in the Bug Bounty by identifying bugs and reporting them to TRON. TRON Foundation will rate and reward the reports based on the importance of the bug, how hidden the bug is, estimated workload of the discovery, and subsequent workload of communication with TRON.
From now on, community members can participate in the Bug Bounty by identifying bugs and reporting them to TRON. TRON Foundation will rate and reward the reports based on the importance of the bug, how hidden the bug is, estimated workload of the discovery, and subsequent workload of communication with TRON.

Here are some possible ways to find bugs:

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Tronscan provides a way for Super Representatives to publish their information right where the voters are, on Tronscan!

Super Representatives can use this template to build a static page which will be shown on Tronscan. The link will be placed in the voting overview page right next to the name of SP.
Super Representatives can use this template to build a static page which will be shown on Tronscan. The link will be placed in the voting overview page right next to the name of SR.

By editing files in the repository on Github the Super Representative can manage their own content.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

+ Users can get SR information from TRON blockchain explorer, the detailed information shown as below:**

+ The account address of delegate.
+ The total votes that delegate gets.
+ The account address of the delegate.
+ The total votes that the delegate received.
+ The url of personal website.
+ The total produced blocks of delegate.
+ The total of blocks produced by the delegate.
+ The total missed blocks of delegate.

## Super Representative Recommendations
Expand Down
8 changes: 4 additions & 4 deletions English_Documentation/TRON_Introduction/Community.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Current Official Subreddits:

## Slack

Keeping in touch with outstanding contributors on Github, the tech team of Tron communicates with and finds itself deeply inspired by developers on [slack](https://tronfoundation.slack.com/messages/C6DKKSU8G/details/). The platform makes it easier for developers to discuss and solve technical problems together with the tech team of Tron in a timely fashion. Join us on Slack at our invitation or by your own request. We also welcome developers making a remarkable contribution to be a part of the Tron team.
Keeping in touch with outstanding contributors on Github, the tech team of TRON communicates with and finds itself deeply inspired by developers on [slack](https://tronfoundation.slack.com/messages/C6DKKSU8G/details/). The platform makes it easier for developers to discuss and solve technical problems together with the tech team of TRON in a timely fashion. Join us on Slack at our invitation or by your own request. We also welcome developers making a remarkable contribution to be a part of the TRON team.

## Gitter Rooms

Log in to gitter with your github account to participate in Tron’s discussions. Accessible Gitter channels revolve around the topic of a certain database. Please select a suitable channel and topic and maintain the relevance of your posts.
Log in to gitter with your github account to participate in TRON’s discussions. Accessible Gitter channels revolve around the topic of a certain database. Please select a suitable channel and topic and maintain the relevance of your posts.

[java-tron](https://github.com/tronprotocol/java-tron) – about full node, the launch of mainnet, testnet.
[wallet-web](https://github.com/tronprotocol/wallet-web) – blockchain explorer and web wallet developed by community.
Expand All @@ -29,9 +29,9 @@ http://tronsr.org/

## TRON Foundation

Forging ahead with the development of new technologies and applications jointly with all developers, Tron Foundation is devoted to the healthy development of Tron ecosystem.
Forging ahead with the development of new technologies and applications jointly with all developers, TRON Foundation is devoted to the healthy development of TRON ecosystem.

Tron Foundation open to the community
TRON Foundation open to the community

[Official Website](https://tron.network/en.html)
[Twitter](https://twitter.com/tronfoundation)
Expand Down
18 changes: 9 additions & 9 deletions English_Documentation/TRON_Introduction/One_Page.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

## What is TRON?

TRON is an ambitious project dedicated to the establishment of a truly decentralized Internet and its infrastructure. The Tron Protocol, one of the largest blockchain based operating systems in the world, offers base public blockchain support of high throughput, high scalability and high availability for all decentralized applications in the TRON ecosystem.
TRON is an ambitious project dedicated to the establishment of a truly decentralized Internet and its infrastructure. The TRON Protocol, one of the largest blockchain based operating systems in the world, offers base public blockchain support of high throughput, high scalability and high availability for all decentralized applications in the TRON ecosystem.

## Key Features

+ High Throughput

Under Tron consensus, a limited number of nodes of high calculation performance are selected by users as network witnesses, achieving high throughput by keeping the TPS of the entire network on an acceptable level. With its exclusive consensus, Tron has surpassed Bitcoin and Ethereum in terms of TPS.
Under TRON consensus, a limited number of nodes of high calculation performance are selected by users as network witnesses, achieving high throughput by keeping the TPS of the entire network on an acceptable level. With its exclusive consensus, TRON has surpassed Bitcoin and Ethereum in terms of TPS.

High TPS guarantees low calculation delay, speeding up transactions to parallel the velocity of existing payment systems such as VISA and SWIFT, which makes daily payment a possibility.

+ Scalability

Applications are given a wider variety of ways to be deployed in TRON because of its scalability and highly effective smart contract.

Thanks to the high efficiency and infinite possibilities of the smart contract, Tron possesses great scalability, allowing for a wide variety of applications to be deployed in Tron.
Thanks to the high efficiency and infinite possibilities of the smart contract, TRON possesses great scalability, allowing for a wide variety of applications to be deployed in TRON.

The marriage of an excellent database structure and the account system simplifies the actualization of complex designs and models, which brings convenience to project development and supports high TPS. Existing applications, websites and operating services can be transferred to TRON network by its large user base, which allows TRON to better rival against existing institutions.

Expand All @@ -26,7 +26,7 @@ TRON is keen on building a decentralized consensus mechanism. The network struc

+ Low Cost

TRON adopts a design with low calculation cost, which makes it easier for different apps on Tron to expand its user base and more commercially competitive .
TRON adopts a design with low calculation cost, which makes it easier for different apps on TRON to expand its user base and more commercially competitive .

+ User-friendly

Expand All @@ -49,10 +49,10 @@ It will be fulfilled in the following ways:

## The Future of TRON

We aim to build a TRON ecosystem that everyone can participate in and benefit from, with the Tron network along with its many advantages as the cornerstone of our effort.
We aim to build a TRON ecosystem that everyone can participate in and benefit from, with the TRON network along with its many advantages as the cornerstone of our effort.

+ Tron and its wide variety of affiliated DAPPs not only render users reduced costs, but also improved convenience in daily life and financial return.
+ By deploying their DAPPs on Tron, developers can expand their scope of business and bring publicity to their values and beliefs.
+ Witnesses supports the functioning of Tron network and gain remuneration for their effort.
+ TRON and its wide variety of affiliated DAPPs not only render users reduced costs, but also improved convenience in daily life and financial return.
+ By deploying their DAPPs on TRON, developers can expand their scope of business and bring publicity to their values and beliefs.
+ Witnesses supports the functioning of TRON network and gain remuneration for their effort.

Whether a user, developer or Tron’ selected witness, each and every one of us devotes ourselves to the construction and prosperity of Tron’s ecosystem and be rewarded for our commitment.
Whether a user, developer or TRON’ selected witness, each and every one of us devotes ourselves to the construction and prosperity of TRON’s ecosystem and be rewarded for our commitment.
4 changes: 2 additions & 2 deletions English_Documentation/TRON_Introduction/TRON_Brochure.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ There are numerous ways for TRON’s community members to be a part of the proje

+ Reward Plan

We would like to offer reward to all those who have contributed to the progression and development of TRON’s network and community. A special committee is set up by Tron to conduct close assessment on all participants’ contribution, based on the result of which TRX tokens, gifts, and other forms of reward are offered.
We would like to offer reward to all those who have contributed to the progression and development of TRON’s network and community. A special committee is set up by TRON to conduct close assessment on all participants’ contribution, based on the result of which TRX tokens, gifts, and other forms of reward are offered.


## Protocol

Tron adheres to the Google Protobuf protocol, which covers multiple aspects such as accounts, blocks and transfers.
TRON adheres to the Google Protobuf protocol, which covers multiple aspects such as accounts, blocks and transfers.

There are 3 types of accounts: basic account, asset release account, and contract account. Each of those three types has six properties: name, type, address, balance, voting and related asset.

Expand Down
4 changes: 2 additions & 2 deletions English_Documentation/TRON_Loan.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Loan Amount: USD$100,000

Disbursement: Within 6 – 24 hours

Disbursement Method: Once eligibility for TRON LOAN is verified, applicants will receive the equivalent of USD$100,000 in digital assets from the Tron Foundation. After funds are disbursed, TRON will publicize information on participating projects and funding flows on official TRON channels.
Disbursement Method: Once eligibility for TRON LOAN is verified, applicants will receive the equivalent of USD$100,000 in digital assets from the TRON Foundation. After funds are disbursed, TRON will publicize information on participating projects and funding flows on official TRON channels.

#### Repayment

Expand Down Expand Up @@ -47,6 +47,6 @@ The scope of eligible projects includes but is not limited to the following bloc

#### How to Apply

1. Developers should submit applications to the Tron Foundation ([email protected]) with their project description and product achievements (including but not limited to product link or APKs).
1. Developers should submit applications to the TRON Foundation ([email protected]) with their project description and product achievements (including but not limited to product link or APKs).

2. We will reach out to developers who pass our assessment. Fund disbursement of USD$100,000 in direct convertible loans will be completed in a timely fashion.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ First-place prizes will be offered to designers of the five applications like th

3, Each team/individual participant can sign up for 5 sub-contests.

4, All development must be based on Tron blockchain technology and should be one of the following five applications compatible with Tron’s main net:
4, All development must be based on TRON blockchain technology and should be one of the following five applications compatible with TRON’s main net:

+ Wallet based on Windows (including off-line signature function and voting function)
+ Wallet based on Mac (Off-line signature function is optional but a plus and voting function is necessary.)
Expand Down Expand Up @@ -66,15 +66,15 @@ Reward will be delivered within 1 month to the announcement.

## Judges

Justin Sun: CEO of Tron
Justin Sun: CEO of TRON

Lucien Chen: CTO of Tron
Lucien Chen: CTO of TRON

Marcus Zhao: Director of Technology, Tron
Marcus Zhao: Director of Technology, TRON

## Application
 Procedure

+ Step 1. Please submit your application to [email protected] by May 31, 2018. Please name the subject in the format of “Application_Individual/Team name_Participating project” (e.g. “Application_Tron team_blockchain explorer”), or the email will be categorized as spam, leading to an unsuccessful application.
+ Step 1. Please submit your application to [email protected] by May 31, 2018. Please name the subject in the format of “Application_Individual/Team name_Participating project” (e.g. “Application_TRON team_blockchain explorer”), or the email will be categorized as spam, leading to an unsuccessful application.

**Application Form**

Expand All @@ -92,11 +92,11 @@ Marcus Zhao: Director of Technology, Tron

+ Step 2. Applicants will receive a confirmation email upon successful application:

You have successfully signed up for Tron Programming Contest. Please submit your project to [email protected] by 23:59 on May 31, 2018 (GMT+8). Submission after the deadline is considered as unsuccessful. Thank you for your participation!
You have successfully signed up for TRON Programming Contest. Please submit your project to [email protected] by 23:59 on May 31, 2018 (GMT+8). Submission after the deadline is considered as unsuccessful. Thank you for your participation!

## Project Submission

+ Step 1. Please submit your project, along with your application form, to [email protected] by May 31, 2018 (GMT+8). Please name the subject of the email in the format of “Project submission_Individual/Team name_Participating project”(e.g. “Project submission_Tron team_Blockchain explorer”), or the email will be categorized as spam, leading to an unsuccessful submission.
+ Step 1. Please submit your project, along with your application form, to [email protected] by May 31, 2018 (GMT+8). Please name the subject of the email in the format of “Project submission_Individual/Team name_Participating project”(e.g. “Project submission_TRON team_Blockchain explorer”), or the email will be categorized as spam, leading to an unsuccessful submission.

**Submission Form**

Expand All @@ -118,4 +118,4 @@ Marcus Zhao: Director of Technology, Tron

+ Step 2. Applicants will receive a confirmation email upon successful project submission:

You have successfully submitted your project. We will evaluate the submitted project carefully. Announcement of the results of Tron Programming Contest will be made on June 5, 2018. Thank you for your participation!
You have successfully submitted your project. We will evaluate the submitted project carefully. Announcement of the results of TRON Programming Contest will be made on June 5, 2018. Thank you for your participation!
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ Input, transaction and block header all require signature.

`Wallet` service contains several RPCs.
__`GetBalance`__ :
`GetAccount` takes a parameter of Account, and returns an `Account` object.
`GetBlance` takes a parameter of Account, and returns an `Account` object.
__`CreateTransaction`__
`CreateTransaction` takes a parameter of TransferContract, and returns an `Transaction` object.
__`BroadcastTransaction`__ :
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ Permanent token-exchange counter designated by TRON will retain the deposit chan
1. Exchanges don’t need snapshots and don’t need to suspend trading of TRX.
2. Please take note of token migration order.
3. Please note that TRX withdrawals will be suspended from June 21st to June 24th (GMT+8). Both TRX deposits and withdrawals on exchanges will be suspended on June 25th (GMT+8). Deposits and withdrawals of TRX will resume on June 26th.
4. Please contact Tron Foundation to receive mainnet tokens.
4. Please contact TRON Foundation to receive mainnet tokens.

Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ SR election campaigning period allows SRs to attract more votes from TRX holders

2. Candidates transfer deposit:
Candidates will be informed on May 15th (GMT+8) to transfer
200K TRX to Tron Foundation by May 31st as deposit. Deposit
will be returned to designated Tron mainnet addresses at midnight
200K TRX to TRON Foundation by May 31st as deposit. Deposit
will be returned to designated TRON mainnet addresses at midnight
June 25th (GMT+8).

3. Election test period: 6/1 - 6/24 (GMT+8)
Supporters can do test voting. Run test nodes and generate blocks.

4. Candidates’ deposit is returned:
Deposit will be returned to designated Tron mainnet addresses at midnight June 25th (GMT+8).
Deposit will be returned to designated TRON mainnet addresses at midnight June 25th (GMT+8).

5. Apply to become an SR candidate using the wallet and call on supporters to vote.

Expand Down
2 changes: 1 addition & 1 deletion TRX/TRX_Migration_Notice_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ If your TRX is held in a wallet, you must deposit your TRX to an exchange before
From June 21st– 25th, TRX withdrawals on exchanges will be suspended. On June 25th, both TRX deposits and withdraws on exchanges will be suspended. Deposits and withdraws will resume on June 26th. During this period, TRX trading will not be affected.

If your TRX is held in a wallet and you were not aware of the migration notice, or saw the migration notice after June 25th, please visit our permanent token-exchange counter to exchange your tokens for Mainnet TRX.

**Tron Foundation
**TRON Foundation
April 28, 2018**


2 changes: 1 addition & 1 deletion TRX/Transition_Manual_for_Exchanges_and_TRX_EN.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Transition Manual for Exchanges and TRX

## It is suggested that exchanges deploy a Full Node and a Solidity Node in Tron blockchain for improved security.
## It is suggested that exchanges deploy a Full Node and a Solidity Node in TRON blockchain for improved security.

### The Full Node will:
- synchronize all data in the blockchain
Expand Down
2 changes: 1 addition & 1 deletion TRX_CN/Solidity_and_Full_Node_Deployment_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
cpsrc/main/resources/config.conf ../
cd ..

为了能够快速的发现由Tron部署的节点,需要打开`config.conf`。把`seed.node`里面的`ip.list`中包含的地址列表复制到`node``active`中,像这样:
为了能够快速的发现由TRON部署的节点,需要打开`config.conf`。把`seed.node`里面的`ip.list`中包含的地址列表复制到`node``active`中,像这样:

active = [

 # Initial active peers

Expand Down
Binary file removed images/Blockchain-Explorer/1.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/10.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/11.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/12.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/13.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/2.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/3.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/4.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/5.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/6.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/7.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/8.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/9.png
Binary file not shown.
Binary file removed images/Blockchain-Explorer/testnet.png
Binary file not shown.
Binary file removed images/running_a_delegate/Create2.png
Binary file not shown.
Binary file removed images/running_a_delegate/Tokens Balance.png
Binary file not shown.
Binary file removed images/running_a_delegate/Tokens.png
Binary file not shown.
Binary file not shown.
Binary file removed images/running_a_delegate/create_an_account.jpg
Binary file not shown.
Binary file removed images/running_a_delegate/participate.png
Binary file not shown.
Binary file removed images/running_a_delegate/participate1.png
Binary file not shown.
Binary file removed images/running_a_delegate/personal_address.jpg
Binary file not shown.
Binary file removed images/running_a_delegate/request_for_testing.jpg
Binary file not shown.
Binary file removed images/running_a_delegate/send.png
Binary file not shown.
Binary file removed images/running_a_delegate/submit_vote.png
Binary file not shown.
Binary file removed images/running_a_delegate/view.png
Diff not rendered.
Binary file removed images/running_a_delegate/votes.png
Diff not rendered.
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public运行环境下的问题

答:100个也是按照实际投票来的,目前就是预先选举,让有意向的节点,提前测试。

4. 这个需要用Tron来投票,是否代表我们需要在Tronscan钱包里存入一定数量的Tron
4. 这个需要用TRON来投票,是否代表我们需要在Tronscan钱包里存入一定数量的TRON

答:需要存,用来申请成为节点和投票。

Expand Down

0 comments on commit 7a3ae57

Please sign in to comment.