HF3 (GrinPlusPlus#46)

* Adding Slatepack box

* adding Finalize button

* updating packages

* moving logs

* Adding SlatepackComponent

* updating packages

* updating backend

* Receive via slatepack

* updating backend

* Updating ValidateAddress to support slatepacks

* Removing submodule

* Adding GrinPlusPlus/ to .gitignore

* Fixing slatepack sends

* updating README

* Fixing foreign receive and finalize APIs

* Returning JSON slate from sendCoins

* Using correct listener_port

* validating if address is set

* fixing left side of wallet

* validating slate

* copying returned slate

* replacing Alert by Dialog

* adding title to dialog

* 1.1.0-beta.2

Co-authored-by: David Burkett <[email protected]>

.gitignore

@@ -24,4 +24,5 @@ yarn-error.log*
 
 .vscode/
 bin/
-dist/
+dist/
+GrinPlusPlus/

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "GrinPlusPlus"]
-	path = GrinPlusPlus
-	url = https://github.com/GrinPlusPlus/GrinPlusPlus.git

README.md

@@ -28,7 +28,7 @@ Grin++ offers several advantages. Here are just a few:
 brew install tor
 brew install rocksdb
 brew install cmake
-git submodule update --init
+git clone [email protected]:GrinPlusPlus/GrinPlusPlus.git
 cd GrinPlusPlus
 rm -Rf build
 mkdir build && cd build

package.json

@@ -1,7 +1,7 @@
 {
   "name": "GrinPlusPlus",
   "productName": "Grin++",
-  "version": "1.0.6",
+  "version": "1.1.0-beta.2",
   "description": "Grin++ Wallet",
   "author": {
     "name": "David Burkett",
@@ -16,42 +16,42 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "@babel/runtime": "^7.9.6",
-    "@blueprintjs/core": "^3.28.0",
+    "@babel/runtime": "^7.10.5",
+    "@blueprintjs/core": "^3.30.0",
     "@craco/craco": "^5.6.4",
     "@types/classnames": "^2.2.9",
     "@types/jest": "^25.2.3",
     "@types/react": "16.9.13",
     "@types/react-dom": "16.9.4",
-    "@types/styled-components": "^5.1.0",
+    "@types/styled-components": "^5.1.1",
     "@types/uuid": "^7.0.4",
-    "acorn": "^7.2.0",
+    "acorn": "^7.3.1",
     "classnames": "^2.2.6",
-    "custom-electron-titlebar": "^3.2.2-hotfix62",
-    "date-fns": "^2.14.0",
-    "easy-peasy": "^3.3.0",
-    "electron-log": "^4.2.0",
-    "electron-store": "^5.1.1",
+    "custom-electron-titlebar": "^3.2.3",
+    "date-fns": "^2.15.0",
+    "easy-peasy": "^3.3.1",
+    "electron-log": "^4.2.2",
+    "electron-store": "^5.2.0",
     "electron-updater": "^4.3.1",
-    "i18next": "^19.4.4",
-    "i18next-browser-languagedetector": "^4.2.0",
-    "immutability-helper": "^3.0.2",
+    "i18next": "^19.6.2",
+    "i18next-browser-languagedetector": "^4.3.1",
+    "immutability-helper": "^3.1.1",
     "node-fetch": "^2.6.0",
     "node-sass": "^4.14.0",
-    "npm": "^6.14.5",
+    "npm": "^6.14.6",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-dropzone": "^10.2.2",
-    "react-i18next": "^11.5.0",
+    "react-i18next": "^11.7.0",
     "react-number-format": "^4.4.0",
     "react-router-dom": "^5.2.0",
     "react-scripts": "^3.4.1",
     "redux-persist-electron-storage": "^2.1.0",
-    "styled-components": "^5.1.0",
+    "styled-components": "^5.1.1",
     "tor-request": "^3.1.0",
-    "ts-retry": "^1.1.1",
+    "ts-retry": "^1.1.2",
     "typed-rest-client": "^1.7.3",
-    "typescript": "^3.9.3",
+    "typescript": "^3.9.7",
     "uninstall": "0.0.0",
     "uuid": "^7.0.3"
   },
@@ -67,14 +67,14 @@
     "@typescript-eslint/eslint-plugin": "^2.34.0",
     "@typescript-eslint/parser": "^2.34.0",
     "cross-env": "^6.0.3",
-    "electron": "^7.3.0",
-    "electron-builder": "^22.6.1",
+    "electron": "^7.3.2",
+    "electron-builder": "^22.7.0",
     "electron-notarize": "^0.3.0",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^6.8.0",
     "eslint-plugin-flowtype": "^4.7.0",
-    "eslint-plugin-react": "^7.20.0",
+    "eslint-plugin-react": "^7.20.3",
     "fetch-mock-jest": "^1.3.0",
     "foreman": "^3.0.1",
     "husky": "^3.1.0",

public/locales/ch/translation.json

@@ -110,5 +110,6 @@
   "invalid_destination_address": "目标地址无效",
   "not_online": "无法连接钱包 ⛔️",
   "outputs": "Outputs",
-  "kernels": "Kernels"
+  "kernels": "Kernels",
+  "slatepack": "Slatepack"
 }

public/locales/de/translation.json

@@ -110,5 +110,6 @@
   "invalid_destination_address": "Zieladresse ist ungültig",
   "not_online": "Brieftasche nicht erreichbar ⛔️",
   "outputs": "Outputs",
-  "kernels": "Kernels"
+  "kernels": "Kernels",
+  "slatepack": "Slatepack"
 }

public/locales/en/translation.json

@@ -110,5 +110,6 @@
   "invalid_destination_address": "Destination address is invalid",
   "not_online": "Wallet not reachable ⛔️",
   "outputs": "Outputs",
-  "kernels": "Kernels"
+  "kernels": "Kernels",
+  "slatepack": "Slatepack"
 }

public/locales/es/translation.json

@@ -110,5 +110,6 @@
   "invalid_destination_address": "Dirección de destino inválida",
   "not_online": "Wallet no se puede conectar ⛔️",
   "outputs": "Outputs",
-  "kernels": "Kernels"
+  "kernels": "Kernels",
+  "slatepack": "Slatepack"
 }

public/locales/fa/translation.json

@@ -110,5 +110,6 @@
   "invalid_destination_address": "آدرس مقصد نامعتبر است",
   "not_online": "کیف پول قابل دسترسی نیست ⛔️",
   "outputs": "Outputs",
-  "kernels": "Kernels"
+  "kernels": "Kernels",
+  "slatepack": "Slatepack"
 }

public/locales/fr/translation.json

@@ -110,5 +110,6 @@
   "invalid_destination_address": "Adresse de destination invalide",
   "not_online": "Wallet non-accessible ⛔️",
   "outputs": "Outputs",
-  "kernels": "Kernels"
+  "kernels": "Kernels",
+  "slatepack": "Slatepack"
 }

public/locales/it/translation.json

@@ -110,5 +110,6 @@
   "invalid_destination_address": "L'indirizzo di destinazione non è valido",
   "not_online": "Il portafoglio non si può connettere ⛔️",
   "outputs": "Outputs",
-  "kernels": "Kernels"
+  "kernels": "Kernels",
+  "slatepack": "Slatepack"
 }

public/locales/pl/translation.json

@@ -110,5 +110,6 @@
   "invalid_destination_address": "Adres docelowy jest nieprawidłowy",
   "not_online": "Portfel nieosiągalny ⛔️",
   "outputs": "Outputs",
-  "kernels": "Kernels"
+  "kernels": "Kernels",
+  "slatepack": "Slatepack"
 }

public/locales/pr/translation.json

@@ -110,5 +110,6 @@
   "invalid_destination_address": "Endereço de destino é inválido",
   "not_online": "Wallet não alcançáve ⛔️",
   "outputs": "Outputs",
-  "kernels": "Kernels"
+  "kernels": "Kernels",
+  "slatepack": "Slatepack"
 }

public/locales/ru/translation.json

@@ -110,5 +110,6 @@
   "invalid_destination_address": "Адрес назначения неверный",
   "not_online": "Кошелек не доступен ⛔️",
   "outputs": "Выходы",
-  "kernels": "Kernels"
+  "kernels": "Kernels",
+  "slatepack": "Slatepack"
 }

public/locales/tr/translation.json

@@ -110,5 +110,6 @@
   "invalid_destination_address": "Destination address is invalid",
   "not_online": "Wallet not reachable ⛔️",
   "outputs": "Outputs",
-  "kernels": "Kernels"
+  "kernels": "Kernels",
+  "slatepack": "Slatepack"
 }

public/locales/ua/translation.json

@@ -110,5 +110,6 @@
   "invalid_destination_address": "Адреса призначення недійсна",
   "not_online": "Гаманець недоступний ⛔️",
   "outputs": "Outputs",
-  "kernels": "Kernels"
+  "kernels": "Kernels",
+  "slatepack": "Slatepack"
 }

src/App.scss

@@ -15,7 +15,7 @@ $pt-dark-popover-box-shadow: $pt-intent-primary;
   margin-left: auto;
   margin-right: auto;
   max-height: calc(100vh - 115px) !important;
-  width: 95%;
+  width: 96%;
 }
 
 .footer {

src/App.tsx

@@ -9,6 +9,7 @@ import { SendGrinContainer } from "./containers/SendGrins";
 import { SignInContainer } from "./containers/SignIn";
 import { SignUpContainer } from "./containers/SingUp";
 import { StatusContainer } from "./containers/Status";
+import { LogsContainer } from "./containers/Logs";
 import { StoreProvider } from "easy-peasy";
 import { WalletContainer } from "./containers/Wallet";
 import store from "./store";
@@ -83,6 +84,9 @@ const App: React.FC = () => {
           <Route path="/status">
             <StatusContainer />
           </Route>
+          <Route path="/logs">
+            <LogsContainer />
+          </Route>
           <Route path="/">
             <InitializerContainer />
           </Route>

src/components/extras/Slatepack.tsx

@@ -0,0 +1,10 @@
+import React from "react";
+import { LargeSlatesBox } from "../styled";
+
+export type SlatepackProps = {
+  slatepack: string;
+};
+
+export const SlatepackComponent = ({ slatepack }: SlatepackProps) => {
+  return <LargeSlatesBox>{slatepack}</LargeSlatesBox>;
+};

src/components/styled/index.tsx

@@ -24,18 +24,48 @@ export const Flex = styled.section`
   margin: 0 auto;
 `;
 
-export const LogsBox = styled.section`
+export const SlatesBox = styled.textarea`
   font-size: 13px;
   width: 100%;
   min-height: 150px;
   max-height: 150px;
   background-color: #171920;
   overflow-y: auto;
-  margin-top: 10px;
   border-radius: 3px;
-  padding: 7px;
+  padding: 10px;
   font-family: Courier New;
   white-space: pre-line;
+  color: #ffffff;
+  resize: none;
+`;
+
+export const LargeSlatesBox = styled.textarea`
+  font-size: 13px;
+  width: 500px;
+  min-height: 300px;
+  max-height: 300px;
+  background-color: #171920;
+  overflow-y: auto;
+  border-radius: 3px;
+  padding: 10px;
+  font-family: Courier New;
+  white-space: pre-line;
+  color: #ffffff;
+  resize: none;
+`;
+
+export const LogsBox = styled.textarea`
+  font-size: 13px;
+  width: 100%;
+  min-height: 100%;
+  max-height: 500px;
+  background-color: #171920;
+  overflow-y: auto;
+  border-radius: 3px;
+  padding: 10px;
+  font-family: Courier New;
+  white-space: pre-line;
+  color: #ffffff;
 `;
 
 export const Title = styled.section`

src/components/transaction/Details.tsx

@@ -176,18 +176,26 @@ export const TansactionDetailsComponent = ({
       <div style={{ textAlign: "center" }}>
         {["sending_not_finalized", "receiving_unconfirmed"].includes(mType) ? (
           <Button
-            text="Cancel Transaction"
+            text={t("cancel_transaction")}
             minimal={true}
             intent={Intent.WARNING}
             onClick={() => onCancelTransactionButtonClickedCb(id)}
           />
         ) : mType === "sending_finalized" ? (
-          <Button
-            text="Repost Transaction"
-            minimal={true}
-            intent={Intent.WARNING}
-            onClick={() => onRepostTransactionButtonClickedCb(id, method)}
-          />
+          <span>
+            <Button
+              text={t("cancel_transaction")}
+              minimal={true}
+              intent={Intent.WARNING}
+              onClick={() => onCancelTransactionButtonClickedCb(id)}
+            />
+            <Button
+              text={t("repost_transaction")}
+              minimal={true}
+              intent={Intent.WARNING}
+              onClick={() => onRepostTransactionButtonClickedCb(id, method)}
+            />
+          </span>
         ) : null}
       </div>
     </div>