Merge pull request #197 from DeFiCh/ci/master

Ci/master
BirthdayResearch · Dec 29, 2020 · a940153 · a940153
2 parents 325d05e + 2dc27dd
commit a940153
Show file tree

Hide file tree

Showing 19 changed files with 173 additions and 27 deletions.
diff --git a/.github/workflows/dev-builds.yml b/.github/workflows/dev-builds.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: linux-build
-          path: 'dist/defi-app-2.1.4.AppImage'
+          path: 'dist/defi-app-2.1.5.AppImage'
 
   build_mac_version:
     runs-on: macos-latest
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: mac-build
-          path: 'dist/defi-app-2.1.4.dmg'
+          path: 'dist/defi-app-2.1.5.dmg'
 
   build_windows_version:
     runs-on: windows-latest
@@ -58,9 +58,9 @@ jobs:
           rm -r -fo win -ErrorAction Ignore
           mkdir win
           cd win
-          curl https://github.com/DeFiCh/ain/releases/download/v1.3.15/defichain-1.3.15-x86_64-w64-mingw32.zip -O defichain-1.3.15-x86_64-w64-mingw32.zip
-          Expand-Archive -LiteralPath .\defichain-1.3.15-x86_64-w64-mingw32.zip -DestinationPath .
-          Copy-Item .\defichain-1.3.15\bin\defid.exe .
+          curl https://github.com/DeFiCh/ain/releases/download/v1.3.16/defichain-1.3.16-x86_64-w64-mingw32.zip -O defichain-1.3.16-x86_64-w64-mingw32.zip
+          Expand-Archive -LiteralPath .\defichain-1.3.16-x86_64-w64-mingw32.zip -DestinationPath .
+          Copy-Item .\defichain-1.3.16\bin\defid.exe .
           cd ..\..
           Copy-Item temp\win\defid.exe binary\win\defid.exe
           icacls binary\win\defid.exe /grant everyone:F
@@ -69,4 +69,4 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: win-build
-          path: 'dist/defi-app Setup 2.1.4.exe'
+          path: 'dist/defi-app Setup 2.1.5.exe'
diff --git a/.github/workflows/release-builds.yml b/.github/workflows/release-builds.yml
@@ -62,9 +62,9 @@ jobs:
           rm -r -fo win -ErrorAction Ignore
           mkdir win 
           cd win
-          curl https://github.com/DeFiCh/ain/releases/download/v1.3.15/defichain-1.3.15-x86_64-w64-mingw32.zip -O defichain-1.3.15-x86_64-w64-mingw32.zip
-          Expand-Archive -LiteralPath .\defichain-1.3.15-x86_64-w64-mingw32.zip -DestinationPath .
-          Copy-Item .\defichain-1.3.15\bin\defid.exe .
+          curl https://github.com/DeFiCh/ain/releases/download/v1.3.16/defichain-1.3.16-x86_64-w64-mingw32.zip -O defichain-1.3.16-x86_64-w64-mingw32.zip
+          Expand-Archive -LiteralPath .\defichain-1.3.16-x86_64-w64-mingw32.zip -DestinationPath .
+          Copy-Item .\defichain-1.3.16\bin\defid.exe .
           cd ..\.. 
           Copy-Item temp\win\defid.exe binary\win\defid.exe
           icacls binary\win\defid.exe /grant everyone:F

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "defi-app",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "DeFi blockchain client ui",
   "main": "./electron-app/build/index.js",
   "author": {

diff --git a/pre-build-linux.sh b/pre-build-linux.sh
@@ -7,8 +7,8 @@ cd ..
 mkdir -p temp
 cd temp && rm -rf linux
 mkdir linux && cd linux
-wget https://github.com/DeFiCh/ain/releases/download/v1.3.15/defichain-1.3.15-x86_64-pc-linux-gnu.tar.gz
-tar -xvf defichain-1.3.15-x86_64-pc-linux-gnu.tar.gz
-cp defichain-1.3.15/bin/defid .
+wget https://github.com/DeFiCh/ain/releases/download/v1.3.16/defichain-1.3.16-x86_64-pc-linux-gnu.tar.gz
+tar -xvf defichain-1.3.16-x86_64-pc-linux-gnu.tar.gz
+cp defichain-1.3.16/bin/defid .
 cd ../.. && cp temp/linux/defid binary/linux/defid
 chmod 777 binary/linux/defid
diff --git a/pre-build-mac.sh b/pre-build-mac.sh
@@ -5,8 +5,8 @@ cd ..
 mkdir -p temp
 cd temp && rm -rf mac
 mkdir mac && cd mac
-wget https://github.com/DeFiCh/ain/releases/download/v1.3.15/defichain-1.3.15-x86_64-apple-darwin11.tar.gz
-tar -xvf defichain-1.3.15-x86_64-apple-darwin11.tar.gz
-cp defichain-1.3.15/bin/defid .
+wget https://github.com/DeFiCh/ain/releases/download/v1.3.16/defichain-1.3.16-x86_64-apple-darwin11.tar.gz
+tar -xvf defichain-1.3.16-x86_64-apple-darwin11.tar.gz
+cp defichain-1.3.16/bin/defid .
 cd ../.. && cp temp/mac/defid binary/mac/defid
 chmod 777 binary/mac/defid
diff --git a/webapp/package.json b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "defi-app",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "DeFi blockchain client ui",
   "author": {
     "name": "DeFiChain Foundation",

diff --git a/webapp/src/app/App.tsx b/webapp/src/app/App.tsx
@@ -19,6 +19,7 @@ import Popover from '../containers/PopOver';
 import EncryptWalletModel from '../containers/PopOver/EncryptWalletModel';
 import WalletPassphraseModel from '../containers/PopOver/WalletPassphraseModel';
 import { getPageTitle } from '../utils/utility';
+import RefreshUtxosModal from '../containers/PopOver/RefreshUtxosModal';
 
 interface AppProps extends RouteComponentProps {
   isRunning: boolean;
@@ -105,6 +106,7 @@ const App: React.FunctionComponent<AppProps> = (props: AppProps) => {
       <WalletPassphraseModel />
       <RestartWalletModel />
       <GeneralReIndexModal />
+      <RefreshUtxosModal />
     </>
   );
 };

diff --git a/webapp/src/constants/configs.ts b/webapp/src/constants/configs.ts
@@ -22,7 +22,7 @@ export const PAYMENT_REQ_LIST_SIZE = 10;
 export const QUEUE_CONCURRENCY = 5;
 export const VERIFY_MNEMONIC_QUIZ_QUESTIONS_LIMIT = 6;
 export const VERIFY_MNEMONIC_QUIZ_OPTIONS_PER_QUESTIONS_LIMIT = 3;
-export const BALANCE_CRON_DELAY_TIME = 120000;
+export const BALANCE_CRON_DELAY_TIME = 30000;
 export const BITCOIN_CLI_REGEX = /bitcoin-cli/g;
 export const DEFI_CLI_TEXT = 'defi-cli';
 export const DEFAULT_ELECTRON_LOG_FORMAT =
@@ -58,6 +58,7 @@ export const UPDATE_MODAL_CLOSE_TIMEOUT = 1000;
 export const ENTROPY_BITS = 256;
 export const RANDOM_WORD_ENTROPY_BITS = 128;
 export const DEFAULT_DFI_FOR_ACCOUNT_TO_ACCOUNT = 0.01;
+export const DEFAULT_DFI_FOR_REFRESH_UTXOS = 0.1;
 export const MINIMUM_UTXOS_FOR_LIQUIDITY = 0.05;
 export const UNDEFINED_STRING = 'undefined';
 export const LIST_TOKEN_PAGE_SIZE = 500;

diff --git a/webapp/src/containers/PopOver/RefreshUtxosModal/index.tsx b/webapp/src/containers/PopOver/RefreshUtxosModal/index.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { Modal, ModalBody } from 'reactstrap';
+import { I18n } from 'react-redux-i18n';
+import Loader from '../../../components/Loader';
+import styles from '../popOver.module.scss';
+
+interface RefreshUtxosModalProps {
+  isRefreshUtxosModalOpen: boolean;
+}
+
+const RefreshUtxosModal: React.FunctionComponent<RefreshUtxosModalProps> = (
+  props: RefreshUtxosModalProps
+) => {
+  const { isRefreshUtxosModalOpen } = props;
+
+  return (
+    <Modal isOpen={isRefreshUtxosModalOpen} centered>
+      <ModalBody>
+        <div className={styles.errorModal}>
+          <Loader className='mb-4' size={28} />
+          <p>{I18n.t('alerts.refreshUtxos')}</p>
+        </div>
+      </ModalBody>
+    </Modal>
+  );
+};
+
+const mapStateToProps = (state) => {
+  const { isRefreshUtxosModalOpen } = state.settings;
+
+  return {
+    isRefreshUtxosModalOpen,
+  };
+};
+
+const mapDispatchToProps = {};
+
+export default connect(mapStateToProps, mapDispatchToProps)(RefreshUtxosModal);
diff --git a/webapp/src/containers/SettingsPage/components/SettingsTabGeneral/index.tsx b/webapp/src/containers/SettingsPage/components/SettingsTabGeneral/index.tsx
@@ -12,6 +12,7 @@ import { openGeneralReIndexModal } from '../../../PopOver/reducer';
 interface SettingsTabGeneralProps {
   launchAtLogin: boolean;
   reindexAfterSaving: boolean;
+  refreshUtxosAfterSaving: boolean;
   minimizedAtLaunch: boolean;
   pruneBlockStorage: boolean;
   blockStorage: number;
@@ -28,6 +29,7 @@ interface SettingsTabGeneralProps {
   handleDropDowns: (data: any, field: any) => any;
   openGeneralReIndexModal: () => void;
   handeReindexToggle: () => void;
+  handeRefreshUtxosToggle: () => void;
 }
 
 const SettingsTabGeneral = (props: SettingsTabGeneralProps) => {
@@ -47,9 +49,11 @@ const SettingsTabGeneral = (props: SettingsTabGeneralProps) => {
     networkOptions,
     network,
     reindexAfterSaving,
+    refreshUtxosAfterSaving,
     handleDropDowns,
     openGeneralReIndexModal,
     handeReindexToggle,
+    handeRefreshUtxosToggle,
   } = props;
 
   return (
@@ -96,6 +100,17 @@ const SettingsTabGeneral = (props: SettingsTabGeneralProps) => {
               />
             </Col>
           </Row>
+          <Row className='mb-5'>
+            <Col md='4'>{I18n.t('containers.settings.refreshUtxos')}</Col>
+            <Col md='8' lg='6'>
+              <SettingsRowToggle
+                handleToggles={handeRefreshUtxosToggle}
+                label={'refreshUtxosAfterSaving'}
+                field={refreshUtxosAfterSaving}
+                fieldName={'refreshUtxosAfterSaving'}
+              />
+            </Col>
+          </Row>
           <Row className='mb-5'>
             <Col md='4'>{I18n.t('containers.settings.utxoConsolidator')}</Col>
             <Col md='8' lg='6'>

diff --git a/webapp/src/containers/SettingsPage/index.tsx b/webapp/src/containers/SettingsPage/index.tsx
@@ -48,6 +48,7 @@ interface SettingsPageProps {
   getSettingOptionsRequest: () => void;
   updateSettings: (data: any) => void;
   changeLanguage: () => void;
+  isRefreshUtxosModalOpen: boolean;
 }
 
 interface SettingsPageState {
@@ -78,6 +79,9 @@ const SettingsPage: React.FunctionComponent<SettingsPageProps> = (
   });
 
   const [reindexAfterSaving, setIsReindexAfterSaving] = useState(false);
+  const [refreshUtxosAfterSaving, setIsRefreshUtxosAfterSaving] = useState(
+    false
+  );
 
   useEffect(() => {
     props.getSettingOptionsRequest();
@@ -94,7 +98,10 @@ const SettingsPage: React.FunctionComponent<SettingsPageProps> = (
     if (!props.isRestart) {
       setIsReindexAfterSaving(false);
     }
-  }, [props.isRestart]);
+    if (!props.isRefreshUtxosModalOpen) {
+      setIsRefreshUtxosAfterSaving(false);
+    }
+  }, [props.isRestart, props.isRefreshUtxosModalOpen]);
 
   useEffect(() => {
     const prevPropsValue =
@@ -137,6 +144,10 @@ const SettingsPage: React.FunctionComponent<SettingsPageProps> = (
     setIsReindexAfterSaving(!reindexAfterSaving);
   };
 
+  const handeRefreshUtxosToggle = () => {
+    setIsRefreshUtxosAfterSaving(!refreshUtxosAfterSaving);
+  };
+
   const handleFractionalNumInputs = (
     event: { target: { name: string; value: string } },
     field: string
@@ -232,6 +243,7 @@ const SettingsPage: React.FunctionComponent<SettingsPageProps> = (
       maximumCount,
       feeRate,
       reindexAfterSaving: reindexAfterSaving,
+      refreshUtxosAfterSaving,
     };
     props.updateSettings(settings);
   };
@@ -283,12 +295,14 @@ const SettingsPage: React.FunctionComponent<SettingsPageProps> = (
             feeRate={feeRate!}
             scriptVerificationThreads={scriptVerificationThreads!}
             reindexAfterSaving={reindexAfterSaving!}
+            refreshUtxosAfterSaving={refreshUtxosAfterSaving}
             handleRegularNumInputs={handleRegularNumInputs}
             handleFractionalInputs={handleFractionalNumInputs}
             handleToggles={handleToggles}
             network={network!}
             handleDropDowns={handleDropDowns}
             handeReindexToggle={handeReindexToggle}
+            handeRefreshUtxosToggle={handeRefreshUtxosToggle}
           />
           <SettingsTabDisplay
             language={language!}
@@ -299,7 +313,9 @@ const SettingsPage: React.FunctionComponent<SettingsPageProps> = (
         </TabContent>
       </div>
       <SettingsTabsFooter
-        isUnsavedChanges={isUnsavedChanges || reindexAfterSaving}
+        isUnsavedChanges={
+          isUnsavedChanges || reindexAfterSaving || refreshUtxosAfterSaving
+        }
         saveChanges={saveChanges}
       />
     </div>
@@ -313,6 +329,7 @@ const mapStateToProps = (state) => {
     appConfig,
     isUpdating,
     isUpdated,
+    isRefreshUtxosModalOpen,
   } = state.settings;
   const { isRestart } = state.popover;
   const { locale } = state.i18n;
@@ -324,6 +341,7 @@ const mapStateToProps = (state) => {
     isUpdated,
     locale,
     isRestart,
+    isRefreshUtxosModalOpen,
   };
 };
 

diff --git a/webapp/src/containers/SettingsPage/reducer.tsx b/webapp/src/containers/SettingsPage/reducer.tsx
@@ -23,6 +23,7 @@ export const initialState = {
   amountUnits: [],
   displayModes: [],
   networkOptions: [],
+  isRefreshUtxosModalOpen: false,
 };
 
 const configSlice = createSlice({
@@ -66,6 +67,12 @@ const configSlice = createSlice({
       state.isUpdating = false;
       state.settingsError = action.payload;
     },
+    refreshUtxosRequest(state) {
+      state.isRefreshUtxosModalOpen = true;
+    },
+    refreshUtxosSuccess(state) {
+      state.isRefreshUtxosModalOpen = false;
+    },
   },
 });
 
@@ -81,6 +88,8 @@ export const {
   updateSettingsRequest,
   updateSettingsSuccess,
   updateSettingsFailure,
+  refreshUtxosRequest,
+  refreshUtxosSuccess,
 } = actions;
 
 export default reducer;
diff --git a/webapp/src/containers/SettingsPage/saga.tsx b/webapp/src/containers/SettingsPage/saga.tsx
@@ -20,6 +20,7 @@ import {
   getAmountUnits,
   getDisplayModes,
   getNetWorkList,
+  refreshUtxosAfterSavingData,
 } from './service';
 import store from '../../app/rootStore';
 import { setupI18n } from '../../translations/i18n';
@@ -117,6 +118,9 @@ export function* updateSettings(action) {
         yield call(shutDownBinary);
         yield call(restartNode, { isReindexReq: true });
       }
+      if (data.refreshUtxosAfterSaving) {
+        yield call(refreshUtxosAfterSavingData);
+      }
     } else {
       yield put({
         type: updateSettingsFailure.type,