Skip to content
This repository has been archived by the owner on Oct 17, 2022. It is now read-only.

Commit

Permalink
Whyyyyy (#827)
Browse files Browse the repository at this point in the history
* update online (#769)

* Update index.pug

* modify vitalik's website (#766)

* Update crowdsale.md (#765)

The token is actually defined as an interface not a contract

* Update footer 2017 -> 2018 (#764)

* A tiny typo fix (#762)

* Update recipes.pug (#757)

* Update index.pug (#756)

* Update Ether FAQ (#752)

* Docs improvement to match interface (#751)

Case & space now better match interface.
Comment naming step unnecessarily confuses due to interface mismatch.  
Also, some grammar cleanup.

* Updating deprecated .send(...) to .transfer(...) (#734)

.send(...) is now deprecated.
Send vs transfer comparsion:
https://vomtom.at/solidity-send-vs-transfer/
Also the Solidity by Example Documentation got updated and now uses the .transfer() function.
http://solidity.readthedocs.io/en/develop/solidity-by-example.html
We dont need to use require, as transfer fully propagates errors.

* Update contract Token name (#732)

It should be "contract Token", not "contract token".
Also transferFrom is missing in the contract, added it to contract Token.

* English grammatical mistakes (#767)

* Corrected English grammatical mistake

* Corrected English grammatical mistake

* Gh pages 2017 01 04 (#768)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* update dependencies

* new build

* update 2018

* update foundation page

* Gh pages ud3 (#790)

* es6 changes and node andnpm version update

* Update index.pug

* Update token.md

* modify vitalik's website (#766)

* Update crowdsale.md (#765)

The token is actually defined as an interface not a contract

* Update footer 2017 -> 2018 (#764)

* A tiny typo fix (#762)

* Update recipes.pug (#757)

* Update index.pug (#756)

* Update Ether FAQ (#752)

* Docs improvement to match interface (#751)

Case & space now better match interface.
Comment naming step unnecessarily confuses due to interface mismatch.  
Also, some grammar cleanup.

* Updating deprecated .send(...) to .transfer(...) (#734)

.send(...) is now deprecated.
Send vs transfer comparsion:
https://vomtom.at/solidity-send-vs-transfer/
Also the Solidity by Example Documentation got updated and now uses the .transfer() function.
http://solidity.readthedocs.io/en/develop/solidity-by-example.html
We dont need to use require, as transfer fully propagates errors.

* Update contract Token name (#732)

It should be "contract Token", not "contract token".
Also transferFrom is missing in the contract, added it to contract Token.

* English grammatical mistakes (#767)

* Corrected English grammatical mistake

* Corrected English grammatical mistake

* Gh pages 2017 01 04 (#768)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* update dependencies

* new build

* update 2018 dates

* update 2018

* Develop (#727)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* Update Timeline.md ethereum -> Ethereum

* Fix Constructor word typo

Fix Constructor word typo

* Fixed phrase for better clarity. (#776)

"The console has auto completion and history support"
was changed to:
"The console has auto completion of commands and command-history support"

* Rephrased for better clarity.

Changed:
generate an account
to:
create an account

*  Used 'CAUTION' to highlight POTENTIAL MONEY LOSS.

'CAUTION' is a more suitable word than 'ATTENTION', in order to highlight POTENTIAL MONEY LOSS.
For reference, on Technical Writing, visit:
http://www.stevensstrategic.com/technical-writing-the-difference-between-warnings-and-cautions/

* remove duplicated line

this line had been duplicated
"If you have not installed a compiler, then you need to install one. You can find [instructions for installing Solidity here](http://solidity.readthedocs.io/en/develop/installing-solidity.html)."

* Add necessary 'public' to function in tutorial

Without adding 'public' to that line of code, Ethereum Wallet returns the error:

No visibility specified. Defaulting to "public".
    function Token(uint256 initialSupply)  {
    ^
Spanning multiple lines.

Proposing to add that in so tutorial takers don't run into this error, get confused, etc.

* missing '>'

* [admin.nodeInfo.nodeURL] >> [admin.nodeInfo.enode]

The command 'admin.nodeInfo.nodeURL', results in 'undefined', in the recent version of Geth.
Here is the actual output, based on the recent version of Geth:

myMac:console2 admin$ geth attach ipc:../node2/geth.ipc 
Welcome to the Geth JavaScript console!

instance: Geth/v1.7.3-stable/darwin-amd64/go1.9.2
coinbase: 0x3fd97155061e47960b59b563a178fa248493017c
at block: 2 (Thu, 11 Jan 2018 20:25:58 +04)
 datadir: /Users/admin/EtherNet/testnet/node2
 modules: admin:1.0 clique:1.0 debug:1.0 eth:1.0 miner:1.0 net:1.0 personal:1.0 rpc:1.0 txpool:1.0 web3:1.0

> web3.eth.accounts
["0x3fd97155061e47960b59b563a178fa248493017c"]
> admin.nodeInfo.nodeURL
undefined
> admin.nodeInfo.enode
"enode://f48fcf69ba27442ff3813912ec12ea1ad249f14739dabfcadb3985c3654540e047700030adba5800bf33d0adbdd9ca5f1c47aae2498a0d9dafb8c2fd730969b4@[::]:3002?discport=0"
>

* Follow correct style guide for code

* Update Greeter tutorial to comply with change in Remix's UI (#779)

* Clarifications on installing Solc vs using Remix

* update docs to reflect Remix GUI change

* Clarifications on retrieving ABI from Remix

* formatting cleanup

* Fixed app.js and updated /dist

* Add error handling to Greeter tutorial (#774)

* Add error handling to Greeter tutorial

While trying to get up and running with contract deployment through geth, I spent multiple hours trying to debug the `greeterFactory.new(...)` command in this tutorial without realizing that I was getting an "Error: exceeds block gas limit" error. This change makes it so that the console will log if contract deployment fails.

* Use early return for error handling.

* Removed the Ethereum Alarm Clock (#729)

Removed the Ethereum Alarm Clock as it is not available on all networks

* updating foundation page

* updating foundation page again

* update/fix on foundation page

* Update Foundation Page (#789)

* updating foundation page

* updating foundation page again

* update/fix on foundation page

* updating greeter to the current on on gh-pages

* update to foundation page

* update to brand

* Update website (#814)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* es6 changes and node andnpm version update

* Update index.pug

* Update token.md

* modify vitalik's website (#766)

* Update crowdsale.md (#765)

The token is actually defined as an interface not a contract

* Update footer 2017 -> 2018 (#764)

* A tiny typo fix (#762)

* Update recipes.pug (#757)

* Update index.pug (#756)

* Update Ether FAQ (#752)

* Docs improvement to match interface (#751)

Case & space now better match interface.
Comment naming step unnecessarily confuses due to interface mismatch.  
Also, some grammar cleanup.

* Updating deprecated .send(...) to .transfer(...) (#734)

.send(...) is now deprecated.
Send vs transfer comparsion:
https://vomtom.at/solidity-send-vs-transfer/
Also the Solidity by Example Documentation got updated and now uses the .transfer() function.
http://solidity.readthedocs.io/en/develop/solidity-by-example.html
We dont need to use require, as transfer fully propagates errors.

* Update contract Token name (#732)

It should be "contract Token", not "contract token".
Also transferFrom is missing in the contract, added it to contract Token.

* English grammatical mistakes (#767)

* Corrected English grammatical mistake

* Corrected English grammatical mistake

* Gh pages 2017 01 04 (#768)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* update dependencies

* new build

* update 2018 dates

* update 2018

* Develop (#727)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* Update Timeline.md ethereum -> Ethereum

* Fix Constructor word typo

Fix Constructor word typo

* Fixed phrase for better clarity. (#776)

"The console has auto completion and history support"
was changed to:
"The console has auto completion of commands and command-history support"

* Rephrased for better clarity.

Changed:
generate an account
to:
create an account

*  Used 'CAUTION' to highlight POTENTIAL MONEY LOSS.

'CAUTION' is a more suitable word than 'ATTENTION', in order to highlight POTENTIAL MONEY LOSS.
For reference, on Technical Writing, visit:
http://www.stevensstrategic.com/technical-writing-the-difference-between-warnings-and-cautions/

* remove duplicated line

this line had been duplicated
"If you have not installed a compiler, then you need to install one. You can find [instructions for installing Solidity here](http://solidity.readthedocs.io/en/develop/installing-solidity.html)."

* Add necessary 'public' to function in tutorial

Without adding 'public' to that line of code, Ethereum Wallet returns the error:

No visibility specified. Defaulting to "public".
    function Token(uint256 initialSupply)  {
    ^
Spanning multiple lines.

Proposing to add that in so tutorial takers don't run into this error, get confused, etc.

* missing '>'

* [admin.nodeInfo.nodeURL] >> [admin.nodeInfo.enode]

The command 'admin.nodeInfo.nodeURL', results in 'undefined', in the recent version of Geth.
Here is the actual output, based on the recent version of Geth:

myMac:console2 admin$ geth attach ipc:../node2/geth.ipc 
Welcome to the Geth JavaScript console!

instance: Geth/v1.7.3-stable/darwin-amd64/go1.9.2
coinbase: 0x3fd97155061e47960b59b563a178fa248493017c
at block: 2 (Thu, 11 Jan 2018 20:25:58 +04)
 datadir: /Users/admin/EtherNet/testnet/node2
 modules: admin:1.0 clique:1.0 debug:1.0 eth:1.0 miner:1.0 net:1.0 personal:1.0 rpc:1.0 txpool:1.0 web3:1.0

> web3.eth.accounts
["0x3fd97155061e47960b59b563a178fa248493017c"]
> admin.nodeInfo.nodeURL
undefined
> admin.nodeInfo.enode
"enode://f48fcf69ba27442ff3813912ec12ea1ad249f14739dabfcadb3985c3654540e047700030adba5800bf33d0adbdd9ca5f1c47aae2498a0d9dafb8c2fd730969b4@[::]:3002?discport=0"
>

* Follow correct style guide for code

* Update Greeter tutorial to comply with change in Remix's UI (#779)

* Clarifications on installing Solc vs using Remix

* update docs to reflect Remix GUI change

* Clarifications on retrieving ABI from Remix

* formatting cleanup

* Fixed app.js and updated /dist

* Add error handling to Greeter tutorial (#774)

* Add error handling to Greeter tutorial

While trying to get up and running with contract deployment through geth, I spent multiple hours trying to debug the `greeterFactory.new(...)` command in this tutorial without realizing that I was getting an "Error: exceeds block gas limit" error. This change makes it so that the console will log if contract deployment fails.

* Use early return for error handling.

* Removed the Ethereum Alarm Clock (#729)

Removed the Ethereum Alarm Clock as it is not available on all networks

* Update Foundation Page (#789)

* updating foundation page

* updating foundation page again

* update/fix on foundation page

* Delete e-mail and change press-kit wording

* Update Remix URL (#797)

* Transfer of zero ERC20 Token must success (#796)

* Make check for overflows compliant with ERC20 

As my previous change: the ERC20 standard says that a transfer of 0 token MUST success.
So we need to replace > by >= when checking for overflows, or the transfer of 0 token will revert ;-)

* Transfer of 0 token must success

Same as previous change: to be ERC20 compliant, a token must allow transfert of 0 token.

* Transfer of zero token MUST success

If you look at the ERC20  token standard, here:
https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md#transfer

You can read that:
Transfers of 0 values MUST be treated as normal transfers and fire the Transfer event.

But if you are too strict when checking for overflows, as now, the 0 token transaction will revert <:o)
I think we need to change the > into >= to allow transfers of 0 token as required by the standard.

* Update crowdsale.sol (#786)

* Develop (#792)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* Update Emit Events (#808)

* Update token-erc20.sol

* Update token-erc20.sol

* Add "public" to minimum viable token (#807)

* Develop into master (#804)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* both -> two distinct (#810)

because there are three clients but both implies that there are only two clients

* Revert "Develop (#792)" (#812)

This reverts commit 4f29530.

* Add 'public' to remaining variables in MyToken (#801)

* Update dao-association.sol (#798)

Updated the contract in favor of the latest solidity build compilation.

* Solidity fixes (#699)

* Line has no effect

The "numberOfVotes" variable is set to the new value two lines further down, so this line does nothing.

* Proposals should be marked as executed whether they pass or not

This prevents proposals that lost the vote from having a chance of submitting more yea votes after the close of voting, and still get executed.

* Hudson 4-10-18 Updates (#826)

* es6 changes and node andnpm version update

* Update index.pug

* Update token.md

* modify vitalik's website (#766)

* Update crowdsale.md (#765)

The token is actually defined as an interface not a contract

* Update footer 2017 -> 2018 (#764)

* A tiny typo fix (#762)

* Update recipes.pug (#757)

* Update index.pug (#756)

* Update Ether FAQ (#752)

* Docs improvement to match interface (#751)

Case & space now better match interface.
Comment naming step unnecessarily confuses due to interface mismatch.  
Also, some grammar cleanup.

* Updating deprecated .send(...) to .transfer(...) (#734)

.send(...) is now deprecated.
Send vs transfer comparsion:
https://vomtom.at/solidity-send-vs-transfer/
Also the Solidity by Example Documentation got updated and now uses the .transfer() function.
http://solidity.readthedocs.io/en/develop/solidity-by-example.html
We dont need to use require, as transfer fully propagates errors.

* Update contract Token name (#732)

It should be "contract Token", not "contract token".
Also transferFrom is missing in the contract, added it to contract Token.

* English grammatical mistakes (#767)

* Corrected English grammatical mistake

* Corrected English grammatical mistake

* Gh pages 2017 01 04 (#768)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* update dependencies

* new build

* update 2018 dates

* update 2018

* Develop (#727)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* Update Timeline.md ethereum -> Ethereum

* Fix Constructor word typo

Fix Constructor word typo

* Fixed phrase for better clarity. (#776)

"The console has auto completion and history support"
was changed to:
"The console has auto completion of commands and command-history support"

* Rephrased for better clarity.

Changed:
generate an account
to:
create an account

*  Used 'CAUTION' to highlight POTENTIAL MONEY LOSS.

'CAUTION' is a more suitable word than 'ATTENTION', in order to highlight POTENTIAL MONEY LOSS.
For reference, on Technical Writing, visit:
http://www.stevensstrategic.com/technical-writing-the-difference-between-warnings-and-cautions/

* remove duplicated line

this line had been duplicated
"If you have not installed a compiler, then you need to install one. You can find [instructions for installing Solidity here](http://solidity.readthedocs.io/en/develop/installing-solidity.html)."

* Add necessary 'public' to function in tutorial

Without adding 'public' to that line of code, Ethereum Wallet returns the error:

No visibility specified. Defaulting to "public".
    function Token(uint256 initialSupply)  {
    ^
Spanning multiple lines.

Proposing to add that in so tutorial takers don't run into this error, get confused, etc.

* missing '>'

* [admin.nodeInfo.nodeURL] >> [admin.nodeInfo.enode]

The command 'admin.nodeInfo.nodeURL', results in 'undefined', in the recent version of Geth.
Here is the actual output, based on the recent version of Geth:

myMac:console2 admin$ geth attach ipc:../node2/geth.ipc 
Welcome to the Geth JavaScript console!

instance: Geth/v1.7.3-stable/darwin-amd64/go1.9.2
coinbase: 0x3fd97155061e47960b59b563a178fa248493017c
at block: 2 (Thu, 11 Jan 2018 20:25:58 +04)
 datadir: /Users/admin/EtherNet/testnet/node2
 modules: admin:1.0 clique:1.0 debug:1.0 eth:1.0 miner:1.0 net:1.0 personal:1.0 rpc:1.0 txpool:1.0 web3:1.0

> web3.eth.accounts
["0x3fd97155061e47960b59b563a178fa248493017c"]
> admin.nodeInfo.nodeURL
undefined
> admin.nodeInfo.enode
"enode://f48fcf69ba27442ff3813912ec12ea1ad249f14739dabfcadb3985c3654540e047700030adba5800bf33d0adbdd9ca5f1c47aae2498a0d9dafb8c2fd730969b4@[::]:3002?discport=0"
>

* Follow correct style guide for code

* Update Greeter tutorial to comply with change in Remix's UI (#779)

* Clarifications on installing Solc vs using Remix

* update docs to reflect Remix GUI change

* Clarifications on retrieving ABI from Remix

* formatting cleanup

* Fixed app.js and updated /dist

* Add error handling to Greeter tutorial (#774)

* Add error handling to Greeter tutorial

While trying to get up and running with contract deployment through geth, I spent multiple hours trying to debug the `greeterFactory.new(...)` command in this tutorial without realizing that I was getting an "Error: exceeds block gas limit" error. This change makes it so that the console will log if contract deployment fails.

* Use early return for error handling.

* Removed the Ethereum Alarm Clock (#729)

Removed the Ethereum Alarm Clock as it is not available on all networks

* Update Foundation Page (#789)

* updating foundation page

* updating foundation page again

* update/fix on foundation page

* Delete e-mail and change press-kit wording

* Update Remix URL (#797)

* Transfer of zero ERC20 Token must success (#796)

* Make check for overflows compliant with ERC20 

As my previous change: the ERC20 standard says that a transfer of 0 token MUST success.
So we need to replace > by >= when checking for overflows, or the transfer of 0 token will revert ;-)

* Transfer of 0 token must success

Same as previous change: to be ERC20 compliant, a token must allow transfert of 0 token.

* Transfer of zero token MUST success

If you look at the ERC20  token standard, here:
https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md#transfer

You can read that:
Transfers of 0 values MUST be treated as normal transfers and fire the Transfer event.

But if you are too strict when checking for overflows, as now, the 0 token transaction will revert <:o)
I think we need to change the > into >= to allow transfers of 0 token as required by the standard.

* Update crowdsale.sol (#786)

* Develop (#792)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* Update Emit Events (#808)

* Update token-erc20.sol

* Update token-erc20.sol

* Add "public" to minimum viable token (#807)

* Develop into master (#804)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* Revert "Develop (#792)" (#812)

This reverts commit 4f29530.

* Add 'public' to remaining variables in MyToken (#801)

* Update dao-association.sol (#798)

Updated the contract in favor of the latest solidity build compilation.

* Solidity fixes (#699)

* Line has no effect

The "numberOfVotes" variable is set to the new value two lines further down, so this line does nothing.

* Proposals should be marked as executed whether they pass or not

This prevents proposals that lost the vote from having a chance of submitting more yea votes after the close of voting, and still get executed.

* Update Links (#815)

* Created hackternship.md

This will eventually be the address for hackternship.ethereum.org

* Update and rename hackternship.md to grants.md

* updated page

* Updated votingDeadline variable to minExecutionDate (#818)

* Updated votingDeadline variable to minExecutionDate

* Update dao-congress.sol

* Removed horizontal overflow generated by figures on mobile (#821)

* Updated votingDeadline variable to minExecutionDate (#820)

* Update Twitter links (#822)

* Fixed ms dependency issue (#825)
  • Loading branch information
Souptacular authored Apr 10, 2018
1 parent 6c911ad commit 7fac074
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 21 deletions.
2 changes: 1 addition & 1 deletion dist/brand.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"><meta http-equiv="X-UA-Compatible" content="chrome=1"><title>Branding Guidelines</title><meta name="description" content="Ethereum is a decentralized platform for applications that run exactly as programmed without any chance of fraud, censorship or third-party interference."><meta name="twitter:card" value="summary"><meta property="og:title" content="Branding Guidelines"><meta property="og:type" content="article"><meta property="og:url" content="https://www.ethereum.org/brand"><meta property="og:image" content="https://ethereum.org/images/wallpaper-homestead.jpg"><meta property="og:image:width" content="500"><meta property="og:image:height" content="500"><meta property="og:description" content="Ethereum is a decentralized platform for applications that run exactly as programmed without any chance of fraud, censorship or third-party interference."><link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:200,400,600,700,900,400italic|Source+Code+Pro" rel="stylesheet" type="text/css"><link rel="stylesheet" href="/css/app.min.css"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/default.min.css"></head><body><div class="inner-header default-header scrollme"><div class="breadcrumb animateme" data-when="exit" data-from="1" data-to="0.8" data-opacity="0" data-translatey="-20"> <a class="index" href="/">Ethereum </a>» <strong>Branding Guidelines </strong></div><a class="back" href="/">« Main page</a><figure class="ethereum-logo animateme" data-when="exit" data-from="0" data-to="1" data-translatey="120" data-opacity="0.5" data-scale="0.6" data-easing="linear"></figure><h3 class="text-center animateme" data-when="exit" data-from="0" data-to="0.5" data-translatey="30" data-opacity="0" data-scale="0.7" data-easing="linear"> Branding Guidelines </h3></div><div class="main-tutorial inner-page even"><div class="container"><div class="row"><div class="col-md-12"><h2>Visual Identity Guide</h2><p>If you are a designer using our logo in a work, please follow the <a href="/images/logos/Ethereum_Visual_Identity_1.0.0.pdf" target="_blank">Ethereum Visual Identity Guide</a>:</p><p><a href="/images/logos/Ethereum_Visual_Identity_1.0.0.pdf" target="_blank"><img alt="Ethereum Visual Identity Guide" src="images/logos/Ethereum_Visual_Identity_1.0.0.png" style="max-width: 400px;"></a></p></div></div></div></div><div class="main-tutorial inner-page brand"><div class="container"><div class="row"><div class="col-md-12"><h2>Guidelines for Third Parties Using Ethereum Trademarks</h2>
<p>We are revising those guidelines in order to have a more open approach towards the use of the Ethereum logo that is more community-friendly and supports the greater Ethereum and crypto innovation ecosystem. The current branding guidelines will be updated to reflect a policy that all current Ethereum logos are under Creative Commons attribution 3.0.</p>
<p>We are revising those guidelines in order to have a more open approach towards the use of the Ethereum logo that is more community-friendly and supports the greater Ethereum and crypto innovation ecosystem.</p>
<p>The Ethereum Foundation may be releasing a special seal for use by approved people or entities for foundation specific advocacy, fundraising, and mission-related efforts; more details will be announced.</p>
<h3>Contact Information</h3>
<p>If you have any questions or clarifications pertaining to these guidelines, please email us at
Expand Down
2 changes: 1 addition & 1 deletion dist/cli.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</ul>
<h2>Clients</h2>
<p>For <a href="https://blog.ethereum.org/2015/03/05/ethereum-development-process/">security purposes</a>, three independent implementations were created for Ethereum. The clients have almost identical functionality, so the one you pick is left to personal choice on platform, language and what your planned use is for the network.</p>
<p>If you are building a business that needs to have maximum uptime guarantees to the Ethereum network, we recommend that you run at least one instance of both clients to ensure reliability.</p>
<p>If you are building a business that needs to have maximum uptime guarantees to the Ethereum network, we recommend that you run at least one instance of two distinct clients to ensure reliability.</p>
<h3>Geth</h3>
<p><img src="/images/icons/gopher.png" alt="Logo for Go"></p>
<p>The <strong>Go</strong> implementation is called <strong>Geth</strong>. Geth has been audited for security and will be the future basis for the enduser-facing <strong>Mist Browser</strong>, so if you have experience with web development and are interested in building frontends for dapps, you should experiment with Geth.</p>
Expand Down
4 changes: 2 additions & 2 deletions dist/greeter.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h3>Your first citizen: the greeter</h3>
contract Greeter is Mortal {
/* Define variable greeting of the type string */
string greeting;

/* This runs when the contract is executed */
function Greeter(string _greeting) public {
greeting = _greeting;
Expand Down Expand Up @@ -98,7 +98,7 @@ <h4>Using Remix</h4>
<pre><code>var _greeting = &quot;Hello World!&quot;
</code></pre>
<p>Now you can paste the resulting text on your geth window, or import the file with <code>loadScript(&quot;yourFilename.js&quot;)</code>. Wait up to thirty seconds and you'll see a message like this:</p>
<pre><code>Contract mined! address: 0xdaa24d02bad7e9d6a80106db164bad9399a0423e
<pre><code>Contract mined! address: 0xdaa24d02bad7e9d6a80106db164bad9399a0423e
</code></pre>
<p>You may have to &quot;unlock&quot; the account that is sending the transaction using the password you picked in the beginning, because you need to pay for the gas costs to deploying your contract: e.g. <code>personal.unlockAccount(web3.eth.accounts[0], &quot;yourPassword&quot;)</code>.</p>
<p>This contract is estimated to need ~180 thousand gas to deploy (according to the <a href="http://remix.ethereum.org">online solidity compiler</a>), at the time of writing, gas on the test net is priced at 20 gwei (<a href="http://ether.fund/tool/converter#v=20&amp;u=Gwei">equal to( 20000000000 wei, or 0.00000002 ether</a>) per unit of gas. There are many useful stats, including the latest gas prices <a href="https://stats.ethdev.com">at the network stats page</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion views/content/branding.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Guidelines for Third Parties Using Ethereum Trademarks
-------------------

We are revising those guidelines in order to have a more open approach towards the use of the Ethereum logo that is more community-friendly and supports the greater Ethereum and crypto innovation ecosystem. The current branding guidelines will be updated to reflect a policy that all current Ethereum logos are under Creative Commons attribution 3.0.
We are revising those guidelines in order to have a more open approach towards the use of the Ethereum logo that is more community-friendly and supports the greater Ethereum and crypto innovation ecosystem.

The Ethereum Foundation may be releasing a special seal for use by approved people or entities for foundation specific advocacy, fundraising, and mission-related efforts; more details will be announced.

Expand Down
2 changes: 1 addition & 1 deletion views/content/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ These are tools for blockchain developers. The command line tools will allow you

For [security purposes](https://blog.ethereum.org/2015/03/05/ethereum-development-process/), three independent implementations were created for Ethereum. The clients have almost identical functionality, so the one you pick is left to personal choice on platform, language and what your planned use is for the network.

If you are building a business that needs to have maximum uptime guarantees to the Ethereum network, we recommend that you run at least one instance of both clients to ensure reliability.
If you are building a business that needs to have maximum uptime guarantees to the Ethereum network, we recommend that you run at least one instance of two distinct clients to ensure reliability.


### Geth
Expand Down
23 changes: 8 additions & 15 deletions views/content/greeter.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The Greeter is an intelligent digital entity that lives on the blockchain and is
contract Greeter is Mortal {
/* Define variable greeting of the type string */
string greeting;

/* This runs when the contract is executed */
function Greeter(string _greeting) public {
greeting = _greeting;
Expand Down Expand Up @@ -71,7 +71,6 @@ You can get both of these by using a Solidity compiler. If you have not installe
#### Solc on your machine
=======


If you installed the compiler on your machine, you need to compile the contract to acquire the compiled code and Application Binary Interface.

solc -o target --bin --abi Greeter.sol
Expand Down Expand Up @@ -125,12 +124,12 @@ To access the compiled code, ensure that the dropdown menu on the right pane has
Create a temporary text file on your computer and paste that code. Make sure to change the first line to look like the following:

var _greeting = "Hello World!"

Now you can paste the resulting text on your geth window, or import the file with `loadScript("yourFilename.js")`. Wait up to thirty seconds and you'll see a message like this:

Contract mined! address: 0xdaa24d02bad7e9d6a80106db164bad9399a0423e
Contract mined! address: 0xdaa24d02bad7e9d6a80106db164bad9399a0423e

You may have to "unlock" the account that is sending the transaction using the password you picked in the beginning, because you need to pay for the gas costs to deploying your contract: e.g. `personal.unlockAccount(web3.eth.accounts[0], "yourPassword")`.
You may have to "unlock" the account that is sending the transaction using the password you picked in the beginning, because you need to pay for the gas costs to deploying your contract: e.g. `personal.unlockAccount(web3.eth.accounts[0], "yourPassword")`.

This contract is estimated to need ~180 thousand gas to deploy (according to the [online solidity compiler](http://remix.ethereum.org)), at the time of writing, gas on the test net is priced at 20 gwei ([equal to( 20000000000 wei, or 0.00000002 ether](http://ether.fund/tool/converter#v=20&u=Gwei)) per unit of gas. There are many useful stats, including the latest gas prices [at the network stats page](https://stats.ethdev.com).

Expand All @@ -141,7 +140,7 @@ Within less than a minute, you should have a log with the contract address, this

eth.getCode(greeter.address)

If it returns anything other than "0x" then congratulations! Your little Greeter is live! If the contract is created again (by performing another eth.sendTransaction), it will be published to a new address.
If it returns anything other than "0x" then congratulations! Your little Greeter is live! If the contract is created again (by performing another eth.sendTransaction), it will be published to a new address.


### Run the Greeter
Expand Down Expand Up @@ -182,10 +181,9 @@ This particular example can be instantiated by anyone by simply calling:

Of course, `greeterAddress` must be replaced with your contract's _unique_ address.

#### Cleaning up after yourself:

#### Cleaning up after yourself:

You must be very excited to have your first contract live, but this excitement wears off sometimes, when the owners go on to write further contracts, leading to the unpleasant sight of abandoned contracts on the blockchain. In the future, blockchain rent might be implemented in order to increase the scalability of the blockchain but for now, be a good citizen and humanely put down your abandoned bots.
You must be very excited to have your first contract live, but this excitement wears off sometimes, when the owners go on to write further contracts, leading to the unpleasant sight of abandoned contracts on the blockchain. In the future, blockchain rent might be implemented in order to increase the scalability of the blockchain but for now, be a good citizen and humanely put down your abandoned bots.

A transaction will need to be sent to the network and a fee to be paid for the changes made to the blockchain after the code below is run. The self-destruct is subsidized by the network so it will cost much less than a usual transaction.

Expand All @@ -195,11 +193,6 @@ This can only be triggered by a transaction sent from the contracts owner. You c

eth.getCode(greeter.address)

Notice that every contract has to implement its own kill clause. In this particular case only the account that created the contract can kill it.
Notice that every contract has to implement its own kill clause. In this particular case only the account that created the contract can kill it.

If you don't add any kill clause it could potentially live forever independently of you and any earthly borders, so before you put it live check what your local laws say about it, including any possible limitation on technology export, restrictions on speech and maybe any legislation on the civil rights of sentient digital beings. Treat your bots humanely.





0 comments on commit 7fac074

Please sign in to comment.