Skip to content

Commit

Permalink
Merge pull request EOS-Mainnet#4 from eosasia/master
Browse files Browse the repository at this point in the history
Apply changes from Thomas's branch + remove arbitration
  • Loading branch information
maoyifeng authored Jun 3, 2018
2 parents aa96969 + 8ee1d78 commit 7f05ea2
Show file tree
Hide file tree
Showing 14 changed files with 41 additions and 153 deletions.
12 changes: 2 additions & 10 deletions eosio.system/eosio.system-bidname-rc.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
# Action - `{{ bidname }}`

### Description
## Description

The `{{ bidname }}` action places a bid on a premium account name, in the knowledge that the high bid will purchase the name.

### Inputs and Input Types

The `{{ bidname }}` action requires the following `inputs` and `input types`:

| Action | Input | Input Type |
|:--|:--|:--|
| `{{ bidname }}` | `{{ bidderVar }}`<br/>`{{ newnameVar }}`<br/>`{{ bidVar }}` | `{{ account_name }}`<br/>`{{ account_name }}`<br/>`{{ asset }}` |

As an authorized party I {{ signer }} wish to bid on behalf of {{ bidderVar }} the amount of {{ bidVar }} toward purchase of the account name {{ newnameVar }}.
As an authorized party I {{ signer }} wish to bid on behalf of {{ bidder }} the amount of {{ bid }} toward purchase of the account name {{ newname }}.
4 changes: 2 additions & 2 deletions eosio.system/eosio.system-buyrambytes-rc.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

This action will attempt to reserve about {{bytes}} bytes of RAM on behalf of {{receiver}}.

{{buyer}} authorizes this contract to transfer sufficient SYS tokens to buy the RAM based upon the current price as determined by the market maker algorithm.
{{buyer}} authorizes this contract to transfer sufficient EOS tokens to buy the RAM based upon the current price as determined by the market maker algorithm.

{{buyer}} accepts that a 0.5% fee will be charged on the SYS spent and that the actual RAM received may be slightly less than requested due to the approximations necessary to enable this service.
{{buyer}} accepts that a 0.5% fee will be charged on the EOS spent and that the actual RAM received may be slightly less than requested due to the approximations necessary to enable this service.
{{buyer}} accepts that a 0.5% fee will be charged if and when they sell the RAM received.
{{buyer}} accepts that rounding errors resulting from limits of computational precision may result in less RAM being allocated.
{{buyer}} acknowledges that the supply of RAM may be increased at any time up to the limits of off-the-shelf computer equipment and that this may result in RAM selling for less than purchase price.
Expand Down
10 changes: 1 addition & 9 deletions eosio.system/eosio.system-canceldelay-rc.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,4 @@

The `{{ canceldelay }}` action cancels an existing delayed transaction.

### Inputs and Input Types

The `{{ canceldelay }}` action requires the following `inputs` and `input types`:

| Action | Input | Input Type |
|:--|:--|:--|
| `{{ canceldelay }}` | `{{ canceling_authVar }}`<br/>`{{ trx_idVar }}` | `{{ permission_level }}`<br/>`{{ transaction_id_type }}` |

As an authorized party I {{ signer }} wish to invoke the authority of {{ canceling_authVar }} to cancel the transaction with ID {{ trx_idVar }}.
As an authorized party I {{ signer }} wish to invoke the authority of {{ canceling_auth }} to cancel the transaction with ID {{ trx_id }}.
12 changes: 2 additions & 10 deletions eosio.system/eosio.system-claimrewards-rc.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
# Action - `{{ claimrewards }}`

### Description
## Description

The `{{ claimrewards }}` action allows a block producer (active or standby) to claim the system rewards due them for producing blocks and receiving votes.

### Input and Input Type

The `{{ claimrewards }}` action requires the following `input` and `input type`:

| Action | Input | Input Type |
|:--|:--|:--|
| `{{ claimrewards }}` | `{{ ownerVar }}` | `{{ account_name }}` |

As an authorized party I {{ signer }} wish to have the rewards earned by {{ ownerVar }} deposited into their (my) account.
As an authorized party I {{ signer }} wish to have the rewards earned by {{ owner }} deposited into the {{ owner }} account.
10 changes: 1 addition & 9 deletions eosio.system/eosio.system-newaccount-rc.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,4 @@

The `{{ newaccount }}` action creates a new account.

### Inputs and Input Types

The `{{ newaccount }}` action requires the following `inputs` and `input types`:

| Action | Input | Input Type |
|:--|:--|:--|
| `{{ newaccount }}` | `{{ creatorVar }}`<br/>`{{ nameVar }}`<br/>`{{ ownerVar }}`<br/>`{{ activeVar }}` | `{{ account_name }}`<br/>`{{ account_name }}`<br/>`{{ authority }}`<br/>`{{ authority }}` |

As an authorized party I {{ signer }} wish to exercise the authority of {{ creatorVar }} to create a new account on this system named {{ nameVar }} such that the new account's owner public key shall be {{ ownerVar }} and the active public key shall be {{ activeVar }}.
As an authorized party I {{ signer }} wish to exercise the authority of {{ creator }} to create a new account on this system named {{ name }} such that the new account's owner public key shall be {{ owner }} and the active public key shall be {{ active }}.
41 changes: 0 additions & 41 deletions eosio.system/eosio.system-rc.md

This file was deleted.

11 changes: 1 addition & 10 deletions eosio.system/eosio.system-refund-rc.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,4 @@

The intent of the `{{ refund }}` action is to return previously unstaked tokens to an account after the unstaking period has elapsed.

### Input and Input Type

The `{{ refund }}` action requires the following `input` and `input type`:

| Action | Input | Input Type |
|:--|:--|:--|
| `{{ refund }}` | `{{ ownerVar }}` | `{{ account_name }}` |


As an authorized party I {{ signer }} wish to have the unstaked tokens of {{ ownerVar }} returned.
As an authorized party I {{ signer }} wish to have the unstaked tokens of {{ owner }} returned.
12 changes: 2 additions & 10 deletions eosio.system/eosio.system-sellram-rc.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
# Action - `{{ sellram }}`

### Description
## Description

The `{{ sellram }}` action sells unused RAM for tokens.

### Inputs and Input Types

The `{{ sellram }}` action requires the following `inputs` and `input types`:

| Action | Input | Input Type |
|:--|:--|:--|
| `{{ sellram }}` | `{{ accountVar }}`<br/>`{{ bytesVar }}` | `{{ account_name }}`<br/>`{{ uint64 }}` |

As an authorized party I {{ signer }} wish to sell {{ bytesVar }} of RAM from account {{ accountVar }}.
As an authorized party I {{ signer }} wish to sell {{ bytes }} of unused RAM from account {{ account }}.
13 changes: 2 additions & 11 deletions eosio.system/eosio.system-setprods-rc.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
# Action - `{{ setprods }}`

### Description
## Description

The `{{ setprods }}` action creates a new schedule of active producers, who will produce blocks in the order given.

### Input and Input Type

The `{{ setprods }}` action requires the following `input` and `input type`:

| Action | Input | Input Type |
|:--|:--|:--|
| `{{ setprods }}` | `{{ scheduleVar }}` | `{{ producer_key[] }}` |

THIS IS A SYSTEM COMMAND NOT AVAILABLE FOR DIRECT ACCESS BY USERS.


As an authorized party I {{ signer }} wish to set the rotation of producers to be {{ scheduleVar }}.
As an authorized party I {{ signer }} wish to set the rotation of producers to be {{ schedule }}.
12 changes: 2 additions & 10 deletions eosio.system/eosio.system-unregprod-rc.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
# Action - `{{ unregprod }}`

### Description
## Description

The `{{ unregprod }}` action unregisters a previously registered block producer candidate.

### Input and Input Type

The `{{ unregprod }}` action requires the following `input` and `input type`:

| Action | Input | Input Type |
|:--|:--|:--|
| `{{ unregprod }}` | `{{ producerVar }}` | `{{ account_name }}` |

As an authorized party I {{ signer }} wish to unregister the block producer candidate {{ producerVar }}, rendering that candidate no longer able to receive votes.
As an authorized party I {{ signer }} wish to unregister the block producer candidate {{ producer }}, rendering that candidate no longer able to receive votes.
3 changes: 0 additions & 3 deletions eosio.system/eosio.system-voteproducer-rc.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# Ricardian Contract for *voteproducer*

This Ricardian contract for the system command *voteproducer* is legally binding and can be used in the event of a dispute.


## VOTEPRODUCER (voter; array:producers)

_Intent: cast a valid vote for up to 30 BP candidates_
Expand Down
Loading

0 comments on commit 7f05ea2

Please sign in to comment.