From 7dd88bf03a93ff50e91268f6fae0f2bf3aba6609 Mon Sep 17 00:00:00 2001 From: Taylor Hornby Date: Tue, 27 Aug 2019 11:29:06 -0600 Subject: [PATCH 1/6] Use the correct branches --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c30d48e..063a017 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ container. The development environment currently supports building: - `zcashd` -- `librustzcash` (preview branch) -- `lightwalletd` (preview branch) +- `librustzcash` +- `lightwalletd` - `zcash-android-wallet-sdk` (preview branch) - `zcash-android-wallet-poc` @@ -41,7 +41,7 @@ Now, clone all of the projects you want to work on into the `mount/` directory: cd mount git clone git@github.com:zcash/zcash.git git clone git@github.com:zcash-hackworks/lightwalletd.git -git clone git@github.com:str4d/librustzcash.git --branch preview +git clone git@github.com:str4d/librustzcash.git git clone git@github.com:zcash/zcash-android-wallet-sdk.git --branch preview git clone git@github.com:zcash/zcash-android-wallet-poc.git cd .. From 8732d62977bc5ae6ac55552cdc82d95973d65d56 Mon Sep 17 00:00:00 2001 From: Taylor Hornby Date: Tue, 27 Aug 2019 11:36:16 -0600 Subject: [PATCH 2/6] Use zcash/librustzcash instead of str4d/librustzcash --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 063a017..8f0bbc1 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Now, clone all of the projects you want to work on into the `mount/` directory: cd mount git clone git@github.com:zcash/zcash.git git clone git@github.com:zcash-hackworks/lightwalletd.git -git clone git@github.com:str4d/librustzcash.git +git clone git@github.com:zcash/librustzcash.git git clone git@github.com:zcash/zcash-android-wallet-sdk.git --branch preview git clone git@github.com:zcash/zcash-android-wallet-poc.git cd .. From b0affc6714eb79ba92af3df6b25df5367e2c1fdb Mon Sep 17 00:00:00 2001 From: Taylor Hornby Date: Tue, 27 Aug 2019 15:11:16 -0600 Subject: [PATCH 3/6] Improve build instructions --- README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8f0bbc1..133ac80 100644 --- a/README.md +++ b/README.md @@ -106,8 +106,8 @@ cargo build --release ``` cd /mount/lightwalletd -go run cmd/ingest/main.go <...> -go run cmd/server/main.go <...> +go build -o server cmd/server/main.go +go build -o ingest cmd/ingest/main.go ``` **`zcash-android-wallet-sdk`** @@ -117,6 +117,13 @@ cd /mount/zcash-android-wallet-sdk ./gradlew clean assembleZcashtestnetRelease ``` +You can also build the `memo` sample app: + +``` +cd samples/memo +./gradlew :sdk:assemblezcashtestnetdebug :app:assembledebug +``` + **`zcash-android-wallet-poc`** First, generate a `google-services.json` file from [Google From c1cbf8e73255d2b05189d783773398225b4bc043 Mon Sep 17 00:00:00 2001 From: Taylor Hornby Date: Tue, 27 Aug 2019 15:19:00 -0600 Subject: [PATCH 4/6] Predict obsolescence of the docs --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 133ac80..b2f4bca 100644 --- a/README.md +++ b/README.md @@ -151,6 +151,10 @@ Cheat Sheet above.** We will set up: ### Server-Side +**Note:** These instructions will need to be updated [once lightwalletd no +longer uses ZMQ to interact with +zcashd](https://github.com/zcash-hackworks/lightwalletd/pull/43) + First, start the `lightwalletd` ingestor: ``` From d76b3005c0a5b49e8f16facd493215100dd6c8f3 Mon Sep 17 00:00:00 2001 From: Taylor Hornby Date: Tue, 27 Aug 2019 15:28:11 -0600 Subject: [PATCH 5/6] More reasonable resolution --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b2f4bca..9a5bd88 100644 --- a/README.md +++ b/README.md @@ -247,7 +247,7 @@ To run the app in the Android emulator, first start a VNC server for the emulator to use to serve its display: ``` -vncserver :1 -geometry 1080x1920 -depth 24 +vncserver :1 -geometry 600x800 -depth 24 ``` This will output a message along the lines of: From 6d044cb353b389dc0483f1232eef41ce1404dace Mon Sep 17 00:00:00 2001 From: Taylor Hornby Date: Tue, 27 Aug 2019 16:38:49 -0600 Subject: [PATCH 6/6] Improve requirements docs --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a5bd88..427f0db 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,12 @@ The development environment currently supports building: ## Quick Start -**Requirements:** Docker, KVM and a VNC client on the host (for the Android emulator), 30+GB free disk space. +**Requirements:** Docker, KVM and a VNC client on the host (for the Android +emulator), 30+GB free disk space. You'll need enough memory to run zcashd and +the emulator, I suggest a minimum of 8GB. + +**OSX Support:** The emulator will be insanely slow on OSX (to the point where +it's not even usable) because there, it has to emulate the device's CPU. First, checkout this repository: