+
+
+
+
+
+
+
+
diff --git a/src/layouts/AccessWalletLayout/components/BitfiAppModal/index.js b/src/layouts/AccessWalletLayout/components/BitfiAppModal/index.js
new file mode 100644
index 0000000000..488b69efa7
--- /dev/null
+++ b/src/layouts/AccessWalletLayout/components/BitfiAppModal/index.js
@@ -0,0 +1 @@
+export { default } from './BitfiAppModal';
diff --git a/src/layouts/AccessWalletLayout/components/HardwareModal/HardwareModal.vue b/src/layouts/AccessWalletLayout/components/HardwareModal/HardwareModal.vue
index dbda367621..468acf8c3b 100644
--- a/src/layouts/AccessWalletLayout/components/HardwareModal/HardwareModal.vue
+++ b/src/layouts/AccessWalletLayout/components/HardwareModal/HardwareModal.vue
@@ -56,6 +56,7 @@ import keepkey from '@/assets/images/icons/HardwareWallet/keepkey.svg';
import finney from '@/assets/images/icons/button-finney-hover.png';
import xwallet from '@/assets/images/icons/HardwareWallet/xwallet.svg';
import bcvault from '@/assets/images/icons/HardwareWallet/bcvault.svg';
+import bitfiwallet from '@/assets/images/icons/HardwareWallet/bitfiwallet.svg';
import coolwallet from '@/assets/images/icons/HardwareWallet/coolwallet.svg';
import WalletOption from '../WalletOption';
import { Toast } from '@/helpers';
@@ -76,7 +77,8 @@ import {
XWALLET as XWALLET_TYPE,
FINNEY as FINNEY_TYPE,
COOLWALLET as COOLWALLET_TYPE,
- BCVAULT as BCVAULT_TYPE
+ BCVAULT as BCVAULT_TYPE,
+ BITFI_WALLET as BITFI_WALLET_TYPE
} from '@/wallets/bip44/walletTypes';
export default {
components: {
@@ -100,6 +102,10 @@ export default {
type: Function,
default: () => {}
},
+ bitfiAppOpen: {
+ type: Function,
+ default: () => {}
+ },
openFinney: {
type: Function,
default: () => {}
@@ -198,6 +204,21 @@ export default {
disabled: false,
msg: '',
link: 'https://bc-vault.com/?wpam_id=53'
+ },
+ {
+ name: BITFI_WALLET_TYPE,
+ imgPath: bitfiwallet,
+ text: 'BITFI Wallet',
+ disabled:
+ platform.name.toLowerCase() !== 'chrome' &&
+ platform.name.toLowerCase() !== 'firefox',
+ msg:
+ platform.name.toLowerCase() !== 'chrome' &&
+ platform.name.toLowerCase() !== 'firefox'
+ ? 'Browser not supported by Bitfi'
+ : '',
+ msg: '',
+ link: 'https://bitfi.com/order'
}
]
};
@@ -266,6 +287,10 @@ export default {
this.$refs.hardware.hide();
this.ledgerAppOpen();
break;
+ case BITFI_WALLET_TYPE:
+ this.$refs.hardware.hide();
+ this.bitfiAppOpen();
+ break;
case TREZOR_TYPE:
TrezorWallet()
.then(_newWallet => {
diff --git a/src/layouts/AccessWalletLayout/components/NetworkAndAddressModal/NetworkAndAddressModal.vue b/src/layouts/AccessWalletLayout/components/NetworkAndAddressModal/NetworkAndAddressModal.vue
index dcc39671c2..88eee7ef04 100644
--- a/src/layouts/AccessWalletLayout/components/NetworkAndAddressModal/NetworkAndAddressModal.vue
+++ b/src/layouts/AccessWalletLayout/components/NetworkAndAddressModal/NetworkAndAddressModal.vue
@@ -464,8 +464,15 @@ export default {
});
}, 1000),
unlockWallet() {
+
+
this.decryptWallet([this.currentWallet])
+
.then(() => {
+ //console.log([this.currentWallet])
+ //console.log(this.wallet)
+ //console.log('END')
+
if (this.wallet !== null) {
if (!this.$route.path.split('/').includes('interface')) {
this.$router.push({
diff --git a/src/translations/en_US.js b/src/translations/en_US.js
index e7f21a2d1f..d33fef79f6 100644
--- a/src/translations/en_US.js
+++ b/src/translations/en_US.js
@@ -21,6 +21,7 @@ import coolWalletError from './errors-coolwallet/en_US';
import ledgerError from './errors-ledger/en_US';
import secalotError from './errors-secalot/en_US';
import keepkeyError from './errors-keepkey/en_US';
+import bitfiError from './errors-bitfi/en_US';
import bitboxError from './errors-bitbox/en_US';
import bitbox02Error from './errors-bitbox02/en_US';
import buyHardwareWallet from './other/buy-hardware-wallet/en_US';
@@ -67,6 +68,7 @@ const en_US = {
bcvaultError: bcvaultError,
secalotError: secalotError,
keepkeyError: keepkeyError,
+ bitfiError: bitfiError,
bitboxError: bitboxError,
bitbox02Error: bitbox02Error,
buyHardwareWallet: buyHardwareWallet,
diff --git a/src/translations/errors-bitfi/en_US.json b/src/translations/errors-bitfi/en_US.json
new file mode 100644
index 0000000000..39e8dd4437
--- /dev/null
+++ b/src/translations/errors-bitfi/en_US.json
@@ -0,0 +1,6 @@
+{
+ "not-authenticated": "Please, log in to your Bitfi chrome extension",
+ "not-installed": "Please, install Bitfi chrome extension",
+ "not-supported": "This feature is not supported yet",
+ "wrong-network": "This network is not supported, please, switch to XDC MAINNET"
+}
diff --git a/src/wallets/bip44/bitfiWalletPaths.js b/src/wallets/bip44/bitfiWalletPaths.js
new file mode 100644
index 0000000000..b8af9fd68f
--- /dev/null
+++ b/src/wallets/bip44/bitfiWalletPaths.js
@@ -0,0 +1,2 @@
+import { ethereum } from './paths';
+export default [ethereum];
diff --git a/src/wallets/bip44/walletTypes.js b/src/wallets/bip44/walletTypes.js
index 93d69ae7a7..4728b2e5c3 100644
--- a/src/wallets/bip44/walletTypes.js
+++ b/src/wallets/bip44/walletTypes.js
@@ -16,6 +16,8 @@ const WATCH_ONLY = 'watchOnly';
const XWALLET = 'xwallet';
const BCVAULT = 'bc_vault';
const COOLWALLET = 'cool_wallet';
+const BITFI_WALLET = 'bitfi_wallet';
+
export {
LEDGER,
TREZOR,
@@ -34,5 +36,6 @@ export {
WATCH_ONLY,
XWALLET,
BCVAULT,
- COOLWALLET
+ COOLWALLET,
+ BITFI_WALLET
};
diff --git a/src/wallets/hardware/bitfi/errorHandler.js b/src/wallets/hardware/bitfi/errorHandler.js
new file mode 100644
index 0000000000..f2b4495f3c
--- /dev/null
+++ b/src/wallets/hardware/bitfi/errorHandler.js
@@ -0,0 +1,28 @@
+import { Toast } from '@/helpers';
+import Vue from 'vue';
+const ERRORS = {
+ 'not-installed': 'bitfiError.not-installed',
+ 'not-authenticated': 'bitfiError.not-authenticated',
+ 'not-supported': 'bitfiError.not-supported',
+ 'wrong-network': 'bitfiError.wrong-network'
+};
+const WARNING = {};
+export default err => {
+ const errorValues = Object.keys(ERRORS);
+ const warningValues = Object.keys(WARNING);
+ const foundError = errorValues.find(item => {
+ return item.includes(err.message) || item.includes(err);
+ });
+
+ const foundWarning = warningValues.find(item => {
+ return item.includes(err.message) || item.includes(err);
+ });
+
+ if (foundError) {
+ Toast.responseHandler(Vue.$i18n.t(ERRORS[foundError]), Toast.ERROR);
+ } else if (foundWarning) {
+ Toast.responseHandler(Vue.$i18n.t(WARNING[foundWarning]), Toast.WARN);
+ } else {
+ Toast.responseHandler(err, false);
+ }
+};
diff --git a/src/wallets/hardware/bitfi/index.js b/src/wallets/hardware/bitfi/index.js
new file mode 100644
index 0000000000..3a2cb3b9e3
--- /dev/null
+++ b/src/wallets/hardware/bitfi/index.js
@@ -0,0 +1,123 @@
+import { Transaction } from 'ethereumjs-tx';
+import { BITFI_WALLET, COOLWALLET as coolWalletType } from '../../bip44/walletTypes';
+import HDWalletInterface from '@/wallets/HDWalletInterface';
+import errorHandler from './errorHandler';
+import bip44Paths from '../../bip44';
+import { bufferToHex } from 'ethereumjs-util';
+import store from '@/store';
+import commonGenerator from '@/helpers/commonGenerator';
+import { connectBitfi } from './utils';
+
+const NEED_PASSWORD = false;
+
+class BitfiWallet {
+ constructor() {
+ this.identifier = BITFI_WALLET;
+ this.isHardware = true;
+ this.needPassword = NEED_PASSWORD;
+ this.appPrivateKey = '';
+ this.appPublicKey = '';
+ this.transport = {};
+ this.bitfi = null
+ this.isBitfi = true
+ this.deviceInstance = {};
+ this.supportedPaths = bip44Paths[coolWalletType];
+ }
+
+ init() {
+ return new Promise(async (resolve, reject) => {
+ this.bitfi = await connectBitfi()
+
+ if (!this.bitfi) {
+ reject(new Error('not-installed'))
+ window.open('https://chrome.google.com/webstore/detail/bitfi-xdc-chrome-extensio/hollalkeimdfbjebppaojkookekggehm','_blank');
+ return
+ }
+
+ this.account = await this.bitfi.getAccount()
+ //console.log(this.account)
+ if (!this.account)
+ reject(new Error('not-authenticated'))
+
+ resolve()
+ });
+ }
+
+
+ async getAccount() {
+ const address = this.account.slice(3);
+ const txSigner = async tx => {
+ tx = new Transaction(tx, {
+ common: commonGenerator(store.state.main.network)
+ });
+ const cwTx = {
+ data: bufferToHex(tx.data),
+ gasLimit: bufferToHex(tx.gasLimit),
+ gasPrice: bufferToHex(tx.gasPrice),
+ nonce: bufferToHex(tx.nonce),
+ to: bufferToHex(tx.to),
+ value: bufferToHex(tx.value),
+ chainId: store.state.main.network.type.chainID
+ };
+
+ const networkId = tx.getChainId();
+
+ if (parseInt(this.bitfi.networkID) !== parseInt(cwTx.chainId)) {
+ throw new Error('wrong-network')
+ }
+
+ const data = {
+ amount: BigInt(cwTx.value).toString(),
+ gasPrice: BigInt(cwTx.gasPrice).toString(),
+ gasLimit: BigInt(cwTx.gasLimit).toString(),
+ to: cwTx.to,
+ from: this.account,
+ networkId
+ }
+
+ this.bitfi.request(this.bitfi.subjects.EXPAND)
+
+ let result = await this.bitfi.request(this.bitfi.subjects.SIGN_TX, {
+ timeoutMsec: 60 * 1000,
+ data
+ })
+
+ result = ""
+
+ return {
+ tx: {
+ hash: result
+ }
+ }
+ };
+ const msgSigner = async msg => {
+ throw new Error('not-supported')
+ };
+ return new HDWalletInterface(
+ null,
+ address,
+ this.isHardware,
+ this.identifier,
+ errorHandler,
+ txSigner,
+ msgSigner,
+ null
+ );
+ }
+
+ getCurrentPath() {
+ return this.supportedPaths[0].path;
+ }
+ getSupportedPaths() {
+ return this.supportedPaths;
+ }
+}
+
+const createWallet = async (_, password) => {
+ const _coolWallet = new BitfiWallet();
+ await _coolWallet.init(password);
+ return _coolWallet;
+};
+createWallet.errorHandler = errorHandler;
+
+export default createWallet;
diff --git a/src/wallets/hardware/bitfi/utils.js b/src/wallets/hardware/bitfi/utils.js
new file mode 100644
index 0000000000..b17ea79883
--- /dev/null
+++ b/src/wallets/hardware/bitfi/utils.js
@@ -0,0 +1,35 @@
+
+async function connectBitfi(intervalMsec = 1000, timeoutMsec = 3000) {
+ let bitfi = null
+ return new Promise(async (res, rej) => {
+ try {
+ if (bitfi) {
+ res(bitfi)
+ }
+
+ const deadline = Date.now() + timeoutMsec
+ const inter = setInterval(() => {
+ //console.log('CHECK')
+ if (Date.now() > deadline) {
+ clearInterval(inter)
+ res(bitfi)
+ }
+
+ if (window.bitfi) {
+ bitfi = window.bitfi
+ clearInterval(inter)
+ res(bitfi)
+ }
+ }, intervalMsec)
+ }
+ catch (exc) {
+ clearInterval(inter)
+ console.log(exc)
+ res(bitfi)
+ }
+ })
+}
+
+export {
+ connectBitfi
+}
\ No newline at end of file
diff --git a/src/wallets/hardware/index.js b/src/wallets/hardware/index.js
index e89c9deb79..14d8c665f7 100644
--- a/src/wallets/hardware/index.js
+++ b/src/wallets/hardware/index.js
@@ -6,6 +6,7 @@ import SecalotWallet from './secalot';
import KeepkeyWallet from './keepkey';
import BCVaultWallet from './bcvault';
import CoolWallet from './coolwallet';
+import BitfiWallet from './bitfi';
export {
BitBoxWallet,
@@ -15,5 +16,6 @@ export {
SecalotWallet,
KeepkeyWallet,
BCVaultWallet,
- CoolWallet
+ CoolWallet,
+ BitfiWallet
};
diff --git a/src/wallets/index.js b/src/wallets/index.js
index 5c3cd43e6a..9ca2a5d894 100644
--- a/src/wallets/index.js
+++ b/src/wallets/index.js
@@ -6,7 +6,8 @@ import {
SecalotWallet,
KeepkeyWallet,
BCVaultWallet,
- CoolWallet
+ CoolWallet,
+ BitfiWallet
} from './hardware';
import WalletInterface from './WalletInterface';
import { MnemonicWallet } from './software';
@@ -17,6 +18,7 @@ import {
} from './hybrid';
export {
+ BitfiWallet,
LedgerWallet,
TrezorWallet,
BitBoxWallet,
+
+ Connecting to Bitfi wallet
+
+
+
+ {{ dropDownDefaultText }}
+
+
+
+ {{ path.label }} - {{ path.path }}
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+ {{ selectedApp.network.name_long }}
+
+
+
+
+
+
+
+ {{ app.network.name_long }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('common.cancel') }}
+
+
+ {{ $t('accessWallet.path.add-custom') }}
+
+