Skip to content

Commit

Permalink
Changed some field names.
Browse files Browse the repository at this point in the history
Corrected a misspelling.

Improved some text.
  • Loading branch information
cseberino committed Aug 16, 2018
1 parent b36f568 commit 7c736ce
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 43 deletions.
16 changes: 8 additions & 8 deletions docs/world_computer/accounts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ Accounts are associated with users and
:ref:`smart contracts <ch_smart_contracts>`. All accounts contain the
following five components:

addresses
address
These are sets of numbers used to identify accounts.

funds
balance
All funds are associated with accounts. This is a balance of classic ether,
also know as ether or ETC.

smart contracts
All smart contracts are associated with accounts. This component is an
empty string for user accounts.
code (smart contract)
All smart contracts are associated with accounts. This component is
an empty string for user accounts.

memories
All smart contracts have associated memory arrays. This component is an
storage
All smart contracts have associated memory. This component is an
empty string for user accounts.

nonces
nonce
Nonces are counters. For user accounts, these equal the number of associated
:ref:`transactions <ch_trans>`. For smart contract accounts, these
equal the number of associated smart contracts created.
Expand Down
46 changes: 23 additions & 23 deletions docs/world_database/blocks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Blocks
================================================================================

The ETC blockchain is composed of an array of blocks. Blocks contain three
categories of information: *computation*, *consensys* and *context*. Blocks
categories of information: *computation*, *consensus* and *context*. Blocks
contain transaction related information (computation), mining related
information (consensys), and, information to properly locate blocks
information (consensus), and, information to properly locate blocks
on the blockchain (context). All components except for two lists form the block
headers.

Expand All @@ -20,34 +20,34 @@ Transactions initiate all activity on the world computer. This category
contains information related to this computation. Specifically, these
block components consist of the following:

transaction lists
transaction list
lists of transactions

transaction list root hashes
transactions root (transaction list root hash)
:ref:`root hashes <app_root_hashes>` of transaction lists

transaction list gas requirements
gas requirements for all the transactions in the transaction list
gas used (transaction list total gas requirement)
gas requirements for *all* the transactions in the transaction list

transaction list state root hashes
state root (transaction list final state root hash)
:ref:`root hashes <app_root_hashes>` of the states *after* each transaction
is applied

transaction log list root hashes
receipts root (transaction log list root hash)
:ref:`root hashes <app_root_hashes>` of transaction log lists

transaction log list Bloom filters
logs Bloom (transaction log list Bloom filter)
:ref:`Bloom filters <app_bloom_filters>` of transaction log lists

It may seem problematic that blocks only contain root hashes of states and
transaction logs. Nevertheless, the full specification of any state or
transaction log can always be obtained by reapplying all the transactions on the
blockchain with respect to the initial state.

.. _sec_consensys:
.. _sec_consensus:

--------------------------------------------------------------------------------
Consensys
Consensus
--------------------------------------------------------------------------------

Mining is the process of creating and validating new blocks. This is referred to
Expand All @@ -60,28 +60,28 @@ of computational work was done. The block candidates that lose this race are
referred to as the *uncle* blocks since they are related to the parents or last
blocks added. These block components consist of the following:

miner extra data
extra data (miner extra data)
32 unused bytes added by miners

miner addresses
beneficiary (miner address)
addresses with respect to block mining rewards

miner validation help
mix hash (miner validation help)
values that help miners validate blocks faster

miner gas maxima
gas limit (miner gas maximum)
maximum possible gas requirements to apply all transactions in blocks

proof of work information
nonce (proof of work information)
the number required to add blocks to the blockchain

proof of work difficulty
difficulty (proof of work difficulty)
difficulty of finding proof of work information for the block

uncle header lists
ommer header list (uncle header list)
lists of the headers of the associated uncles

uncle header list root hashes
ommers hash (uncle header list root hash)
Keccak 256 hashes of uncle header lists

The miner validation help components are necessary because slow block validation
Expand All @@ -101,14 +101,14 @@ Context
Blocks must always located correctly in the blockchain. Here are the blockchain
components pertaining to context.

block numbers
number (block number)
the numbers of blocks that must precede blocks on the blockchain

parent header hashes
parent hash (parent header hash)
Keccak 256 hash of parent block headers

dates & times
dates and times blocks were added to the blockchain
timestamp (date & time)
dates and times that blocks were added to the blockchain

The parent block of a block is the preceding block on the blockchain. Dates and
times are denoted by the number of seconds since 1970–01–01 00:00:00 UTC.
Expand Down
27 changes: 15 additions & 12 deletions docs/world_database/transactions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,32 @@ smart contracts. Transaction resource requirements are measured in *gas*
units. Gas is purchased with classic ether. All transactions contain the
following six elements:

addresses
to (receiving address)
Transactions contain receiving account addresses. This component is an empty
string for smart contract creation transactions for which new accounts,
with new addresses, will be created.

data
init or data (constructor or calling arguments)
For smart contract creation transactions, this contains the
associated constructors. For smart contract execution transactions, this
contains the data operated on.

gifts
amount in classic ether to be transferred to the receiving account
value (transfer amount)
amount of classic ether, in units of wei, to be transferred to the receiving
account

offers
price in classic ether willing to pay per gas unit, and, the maximum gas
units willing to purchase
gas price
offer of classic ether willing to pay per gas unit

nonces
originating user account nonce
gas limit (maximum gas purchase)
maximum number of gas units willing to purchase

digital signatures
digital signature of the transaction with respect to the private key of the
originating user account
nonce
originating user account nonces

v, r, s (digital signature)
three numbers comprising the digital signature of the transaction with
respect to the private key of the originating account

If applying transactions requires more gas to complete than the maximum gas
amount allowed, then all the effects are reversed except that the user is still
Expand Down

0 comments on commit 7c736ce

Please sign in to comment.