Merge branch 'master' into fix-send-page-loading

docker/regtest/readme.md

@@ -1,7 +1,31 @@
-# Docker setup for running JoinMarket in regtest mode
+# Docker setup for running Jam in regtest mode
 
 This setup will help you set up a regtest environment quickly.
-It starts two JoinMarket containers, hence not only API calls but also actual CoinJoin transactions can be tested.
+It starts multiple JoinMarket containers, hence not only API calls but also actual CoinJoin transactions can be tested.
+Communication between these containers is done via Tor (if internet connection is available) and IRC (locally running container).
+
+## Common flow
+```sh
+# (optional) once in a while rebuild the images
+npm run regtest:rebuild
+
+# start the regtest environment
+npm run regtest:up
+
+# fund wallets and start maker
+./docker/regtest/init-setup.sh
+
+# mine blocks in regtest periodically
+npm run regtest:mine
+
+[...]
+
+# stop the regtest environment
+npm run regtest:down
+
+# (optional) wipe all test data and start from scratch next time
+npm run regtest:clear
+```
 
 ## Commands
 
@@ -41,6 +65,8 @@ The second JoinMarket container is based on `joinmarket-webui/joinmarket-webui-d
 (username `joinmarket` and pass `joinmarket` for Basic Authentication).
 This is useful if you want to perform regression tests.
 
+The third JoinMarket container acts as [Directory Node](https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/master/docs/onion-message-channels.md#directory) and exists solely to enable communication between peers.
+
 ### Rebuild
 
 In order to incorporate the current contents of `master` branch, simply rebuild the joinmarket images from scratch.
@@ -69,6 +95,13 @@ docker exec -t jm_regtest_joinmarket git log --oneline -1
 
 Some helper scripts are included to make recurring tasks and interaction with the containers easier.
 
+### `npm run regtest:mine`
+
+Mine regtest blocks in a fixed interval (current default is every 10 seconds).
+This is useful for features that await confirmations or need incoming blocks regularly.
+e.g. This is necessary for scheduled transactions to execute successfully.
+
+
 ### `init-setup.sh`
 
 This script helps in providing both JoinMarket containers a wallet with spendable coins and starting the Maker Service in the secondary container.

package.json

@@ -15,33 +15,32 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.1.4",
     "@testing-library/user-event": "^13.5.0",
-    "@types/jest": "^27.4.1",
-    "@types/node": "^17.0.26",
+    "@types/jest": "^27.5.1",
+    "@types/node": "^17.0.35",
     "@types/react": "^17.0.43",
     "@types/react-dom": "^17.0.14",
     "bootstrap": "^5.1.3",
     "buffer": "^6.0.3",
     "conventional-changelog": "^3.1.25",
     "formik": "^2.2.9",
     "http-proxy-middleware": "^2.0.6",
-    "husky": "^7.0.4",
-    "i18next": "^21.6.16",
+    "husky": "^8.0.1",
+    "i18next": "^21.8.4",
     "i18next-browser-languagedetector": "^6.1.4",
     "jest-watch-typeahead": "^0.6.5",
     "jest-websocket-mock": "^2.3.0",
-    "lint-staged": "^12.4.0",
+    "lint-staged": "^12.4.2",
     "moving-letters": "^1.0.1",
-    "nth-check": ">=2.0.1",
     "prettier": "^2.6.2",
     "qrcode": "^1.5.0",
     "react": "^17.0.2",
-    "react-bootstrap": "^2.3.0",
+    "react-bootstrap": "^2.4.0",
     "react-dom": "^17.0.2",
-    "react-i18next": "^11.16.7",
+    "react-i18next": "^11.16.9",
     "react-router-bootstrap": "^0.26.1",
     "react-router-dom": "^6.3.0",
     "react-scripts": "^5.0.1",
-    "typescript": "^4.6.3",
+    "typescript": "^4.7.2",
     "web-vitals": "^2.1.4"
   },
   "dependencies": {

src/components/App.jsx

@@ -100,7 +100,7 @@ export default function App() {
         </div>
       )}
       <Navbar />
-      <rb.Container as="main" className="py-5">
+      <rb.Container as="main" className="py-3 py-sm-5">
         {sessionConnectionError && (
           <rb.Alert variant="danger">
             {t('app.alert_no_connection', { connectionError: sessionConnectionError.message })}.