Skip to content

Commit

Permalink
Fix travis build script, and more typos identified by it
Browse files Browse the repository at this point in the history
  • Loading branch information
Arachnid committed Mar 23, 2018
1 parent 6bc36d9 commit e2232f3
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .travis-ci.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#!/bin/bash
set -e # halt script on error

HTMLPROOFER_OPTIONS="./_site --internal-domains=eips.ethereum.org --check-html --check-opengraph --report-missing-names --log-level=:debug"
HTMLPROOFER_OPTIONS="./_site --internal-domains=eips.ethereum.org --check-html --check-opengraph --report-missing-names --log-level=:debug --assume-extension --empty-alt-ignore --url-ignore=/EIPS/eip-1,EIPS/eip-1,/EIPS/eip-107,/EIPS/eip-858"

bundle exec jekyll doctor
bundle exec jekyll build

if [[ $TASK = 'htmlproofer' ]]; then
bundle exec htmlproofer $HTMLPROOFER_OPTIONS --disable-external
elif [[ $TASK = 'htmlproofer-external' ]]; then
bundle exec htmlproofer $HTMLPROOFER_OPTIONS
bundle exec htmlproofer $HTMLPROOFER_OPTIONS --external_only
fi

# Validate GH Pages DNS setup
Expand Down
9 changes: 3 additions & 6 deletions EIPS/eip-1.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ EIPs can also be superseded by a different EIP, rendering the original obsolete.

The possible paths of the status of EIPs are as follows:

![](process.png)
![EIP Process](eip-1/process.png)

Some Informational and Process EIPs may also have a status of “Active” if they are never meant to be completed. E.g. EIP 1 (this EIP).

Expand Down Expand Up @@ -220,10 +220,6 @@ Once the EIP is ready for the repository, the EIP editor will:

<!-- -->

- List the EIP in [README.md]

<!-- -->

- Send a message back to the EIP author with next step.

Many EIPs are written and maintained by developers with write access to the Ethereum codebase. The EIP editors monitor EIP changes, and correct any structure, grammar, spelling, or markup mistakes we see.
Expand All @@ -239,6 +235,8 @@ December 7, 2016: EIP 1 has been improved and will be placed as a PR.

February 1, 2016: EIP 1 has added editors, made draft improvements to process, and has merged with Master stream.

March 21, 2018: Minor edits to accommodate new automatically-generated EIP directory on eips.ethereum.org.

[EIP5]: https://github.com/ethereum/EIPs/blob/master/EIPS/eip-5.md
[EIP101]: https://github.com/ethereum/EIPs/issues/28
[EIP90]: https://github.com/ethereum/EIPs/issues/90
Expand Down Expand Up @@ -266,7 +264,6 @@ February 1, 2016: EIP 1 has added editors, made draft improvements to process, a
[formal specification]: https://github.com/ethereum/yellowpaper
[the Issues section of this repository]: https://github.com/ethereum/EIPs/issues
[markdown]: https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet
[README.md]: README.md "wikilink"
[Bitcoin's BIP-0001]: https://github.com/bitcoin/bips
[Python's PEP-0001]: https://www.python.org/dev/peps/

Expand Down
6 changes: 3 additions & 3 deletions EIPS/eip-107.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ Account unlocked :
-----------------
When the account is already unlocked, the user is presented with the following popup for every transaction that the dapp attempts to make:

![](authorization.png)
![](eip-107/authorization.png)

Account locked and no "personal" api exposed via rpc:
-----------------
When the account is locked, and the node does not provide access to account unlocking via its rpc interface, the following popup will be presented. This is not ideal since this requires the user to know how to unlock an account:

![](authorization-locked.png)
![](eip-107/authorization-locked.png)

Account locked but node exposing the "personal" api via rpc :
-----------------
A better option is to ask the user for their password, but this is only possible if the node allows access to the "personal" api via rpc. In such case, the following dialog will be presented to the user so he/she can accept the transaction by providing the password required to unlock the account:

![](authorization-password.png")
![](eip-107/authorization-password.png)


Specification
Expand Down
2 changes: 1 addition & 1 deletion EIPS/eip-695.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
eip: 695
title: Create `eth_chainId` method for JSON-RPC
author: Isaac Ardis <[email protected]> Wei Tang <[email protected]>, @tcz001 <https://github.com/tcz001>
author: Isaac Ardis <[email protected]> Wei Tang <[email protected]>, @tcz001
type: Standards Track
category: Interface
status: Draft
Expand Down
2 changes: 1 addition & 1 deletion EIPS/eip-721.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: Standards Track
category: ERC
status: Draft
created: 2018-01-24
requires: ERC-165
requires: 165
---

## Simple Summary
Expand Down
2 changes: 1 addition & 1 deletion EIPS/eip-858.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Reduce the block reward to 1 ETH.
The current public Ethereum network has a hashrate that corresponds to a tremendous level of energy consumption. As this energy consumption has a correlated environmental cost the network participants have an ethical obligation to ensure this cost is not higher than necessary. At this time, the most direct way to reduce this cost is to lower the block reward in order to limit the appeal of ETH mining. Unchecked growth in hashrate is also counterproductive from a security standpoint.

## Motivation
The current public Ethereum network has a hashrate of 232 TH/s). This hashrate corresponds to a **lower bound** for power usage of roughly [821 MW](calculations.md) and yearly energy consumption of 7.2 TWh (roughly 0.033% of [total](https://en.wikipedia.org/wiki/List_of_countries_by_electricity_consumption) global electricity consumption). A future switch to full Proof of Stake will solve this issue entirely. Yet that switch remains enough in the future that action should be taken in the interim to limit excess harmful side affects of the present network.
The current public Ethereum network has a hashrate of 232 TH/s). This hashrate corresponds to a **lower bound** for power usage of roughly [821 MW](eip-858/calculations.md) and yearly energy consumption of 7.2 TWh (roughly 0.033% of [total](https://en.wikipedia.org/wiki/List_of_countries_by_electricity_consumption) global electricity consumption). A future switch to full Proof of Stake will solve this issue entirely. Yet that switch remains enough in the future that action should be taken in the interim to limit excess harmful side affects of the present network.

## Specification
Block reward to be changed to 1 ETH / block.
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ theme: minima
plugins:
- jekyll-feed

permalink: slug
permalink: /:slug

defaults:
-
Expand Down
2 changes: 1 addition & 1 deletion _includes/eipnums.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% assign eips=include.eips|split:"," %}
{% for eipnum in eips %}
<a href="{{eipnum|strip|prepend:"eip-" }}">{{eipnum}}</a>{% if forloop.last == false %}, {% endif %}
<a href="{{eipnum|strip|prepend:"eip-" }}">{{eipnum|strip}}</a>{% if forloop.last == false %}, {% endif %}
{% endfor %}
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h1 class="page-heading">EIPs <a href="https://gitter.im/ethereum/EIPs?utm_sourc
<p>Ethereum Improvement Proposals (EIPs) describe standards for the Ethereum platform, including core protocol specifications, client APIs, and contract standards.</p>

<h2>Contributing</h2>
<p>First review <a href="EIPS/eip-1">EIP-1</a>. Then clone the repository and add your EIP to it. There is a <a href="https://github.com/ethereum/EIPs/blob/master/eip-X.md">template EIP here</a>. Then submit a Pull Request to Ethereum's <a href="https://github.com/ethereum/EIPs">EIPs repository</a>.</p>
<p>First review <a href="EIPS/eip-1">EIP-1</a>. Then clone the repository and add your EIP to it. There is a <a href="https://github.com/ethereum/EIPs/blob/master/eip-X">template EIP here</a>. Then submit a Pull Request to Ethereum's <a href="https://github.com/ethereum/EIPs">EIPs repository</a>.</p>

<h2>EIP status terms</h2>
<ul>
Expand Down

0 comments on commit e2232f3

Please sign in to comment.