diff --git a/_config.yml b/_config.yml index fc9a17df81..d88bb5472b 100644 --- a/_config.yml +++ b/_config.yml @@ -33,6 +33,7 @@ navbar-links: - Mobile Clients: docs/Mobile-Clients/Libraries-and-Inproc-Ethereum-Nodes - Native DApps: docs/Native-DApps/Go-bindings-to-Ethereum-contracts - Active go-ethereum projects: docs/Active-go-ethereum-projects + - Other documents: docs/other-documents Swarm and friends: - TODO: docs/Swarm---TODO - distributed preimage archive: docs/Swarm---distributed-preimage-archive @@ -41,21 +42,4 @@ navbar-links: - POC series: docs/swarm---POC-series - dev progress: docs/swarm-dev-progress - roadmap: docs/swarm-roadmap - Other docs: - - Accounts key-storage specification: docs/Accounts---key-storage-specification - - Connecting to the network: docs/Connecting-to-the-network - - Creating your own Ethereum apps using Eth go: docs/Creating-your-own-Ethereum-apps-using-Eth-go - - Developer guide: docs/Developer-Guide - - Disclaimer: docs/Disclaimer - - Ethereum Specification: docs/Ethereum-Specification - - Ethereum on Android: docs/Ethereum-on-Android - - GAs Price Oracle: docs/Gas-Price-Oracle - - Go ethereum management API's: docs/Go-ethereum-management-API's - - IPFS & SWARM: docs/IPFS-&-SWARM - - Installing Geth: docs/Installing-Geth - - \[Japanese\] Contracts and Transactions: docs/[Japanese]-Contracts-and-Transactions - - Provisional JS API: docs/Provisional-JS-API - - RPC PUB-SUB: docs/RPC-PUB-SUB - - Sending ethere: docs/Sending-ether - - Setting up Ethereum (Native): docs/Setting-up-Ethereum-(Native) - - URL Scheme: docs/URL-Scheme \ No newline at end of file + - IPFS & SWARM: docs/IPFS-&-SWARM \ No newline at end of file diff --git a/docs/[Japanese]-Contracts-and-Transactions.md b/docs/(Japanese)-Contracts-and-Transactions.md similarity index 98% rename from docs/[Japanese]-Contracts-and-Transactions.md rename to docs/(Japanese)-Contracts-and-Transactions.md index d4c99e6d57..c32e55a383 100644 --- a/docs/[Japanese]-Contracts-and-Transactions.md +++ b/docs/(Japanese)-Contracts-and-Transactions.md @@ -166,9 +166,9 @@ So how did you pay for all this? Under the hood, the transaction specified a gas Gas limit is there to protect you from buggy code running until your funds are depleted. The product of `gasPrice` and `gas` represents the maximum amount of Wei that you are willing to pay for executing the transaction. What you specify as `gasPrice` is used by miners to rank transactions for inclusion in the blockchain. It is the price in Wei of one unit of gas, in which VM operations are priced. -The gas expenditure incurred by running your contract will be bought by the ether you have in your account at a price you specified in the transaction with `gasPrice`. If you do not have the ether to cover all the gas requirements to complete running your code, the processing aborts and all intermediate state changes roll back to the pre-transaction snapshot. The gas used up to the point where execution stopped were used after all, so the ether balance of your account will be reduced. These parameters can be adjusted on the transaction object fields `gas` and `gasPrice`. The `value` field is used the same as in ether transfer transactions between normal accounts. In other words transferring funds is available between any two accounts, either normal (i.e. externally controlled) or contract. If your contract runs out of funds, you should see an insufficient funds error. Note that all funds on contract accounts will be irrecoverably lost, once we release [Homestead](Homestead) (see [the rules of the game](Frontier)). +The gas expenditure incurred by running your contract will be bought by the ether you have in your account at a price you specified in the transaction with `gasPrice`. If you do not have the ether to cover all the gas requirements to complete running your code, the processing aborts and all intermediate state changes roll back to the pre-transaction snapshot. The gas used up to the point where execution stopped were used after all, so the ether balance of your account will be reduced. These parameters can be adjusted on the transaction object fields `gas` and `gasPrice`. The `value` field is used the same as in ether transfer transactions between normal accounts. In other words transferring funds is available between any two accounts, either normal (i.e. externally controlled) or contract. If your contract runs out of funds, you should see an insufficient funds error. Note that all funds on contract accounts will be irrecoverably lost, once we release Homestead. -For testing and playing with contracts you can use the test network or [set up a private node (or cluster)](Setting-up-private-networklock-or-local-cluster) potentially isolated from all the other nodes. If you then mine, you can make sure that your transaction will be included in the next block. You can see the pending transactions with: +For testing and playing with contracts you can use the test network or set up a private node (or cluster) potentially isolated from all the other nodes. If you then mine, you can make sure that your transaction will be included in the next block. You can see the pending transactions with: ```js eth.getBlock("pending", true).transactions diff --git a/docs/Swarm---distributed-preimage-archive.md b/docs/Swarm---distributed-preimage-archive.md index 898c8f5762..cddd96b54e 100644 --- a/docs/Swarm---distributed-preimage-archive.md +++ b/docs/Swarm---distributed-preimage-archive.md @@ -16,9 +16,7 @@ - Gav on public wiki: https://github.com/ethereum/cpp-ethereum/wiki/Swarm - network (DEVp2p) - [Peer-to-Peer](Peer-to-Peer) - - [Ethereum node discovery protocol on UDP](RLPx-----Node-Discovery-Protocol) - on kademlia: https://github.com/ethereum/wiki/wiki/Cademlia-Peer-Selection - - [Multi-protocol peer selection](Multi-protocol-peer-selection) ## Talks - https://twitter.com/ethereumproject/status/538030376858693633 diff --git a/docs/other-documents.md b/docs/other-documents.md new file mode 100644 index 0000000000..e1011445d1 --- /dev/null +++ b/docs/other-documents.md @@ -0,0 +1,23 @@ +- [Accounts key-storage specification](/docs/Accounts---key-storage-specification) +- [Connecting to the network](/docs/Connecting-to-the-network) +- [Creating your own Ethereum apps using Eth go](/docs/Creating-your-own-Ethereum-apps-using-Eth-go) +- [Developer guide](/docs/Developer-Guide) +- [Disclaimer](/docs/Disclaimer) +- [Ethereum Specification](/docs/Ethereum-Specification) +- [Ethereum on Android](/docs/Ethereum-on-Android) +- [GAs Price Oracle](/docs/Gas-Price-Oracle) +- [Go ethereum management API's](/docs/Go-ethereum-management-API's) +- [Installing Geth](/docs/Installing-Geth) +- [(Japanese) Contracts and Transactions](/docs/(Japanese)-Contracts-and-Transactions) +- [Mobile/Account management](/docs/Mobile/Account-management) +- [Mobile/Introduction](/docs/Mobile/Introduction) +- [Mobile Clients/Libraries and Inproc Ethereum Nodes](/docs/Mobile-Clients/Libraries-and-Inproc-Ethereum-Nodes) +- [Native/Account management](/docs/Native/Account-management) +- [Native/Introduction](/docs/Native/Introduction) +- [Native DApps/Go bindings to Ethereum contracts](/docs/Native-DApps/Go-bindings-to-Ethereum-contracts) +- [Provisional JS API](/docs/Provisional-JS-API) +- [RPC PUB-SUB](/docs/RPC-PUB-SUB) +- [Sending ethere](/docs/Sending-ether) +- [Setting up Ethereum (Native)](/docs/Setting-up-Ethereum-(Native)) +- [Tracing/Introduction](/docs/Tracing/Introduction) +- [URL Scheme](/docs/URL-Scheme)