Merge pull request #74 from haven-protocol-org/develop

Merge develop (Audit)

client/package.json

@@ -1,13 +1,13 @@
 {
   "name": "haven_web_wallet",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "private": true,
   "dependencies": {
     "assert": "^2.0.0",
     "big-integer": "^1.6.51",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0",
-    "haven-wallet-core": "^4.1.1",
+    "haven-wallet-core": "^4.2.0",
     "history": "^5.3.0",
     "https-browserify": "^1.0.0",
     "nth-check": "^2.1.1",

client/src/constants/env.ts

@@ -42,6 +42,28 @@ export const getPort = () => {
   return window.location.port;
 };
 
+export const getForkHeights = () => {
+  if (isMainnet()) {
+    if (isDevMode()) {
+      return {
+        HF_VERSION_SUPPLY_AUDIT: 1732000,
+        HF_VERSION_SUPPLY_AUDIT_END: 1732100,
+        HF_VERSION_VBS_DISABLING: 1732200
+      }
+    }
+    return {
+      HF_VERSION_SUPPLY_AUDIT: 1752270,
+      HF_VERSION_SUPPLY_AUDIT_END: 1783950,
+      HF_VERSION_VBS_DISABLING: 1788990
+    }
+  }
+  return {
+    HF_VERSION_SUPPLY_AUDIT: 1,
+    HF_VERSION_SUPPLY_AUDIT_END: 2,
+    HF_VERSION_VBS_DISABLING: 3
+  }
+}
+
 let apiUrl;
 
 if (isWeb()) {

client/src/constants/notificationList.ts

@@ -12,6 +12,8 @@ export const WALLET_NEEDS_CONNECTION = "wallet_needs_connection";
 export const WALLET_IS_CONNECTING = "wallet_is_connecting";
 export const WALLET_CONNECT_SUCCEED = "wallet_connect_succeed";
 
+export const AUDIT_SUCCEED_MESSAGE = "audit_succeed_message";
+
 export const notificationList = [
   {
     key: TRANSFER_SUCCEED_MESSAGE,
@@ -357,4 +359,10 @@ export const notificationList = [
     type: NotificationType.ERROR,
     description: WALLET_NEEDS_CONNECTION,
   },
+  {
+    key: AUDIT_SUCCEED_MESSAGE,
+    code: 0,
+    message: "Your audit was successfully submitted!",
+    type: NotificationType.SUCCESS,
+  },
 ];

client/src/platforms/desktop/components/modalContainer/index.tsx

@@ -9,6 +9,7 @@ import { LoginOnboardingModal } from "platforms/desktop/components/modals/loginO
 import { QRCodeModal } from "../modals/showQRCode";
 import { ManageAddressModal } from "../modals/manageAddressModal";
 import { RescanBCMModal } from "../modals/rescanBCModal";
+import { AuditModal } from "../modals/confirmAuditModal";
 
 class ModalContainer extends React.Component<any, any> {
   render() {
@@ -29,6 +30,8 @@ class ModalContainer extends React.Component<any, any> {
 //        return <LoginOnboardingModal />;
       case MODAL_TYPE.RescanBC:
         return <RescanBCMModal />;
+      case MODAL_TYPE.ConfirmAudit:
+        return <AuditModal />;
     }
     return null;
   }

client/src/platforms/desktop/components/modals/confirmAuditModal.tsx

@@ -0,0 +1,95 @@
+import * as React from "react";
+import { Modal } from "shared/components/modal";
+import { HavenAppState } from "platforms/desktop/reducers/index.js";
+import { connect } from "react-redux";
+import { hideModal } from "shared/actions/modal";
+import { AuditProcessInfo } from "shared/reducers/auditProcess";
+import { confirmAudit, resetAuditProcess } from "shared/actions/audit";
+import Confirm from "shared/components/confirm";
+import { Container, Information, Url } from "shared/components/_transactions/exchange/styles";
+
+interface ConfirmTxModalProps {
+  audit: AuditProcessInfo;
+  confirmAudit: (metaList: Array<string>) => void;
+  resetAuditProcess: () => void;
+  hideModal: () => void;
+}
+
+class AuditM extends React.Component<any, any> {
+  state = {
+    checked: false,
+    loading: false,
+  };
+
+  onAgreementChange = () => {
+    this.setState({
+      checked: !this.state.checked,
+    });
+  };
+
+  onCancel() {
+    this.props.hideModal();
+    this.props.resetAuditProcess();
+  }
+
+  onConfirm() {
+    const { metaList } = this.props.audit;
+
+    this.setState({
+      loading: true,
+    });
+    setTimeout(() => {
+      this.props.confirmAudit(metaList);
+    }, 30000);
+  }
+
+  render() {
+    //const { isLoading } = this.state;
+    return (
+      <Modal
+        title="Audit Confirmation"
+        description="Please read and agree to the terms below before proceeding"
+        leftButton="Cancel"
+        rightButton="Confirm"
+        disabledLeft={false}
+        disabledRight={!this.state.checked}
+        isLoading={this.state.loading}
+        onCancel={() => this.onCancel()}
+        onConfirm={() => this.onConfirm()}
+      >
+        <Information>
+        <strong>Note:</strong> Your entire balance may be locked and unusable for the entirety of the ~20m unlock priority time. However, this
+        amount will be unlocked and usable once the <strong>{this.props.audit.metaList.length} audit transactions</strong> is/are complete.
+        To understand why this happens and how it might impact your experience,
+        please{" "}
+        <strong>
+          <Url
+            target="_blank"
+            href="https://havenprotocol.org/knowledge/haven-transactions/"
+          >
+            click here.
+          </Url>
+        </strong>
+        </Information>
+        <Container>
+          <Confirm
+            description="I accept the ~20m Unlock Time, Details, Terms & Fees."
+            checked={this.state.checked}
+            onChange={this.onAgreementChange}
+            label=""
+          />
+        </Container>
+      </Modal>
+    );
+  }
+}
+
+const mapStateToProps = (state: HavenAppState) => ({
+  audit: state.auditProcess
+});
+
+export const AuditModal = connect(mapStateToProps, {
+  confirmAudit,
+  hideModal,
+  resetAuditProcess
+})(AuditM);

client/src/platforms/desktop/reducers/index.ts

@@ -21,6 +21,8 @@ import modal from "shared/reducers/modal";
 import { WebAppState } from "platforms/web/reducers";
 import { storedWallets } from "./storedWallets";
 import { circulatingSupply } from "shared/reducers/circulatingSupply";
+import auditStatus from "shared/reducers/auditStatus";
+import { auditProcess } from "shared/reducers/auditProcess";
 
 const appReducer = combineReducers({
   theme,
@@ -42,7 +44,9 @@ const appReducer = combineReducers({
   modal,
   connectedNode,
   nodeList,
-  circulatingSupply
+  circulatingSupply,
+  auditStatus,
+  auditProcess
 });
 
 const rootReducer = (state: any, action: AnyAction) => {

client/src/platforms/web/reducers/index.ts

@@ -18,6 +18,8 @@ import modal from "shared/reducers/modal";
 import { STOP_WALLET_SESSION } from "shared/actions/types";
 import { connectedNode } from "platforms/desktop/reducers/selectedNode"
 import { circulatingSupply } from "shared/reducers/circulatingSupply";
+import auditStatus from "shared/reducers/auditStatus";
+import { auditProcess } from "shared/reducers/auditProcess";
 
 const appReducer = combineReducers({
   theme,
@@ -35,7 +37,9 @@ const appReducer = combineReducers({
   walletCreation,
   modal,
   connectedNode,
-  circulatingSupply
+  circulatingSupply,
+  auditStatus,
+  auditProcess
 });
 
 const rootReducer = (state: any, action: AnyAction) => {

client/src/shared/App.js

@@ -15,6 +15,7 @@ import Loader from "shared/components/loader";
 import { AssetsDesktop } from "platforms/desktop/pages/_wallet/assets";
 import { HavenDetailWithParams } from "platforms/desktop/pages/_wallet/details";
 import { ExchangePage } from "shared/pages/_wallet/exchange";
+import { AuditPage } from "shared/pages/_wallet/audit";
 import { HavenTransfer } from "platforms/desktop/pages/_wallet/transfer";
 import { SettingsDesktop } from "platforms/desktop/pages/_wallet/settings";
 import { SettingsWeb } from "platforms/web/pages/_wallet/settings";
@@ -43,6 +44,7 @@ class App extends Component {
           <Route path="transfer" element={<HavenTransfer />}/>
           <Route path="settings" element={isDesktop() ? <SettingsDesktop /> : <SettingsWeb />}/>
           <Route path="convert"  element={<ExchangePage />} />
+          <Route path="audit"  element={<AuditPage />} />
         </Route>
         <Route path="*" element={<Navigate to="/" replace />} />
         </Routes>