Merge pull request #37 from ConsenSys/dev

Pull fixes from Dev branch
Consensys · Jan 23, 2017 · 3a2424b · 3a2424b
2 parents f593f81 + f2c04e3
commit 3a2424b
Show file tree

Hide file tree

Showing 7 changed files with 1,413 additions and 1,135 deletions.
diff --git a/EthOn.rdf b/EthOn.rdf
diff --git a/EthOn_glossary.md b/EthOn_glossary.md
@@ -21,6 +21,9 @@ The immutable Keccak-256 hash of the EVM code of an Account.
 ### Account nonce
 [`ethon:accountNonce`](http://ethon.consensys.net/accountNonce)   
 A scalar value equal to the number of transactions sent from this Account or, in the case of Accounts with associated code, the number of Contract-creations made by this Account.
+### Account public key
+[`ethon:accountPublicKey`](http://ethon.consensys.net/accountPublicKey)   
+The public key of an ExternalAccount.
 ### Address
 [`ethon:address`](http://ethon.consensys.net/address)   
 A 160-bit identifier for Accounts.
@@ -219,6 +222,12 @@ Data (as a set of bytes) and value (specified as Ether) that is passed between t
 ### Message call depth
 [`ethon:msgCallDepth`](http://ethon.consensys.net/msgCallDepth)   
 A scalar value equal to the depth of the Contract Message. A Contract Message is represented as a Call in the Ethereum EVM. This value represents the number of CALL or CREATE opcodes being executed at the time of the Message execution.
+### Message error
+[`ethon:msgError`](http://ethon.consensys.net/msgError)   
+A boolean value indicating whether the ContractMessage execution resulted in an error. A "true" value indicates an error.
+### Message error string
+[`ethon:msgErrorString`](http://ethon.consensys.net/msgErrorString)   
+A string informally describing an error that occured during the execution of a ContractMessage. Only exists if msgError is true.
 ### Message gas limit
 [`ethon:msgGasLimit`](http://ethon.consensys.net/msgGasLimit)   
 A scalar value equal to the maximum amount of gas that should be used in executing this transaction. This is paid up-front, before any computation is done and may not be increased later. If used with Contract Messages it represents the fraction of the original Transaction gas limit still available for execution of the Contract Message.

diff --git a/EthOn_spec.html b/EthOn_spec.html
diff --git a/doc_resources/EthOn_sketches.graphml b/doc_resources/EthOn_sketches.graphml
diff --git a/doc_resources/img/account_concept.png b/doc_resources/img/account_concept.png
diff --git a/doc_resources/img/block_modeling_scheme.png b/doc_resources/img/block_modeling_scheme.png
diff --git a/doc_resources/img/contract_message_concept.png b/doc_resources/img/contract_message_concept.png