diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 2aa2c48a60..cd4ca2744f 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,30 +1,29 @@
---
-name: Report a bug
-about: Something with go-ethereum is not working as expected
-title: ''
-labels: 'type:bug'
-assignees: ''
+
+name: Report a bug
+about: Something with go-ethereum is not working as expected
+title: ''
+labels: 'type:bug'
+assignees: ''
+
---
#### System information
-Geth version: `geth version`
-OS & Version: Windows/Linux/OSX
-Commit hash : (if `develop`)
+Geth version: `geth version`
+OS & Version: Windows/Linux/OSX
+Commit hash: (if `develop`)
#### Expected behaviour
-
#### Actual behaviour
-
#### Steps to reproduce the behaviour
-
#### Backtrace
-````
-[backtrace]
+````
+[backtrace]
````
-When submitting logs: please submit them as text and not screenshots.
\ No newline at end of file
+When submitting logs: please submit them as text, not screenshots.
\ No newline at end of file
diff --git a/BUILDING.md b/BUILDING.md
index 56c6ae7526..76827f3456 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -1,7 +1,7 @@
# Building Quorum
-Note: Building Quorum requires both a Go (version 1.9 or later) and a C compiler. You can install them using your favourite package manager.
+Note: Building Quorum requires both a Go (version 1.9 or later) and a C compiler. You can install them using your favorite package manager.
Clone the repository and build the source:
@@ -20,7 +20,7 @@ cp ./build/bin/geth ./build/bin/bootnode /usr/local/bin/
```
# Building on Windows
-It is possible to build and run Quorum on Windows. Below are the steps required, please use Slack for any questions or support. Keep in mind that original Go-Ethereum provides a number of helper scripts for environment configuration and build execution. We're not planning ot provide this ourselves, but steps below explain what you may need to set up on your system to create such scripts.
+It is possible to build and run Quorum on Windows. Below are the steps required, please use Slack for any questions or support. Keep in mind that original Go-Ethereum provides a number of helper scripts for environment configuration and build execution. We're not planning to provide this ourselves, but steps below explain what you may need to set up on your system to create such scripts.
1. Install Go version 1.10 or 1.11 for Windows
2. Create a folder that you will bind to be GOPATH
diff --git a/cmd/faucet/README.md b/cmd/faucet/README.md
index 364689a782..4946138d43 100644
--- a/cmd/faucet/README.md
+++ b/cmd/faucet/README.md
@@ -10,7 +10,7 @@ The `faucet` is a single binary app (everything included) with all configuration
First thing's first, the `faucet` needs to connect to an Ethereum network, for which it needs the necessary genesis and network infos. Each of the following flags must be set:
-- `--genesis` is a path to a file containin the network `genesis.json`
+- `--genesis` is a path to a file containing the network `genesis.json`
- `--network` is the devp2p network id used during connection
- `--bootnodes` is a list of `enode://` ids to join the network through
@@ -25,8 +25,8 @@ To be able to distribute funds, the `faucet` needs access to an already funded E
The faucet is able to distribute various amounts of Ether in exchange for various timeouts. These can be configured via:
-- `--faucet.amount` is the number of Ethers to send by default
-- `--faucet.minutes` is the time to wait before allowing a rerequest
+- `--faucet.amount` is the number of Ether to send by default
+- `--faucet.minutes` is the time to wait before allowing a re-request
- `--faucet.tiers` is the funding tiers to support (x3 time, x2.5 funds)
## Sybil protection
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go
index 06171e9a68..7bf2f53e88 100644
--- a/cmd/faucet/faucet.go
+++ b/cmd/faucet/faucet.go
@@ -399,7 +399,7 @@ func (f *faucet) apiHandler(w http.ResponseWriter, r *http.Request) {
if err = conn.ReadJSON(&msg); err != nil {
return
}
- if !*noauthFlag && !strings.HasPrefix(msg.URL, "https://twitter.com/") && !strings.HasPrefix(msg.URL, "https://www.facebook.com/") {
+ if !*noauthFlag && !strings.HasPrefix(msg.URL, "https://x.com/") && !strings.HasPrefix(msg.URL, "https://www.facebook.com/") {
if err = sendError(wsconn, errors.New("URL doesn't link to supported services")); err != nil {
log.Warn("Failed to send URL error to client", "err", err)
return
@@ -461,7 +461,7 @@ func (f *faucet) apiHandler(w http.ResponseWriter, r *http.Request) {
address common.Address
)
switch {
- case strings.HasPrefix(msg.URL, "https://twitter.com/"):
+ case strings.HasPrefix(msg.URL, "https://x.com/"):
id, username, avatar, address, err = authTwitter(msg.URL, *twitterTokenV1Flag, *twitterTokenFlag)
case strings.HasPrefix(msg.URL, "https://www.facebook.com/"):
username, avatar, address, err = authFacebook(msg.URL)
@@ -717,7 +717,7 @@ func authTwitter(url string, tokenV1, tokenV2 string) (string, string, string, c
// Twiter API token isn't provided so we just load the public posts
// and scrape it for the Ethereum address and profile URL. We need to load
// the mobile page though since the main page loads tweet contents via JS.
- url = strings.Replace(url, "https://twitter.com/", "https://mobile.twitter.com/", 1)
+ url = strings.Replace(url, "https://x.com/", "https://mobile.twitter.com/", 1)
res, err := http.Get(url)
if err != nil {
diff --git a/cmd/faucet/faucet.html b/cmd/faucet/faucet.html
index dad5ad84f2..08122f11e3 100644
--- a/cmd/faucet/faucet.html
+++ b/cmd/faucet/faucet.html
@@ -83,7 +83,7 @@ How does this work?
This Ether faucet is running on the {{.Network}} network. To prevent malicious actors from exhausting all available funds or accumulating enough Ether to mount long running spam attacks, requests are tied to common 3rd party social network accounts. Anyone having a Twitter or Facebook account may request funds within the permitted limits.
- - To request funds via Twitter, make a tweet with your Ethereum address pasted into the contents (surrounding text doesn't matter).
Copy-paste the tweets URL into the above input box and fire away!
+ - To request funds via Twitter, make a tweet with your Ethereum address pasted into the contents (surrounding text doesn't matter).
Copy-paste the tweets URL into the above input box and fire away!
- To request funds via Facebook, publish a new public post with your Ethereum address embedded into the content (surrounding text doesn't matter).
Copy-paste the posts URL into the above input box and fire away!
diff --git a/swarm/README.md b/swarm/README.md
index 2658831813..0e653ce826 100644
--- a/swarm/README.md
+++ b/swarm/README.md
@@ -2,6 +2,6 @@
https://swarm.ethereum.org
-Swarm is a distributed storage platform and content distribution service, a native base layer service of the ethereum web3 stack. The primary objective of Swarm is to provide a decentralized and redundant store for dapp code and data as well as block chain and state data. Swarm is also set out to provide various base layer services for web3, including node-to-node messaging, media streaming, decentralised database services and scalable state-channel infrastructure for decentralised service economies.
+Swarm is a distributed storage platform and content distribution service, a native base layer service of the ethereum web3 stack. The primary objective of Swarm is to provide a decentralized and redundant store for dapp code and data as well as blockchain and state data. Swarm is also set out to provide various base layer services for web3, including node-to-node messaging, media streaming, decentralized database services and scalable state-channel infrastructure for decentralized service economies.
**Note**: The codebase has been moved to [ethersphere/swarm](https://github.com/ethersphere/swarm)
diff --git a/tests/testdata b/tests/testdata
index c600d7795a..77db04d04c 160000
--- a/tests/testdata
+++ b/tests/testdata
@@ -1 +1 @@
-Subproject commit c600d7795aa2ea57a9c856fc79f72fc05b542124
+Subproject commit 77db04d04cc81d19a6d9682e8cb2ef4db1ba51da