Merging v0.9.0 changes from dev to `master

decentralized-identity · Jul 28, 2020 · 39bba04 · 39bba04
2 parents 2f0af0b + 593ea88
commit 39bba04
Show file tree

Hide file tree

Showing 11 changed files with 1,117 additions and 1,487 deletions.
diff --git a/install-guide.md b/install-guide.md
@@ -131,7 +131,10 @@ git clone https://github.com/decentralized-identity/ion
 
 Update the configuration for the Sidetree Bitcoin microservice under `json/testnet-bitcoin-config.json`:
 
-  - Ensure `bitcoinPeerUri` points to the http location of the Bitcoin Core client you setup earlier in this guide (e.g. `http://localhost:18332`).
+  - Ensure `bitcoinPeerUri` points to the http location of the Bitcoin Core client you setup earlier in this guide (e.g. `http://localhost:18332` for testnet and `http://localhost:8332` for mainnet with default Bitcoin Core configuration).
+  - `bitcoinDataDirectory` needs to point to the block files folder:
+    - mainnet: exactly the same as the `datadir` value configured for Bitcoin Core.
+    - testnet: `<datadir>/testnet3`.
   - Ensure `bitcoinWalletImportString` is populated with your private key.
   - Official Bitcoin Core client PRC API requires authentication, so make sure the `bitcoinRpcUsername` & `bitcoinPrcPassword` are populated accordingly.
   - Ensure `mongoDbConnectionString` is pointing to your MongoDB (e.g. `mongodb://localhost:27017/`).

diff --git a/json/mainnet-bitcoin-config.json b/json/mainnet-bitcoin-config.json
@@ -1,4 +1,5 @@
 {
+  "bitcoinDataDirectory": "[FILL THIS IN!]",
   "bitcoinFeeSpendingCutoffPeriodInBlocks": 1,
   "bitcoinFeeSpendingCutoff": 0.001,
   "bitcoinPeerUri": "http://localhost:8332",

diff --git a/json/mainnet-bitcoin-versioning.json b/json/mainnet-bitcoin-versioning.json
@@ -0,0 +1,6 @@
+[
+  {
+    "startingBlockchainTime": 633700,
+    "version": "0.10.0"
+  }
+]
diff --git a/json/mainnet-core-protocol-versioning.json → json/mainnet-core-versioning.json b/json/mainnet-core-protocol-versioning.json → json/mainnet-core-versioning.json
diff --git a/json/testnet-bitcoin-config.json b/json/testnet-bitcoin-config.json
@@ -1,4 +1,5 @@
 {
+  "bitcoinDataDirectory": "[FILL THIS IN!]",
   "bitcoinFeeSpendingCutoffPeriodInBlocks": 1,
   "bitcoinFeeSpendingCutoff": 0.001,
   "bitcoinPeerUri": "http://localhost:18332",

diff --git a/json/testnet-bitcoin-versioning.json b/json/testnet-bitcoin-versioning.json
@@ -0,0 +1,6 @@
+[
+  {
+    "startingBlockchainTime": 1764000,
+    "version": "0.10.0"
+  }
+]
diff --git a/json/testnet-core-protocol-versioning.json → json/testnet-core-versioning.json b/json/testnet-core-protocol-versioning.json → json/testnet-core-versioning.json