From 46cf4bfd8d260c99e1f9c61d997d22c7f8cfeae4 Mon Sep 17 00:00:00 2001 From: Joshua Fernandes Date: Mon, 3 Feb 2020 12:22:42 +1000 Subject: [PATCH 1/3] updating the hdwallet provider package Signed-off-by: Joshua Fernandes --- docs/HowTo/Develop-Dapps/Truffle.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/HowTo/Develop-Dapps/Truffle.md b/docs/HowTo/Develop-Dapps/Truffle.md index 812940dbad6..5b55ae99743 100644 --- a/docs/HowTo/Develop-Dapps/Truffle.md +++ b/docs/HowTo/Develop-Dapps/Truffle.md @@ -13,7 +13,7 @@ To use Besu with Truffle, you must configure a Truffle wallet. To install the Truffle wallet: ```bash -npm install --save truffle-hdwallet-provider@web3-one +npm install --save @truffle/hdwallet-provider ``` !!!note @@ -27,7 +27,7 @@ Modify the `truffle-config.js` file in the project directory to add the wallet p * `` with the private key of an Ethereum account containing Ether ```javascript -const PrivateKeyProvider = require("truffle-hdwallet-provider"); +const PrivateKeyProvider = require("@truffle/hdwallet-provider"); const privateKey = ""; const privateKeyProvider = new PrivateKeyProvider(privateKey, ""); From 268fff4b6c2d4f4ecd1800b60fc120fb2ea7920b Mon Sep 17 00:00:00 2001 From: Joshua Fernandes Date: Mon, 3 Feb 2020 16:41:43 +1000 Subject: [PATCH 2/3] updating json rpc port in the quickstart docs Signed-off-by: Joshua Fernandes --- docs/HowTo/Develop-Dapps/Use-web3js.md | 4 ++-- .../Quickstarts/Azure-Private-Network-Quickstart.md | 4 ++-- docs/Tutorials/Quickstarts/Privacy-Quickstart.md | 10 +++++----- .../Quickstarts/Private-Network-Quickstart.md | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/HowTo/Develop-Dapps/Use-web3js.md b/docs/HowTo/Develop-Dapps/Use-web3js.md index 467573509ba..fc4eacf3534 100644 --- a/docs/HowTo/Develop-Dapps/Use-web3js.md +++ b/docs/HowTo/Develop-Dapps/Use-web3js.md @@ -63,7 +63,7 @@ node create_value_raw_transaction.js ``` ```bash tab="Example" -node create_value_raw_transaction.js http://localhost:32770/jsonrpc +node create_value_raw_transaction.js http://localhost:8545 ``` !!! tip @@ -93,7 +93,7 @@ node create_contract_raw_transaction.js ``` ```bash tab="Example" -node create_contract_raw_transaction.js http://localhost:32770/jsonrpc +node create_contract_raw_transaction.js http://localhost:8545 ``` !!! tip diff --git a/docs/Tutorials/Quickstarts/Azure-Private-Network-Quickstart.md b/docs/Tutorials/Quickstarts/Azure-Private-Network-Quickstart.md index 0f0b86a11eb..ca291ed637c 100644 --- a/docs/Tutorials/Quickstarts/Azure-Private-Network-Quickstart.md +++ b/docs/Tutorials/Quickstarts/Azure-Private-Network-Quickstart.md @@ -152,8 +152,8 @@ Wait a few seconds and 6 peers and the blocks mined are displayed. For the following optional tutorial steps, the RPC endpoints are: -* HTTP RPC endpoint: **http://<your VM public IP>/jsonrpc** -* WebSocket RPC endpoint: **ws://<your VM public IP>/jsonws** +* HTTP RPC endpoint: **http://<your VM public IP>:8545** +* WebSocket RPC endpoint: **ws://<your VM public IP>:8546** ## Optional Private Network Tutorial diff --git a/docs/Tutorials/Quickstarts/Privacy-Quickstart.md b/docs/Tutorials/Quickstarts/Privacy-Quickstart.md index 8d7e0eb8b0e..95e7ab05a7b 100644 --- a/docs/Tutorials/Quickstarts/Privacy-Quickstart.md +++ b/docs/Tutorials/Quickstarts/Privacy-Quickstart.md @@ -75,7 +75,7 @@ The network details are displayed. Name Command State Ports -------------------------------------------------------------------------------------------------------------------------- privacy_bootnode_1 /opt/besu/bootnode_sta ... Up 30303/tcp, 8545/tcp, 8546/tcp -privacy_explorer_1 nginx -g daemon off; Up 0.0.0.0:32771->80/tcp +privacy_explorer_1 nginx -g daemon off; Up 0.0.0.0:25000->80/tcp privacy_minernode_1 /opt/besu/node_start.s ... Up 30303/tcp, 8545/tcp, 8546/tcp privacy_node1_1 /opt/besu/node_start.s ... Up 30303/tcp, 0.0.0.0:20000->8545/tcp, 0.0.0.0:20001->8546/tcp privacy_node2_1 /opt/besu/node_start.s ... Up 30303/tcp, 0.0.0.0:20002->8545/tcp, 0.0.0.0:20003->8546/tcp @@ -85,9 +85,9 @@ privacy_orion2_1 /orion/bin/orion data/data ... Up privacy_orion3_1 /orion/bin/orion data/data ... Up privacy_rpcnode_1 /opt/besu/node_start.s ... Up 30303/tcp, 8545/tcp, 8546/tcp **************************************************************** -JSON-RPC HTTP service endpoint : http://localhost:32771/jsonrpc * -JSON-RPC WebSocket service endpoint : ws://localhost:32771/jsonws * -Web block explorer address : http://localhost:32771 * +JSON-RPC HTTP service endpoint : http://localhost:8545 * +JSON-RPC WebSocket service endpoint : ws://localhost:8546 * +Web block explorer address : http://localhost:25000 * **************************************************************** ``` @@ -140,7 +140,7 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"eth_getTransactionReceipt","para ``` ```bash tab="Example" -curl -X POST --data '{"jsonrpc":"2.0","method":"eth_getTransactionReceipt","params":["0xe0776de9a9d4e30be0025c1308eed8bc45502cba9fe22c504a56e2fd95343e6f"],"id":1}' http://localhost:32771/jsonrpc +curl -X POST --data '{"jsonrpc":"2.0","method":"eth_getTransactionReceipt","params":["0xe0776de9a9d4e30be0025c1308eed8bc45502cba9fe22c504a56e2fd95343e6f"],"id":1}' http://localhost:8545 ``` The transaction receipt for the [privacy marker transaction](../../Concepts/Privacy/Private-Transaction-Processing.md) is displayed with a `contractAddress` of `null`. diff --git a/docs/Tutorials/Quickstarts/Private-Network-Quickstart.md b/docs/Tutorials/Quickstarts/Private-Network-Quickstart.md index 36230e64370..14054a2f24f 100644 --- a/docs/Tutorials/Quickstarts/Private-Network-Quickstart.md +++ b/docs/Tutorials/Quickstarts/Private-Network-Quickstart.md @@ -23,7 +23,7 @@ To run this tutorial, you must have the following installed: - [Docker and Docker-compose](https://docs.docker.com/compose/install/) !!! important - If using MacOS, enable Docker to use up to 4GB of memory on the [_Advanced_ tab in _Preferences_](https://docs.docker.com/docker-for-mac/). + If using MacOS, enable Docker to use up to 4G of memory or 6G of memory if running Privacy examples. The memory settings are found in the [_Advanced_ tab in _Preferences_](https://docs.docker.com/docker-for-mac/). - [Git command line](https://git-scm.com/) @@ -69,7 +69,7 @@ When the process ends, it lists the running services: ----------------------------------------------------------------------------------------------------------------------------------------------------------- besu-quickstart_bootnode_1 /opt/besu/bootnode_start.s ... Up 0.0.0.0:30303->30303/tcp, 0.0.0.0:30303->30303/udp, 8545/tcp, 8546/tcp, 8547/tcp besu-quickstart_elasticsearch_1 /usr/local/bin/docker-entr ... Up 9200/tcp, 9300/tcp - besu-quickstart_explorer_1 nginx -g daemon off; Up 0.0.0.0:32768->80/tcp + besu-quickstart_explorer_1 nginx -g daemon off; Up 0.0.0.0:25000->80/tcp besu-quickstart_filebeat_1 /usr/local/bin/docker-entr ... Up besu-quickstart_grafana_1 /run.sh Up 0.0.0.0:3000->3000/tcp besu-quickstart_kibana_1 /usr/local/bin/dumb-init - ... Up 0.0.0.0:5601->5601/tcp @@ -92,7 +92,7 @@ Followed by a list of the endpoints: JSON-RPC HTTP service endpoint : http://localhost:8545 JSON-RPC WebSocket service endpoint : ws://localhost:8546 GraphQL HTTP service endpoint : http://localhost:8547 - Web block explorer address : http://localhost:32768/ + Web block explorer address : http://localhost:25000/ Prometheus address : http://localhost:9090/graph Grafana address : http://localhost:3000/d/XE4V0WGZz/besu-overview?orgId=1&refresh=10s&from=now-30m&to=now&var-system=All Kibana logs address : http://localhost:5601/app/kibana#/discover @@ -161,7 +161,7 @@ You can run RPC requests on `rpcnode`, the node exposed to the host in order to For the RPC URL, this tutorial uses the placeholder ``. When you run the tutorial, replace this placeholder with the JSON-RPC HTTP service endpoint provided when you list the endpoints. (For example, -`http://localhost:32770/jsonrpc`.) The dynamic docker port mapping changes each time you run the network. +`http://localhost:8545`.) The dynamic docker port mapping changes each time you run the network. {!global/Postman.md!} @@ -369,7 +369,7 @@ module.exports = { }; ``` -Replace `` with your HTTP RPC node endpoint (for example, `http://localhost:32770/jsonrpc`). +Replace `` with your HTTP RPC node endpoint (for example, `http://localhost:8545`). The private key is the miner address, which contains Ether. @@ -443,7 +443,7 @@ We've already connected the private network to MetaMask, so you can skip the [In Continue with the regular tutorial steps from the [Installing and configuring lite-server](https://truffleframework.com/tutorials/pet-shop#installing-and-configuring-lite-server) section and finish the tutorial. -When you adopt pets in the browser and approve the transaction in MetaMask, you'll be able to see the transactions in the block explorer. +When you adopt pets in the browser and approve the transaction in MetaMask, you'll be able to see the transactions in the block explorer at `http://localhost:25000/` ## Stop / Restart Private Network without Removing Containers From 1725bb18bc5774cfe75ad9082e8afe9a8f844ae7 Mon Sep 17 00:00:00 2001 From: Joshua Fernandes Date: Tue, 4 Feb 2020 07:20:40 +1000 Subject: [PATCH 3/3] pr fixes Signed-off-by: Joshua Fernandes --- docs/Tutorials/Quickstarts/Private-Network-Quickstart.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Tutorials/Quickstarts/Private-Network-Quickstart.md b/docs/Tutorials/Quickstarts/Private-Network-Quickstart.md index 21d51dd7810..ad752d936f9 100644 --- a/docs/Tutorials/Quickstarts/Private-Network-Quickstart.md +++ b/docs/Tutorials/Quickstarts/Private-Network-Quickstart.md @@ -23,7 +23,7 @@ To run this tutorial, you must have the following installed: - [Docker and Docker-compose](https://docs.docker.com/compose/install/) !!! important - If using MacOS, enable Docker to use up to 4G of memory or 6G of memory if running Privacy examples. The memory settings are found in the [_Advanced_ tab in _Preferences_](https://docs.docker.com/docker-for-mac/). + If using MacOS, enable Docker to use up to 4GB of memory or 6GB of memory if running Privacy examples. The memory settings are found in the [_Advanced_ tab in _Preferences_](https://docs.docker.com/docker-for-mac/). - [Git command line](https://git-scm.com/) @@ -430,7 +430,7 @@ Once complete and successful, the status of the pet you adopted will show 'Succe ![Dapp UI](../../images/dapp-ui.png) -You can also search for the transaction and view its details in the Block Explorer UI at `http://localhost:25000/` +You can also search for the transaction and view its details in the Block Explorer UI at http://localhost:25000/ ![Dapp UI](../../images/dapp-explorer-tx.png)