Make doc a bit more user-friendly by using default postgres port (Fix #498)

Author: NicolasDorier

NBXplorer/Backend/Repository.cs

@@ -388,9 +388,15 @@ FROM unnest(@records) AS r (script),
 				           keypath, descriptors_scripts_metadata->>'redeem' redeem, 
 				           descriptors_scripts_metadata->>'blindedAddress' blinded_addr, 
 				           descriptors_scripts_metadata->>'blindingKey' blindingKey, 
+<<<<<<< Updated upstream
 				           descriptor_metadata->>'descriptor' descriptor
 				    FROM nbxv1_keypath_info ki 
 				    WHERE ki.code=@code AND ki.script=r.script
+=======
+				           descriptor_metadata->>'feature' feature
+				    FROM nbxv1_keypath_info ki
+				    WHERE ki.code=@code AND ki.script=r.script {query.GetKeyPathInfoPredicate()}
+>>>>>>> Stashed changes
 				) ts
 				JOIN wallets w USING(wallet_id)",
 	new { code = Network.CryptoCode, records = scripts.Select(s => s.ToHex()).ToArray() });
@@ -400,8 +406,6 @@ JOIN wallets w USING(wallet_id)",
 				if (r.derivation is not null && r.keypath is null)
 					continue;
 				BitcoinAddress addr = GetAddress(r);
-				bool isExplicit = r.derivation is null;
-				bool isDescriptor = !isExplicit;
 				var script = Script.FromHex(r.script);
 				DerivationStrategyBase derivationStrategy = r.derivation is not null ? Network.DerivationStrategyFactory.Parse(r.derivation) : null;
 				var keypath = r.keypath is not null ? KeyPath.Parse(r.keypath) : null;

README.md

@@ -123,7 +123,7 @@ On Linux:
 Example, if you have ltc node and btc node on regtest (default configuration), and want to connect to them: (see documentation for other options in the [postgres connection string](https://www.npgsql.org/doc/connection-string-parameters.html))
 
 ```bash
-./run.sh --chains=btc,ltc --network=regtest --postgres "User ID=postgres;Host=127.0.0.1;Port=39382;Database=nbxplorer"
+./run.sh --chains=btc,ltc --network=regtest --postgres "User ID=postgres;Host=127.0.0.1;Port=5432;Database=nbxplorer"
 ```
 
 ## How to use the API?