Merge 1ee782c into 8ebcaf3

.eslintrc.js

@@ -1,6 +1,9 @@
 module.exports = {
   root: true,
   extends: ['plugin:chronobank-react/recommended'],
+  globals: {
+    "i18nJson": true,
+  },
   rules: {
     'space-before-function-paren': ['error', 'always'],
     'import/no-extraneous-dependencies': 'off' // TODO Use webpack resolver possible to solve issues with aliased modules

.gitignore

@@ -7,6 +7,7 @@ coverage/
 .idea/
 *.log
 *.bac
+.vscode
 
 build/
 report/

config/babel.dev.js

@@ -3,24 +3,33 @@
  * Licensed under the AGPL Version 3 license.
  */
 
+const resolver = (module) =>
+  (typeof module === 'string')
+    ? require.resolve(module)
+    : [require.resolve(module[0]), module[1]]
+
 module.exports = {
   cacheDirectory: true,
   presets: [
     'babel-preset-react',
     'babel-preset-env',
     'babel-preset-react-hmre',
     'babel-preset-stage-0',
-  ].map(require.resolve),
+  ].map(resolver),
   plugins: [
     'babel-plugin-transform-decorators-legacy',
     'babel-plugin-syntax-decorators',
-    'babel-plugin-add-module-exports',
     'babel-plugin-syntax-trailing-function-commas',
-    'babel-plugin-transform-runtime',
+    ['babel-plugin-transform-runtime', { polyfill: false }],
     'babel-plugin-transform-object-rest-spread',
     'babel-plugin-transform-react-constant-elements',
     'babel-plugin-transform-class-properties',
-    'babel-plugin-react-css-modules',
+    ['babel-plugin-react-css-modules', {
+      "generateScopedName": "[name]__[local]___[hash:base64:5]",
+      "filetypes": {
+        ".scss": "postcss-scss",
+      },
+    }],
     'react-hot-loader/babel',
-  ].map(require.resolve),
+  ].map(resolver),
 }

config/babel.prod.js

@@ -3,21 +3,30 @@
  * Licensed under the AGPL Version 3 license.
  */
 
+const resolver = (module) =>
+  (typeof module === 'string')
+    ? require.resolve(module)
+    : [require.resolve(module[0]), module[1]]
+
 module.exports = {
   presets: [
     'babel-preset-env',
     'babel-preset-react',
     'babel-preset-stage-0',
-  ].map(require.resolve),
+  ].map(resolver),
   plugins: [
     'babel-plugin-transform-decorators-legacy',
     'babel-plugin-syntax-decorators',
-    'babel-plugin-add-module-exports',
     'babel-plugin-syntax-trailing-function-commas',
-    'babel-plugin-transform-runtime',
+    ['babel-plugin-transform-runtime', { polyfill: false }],
     'babel-plugin-transform-object-rest-spread',
     'babel-plugin-transform-react-constant-elements',
     'babel-plugin-transform-class-properties',
-    'babel-plugin-react-css-modules',
-  ].map(require.resolve),
+    ['babel-plugin-react-css-modules', {
+      "generateScopedName": "[name]__[local]___[hash:base64:5]",
+      "filetypes": {
+        ".scss": "postcss-scss",
+      },
+    }],
+  ].map(resolver),
 }

package.json

@@ -7,6 +7,7 @@
   "license": "AGPL-3.0",
   "devDependencies": {
     "@chronobank/chronomint-presentation": "github:chronobank/ChronoMintPresentation",
+    "@chronobank/core": "*",
     "@chronobank/login": "*",
     "@chronobank/login-ui": "*",
     "archiver": "^2.0.0",
@@ -15,7 +16,6 @@
     "babel-eslint": "^8.1.1",
     "babel-jest": "21.2.0",
     "babel-loader": "7.0.0",
-    "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-syntax-decorators": "^6.13.0",
     "babel-plugin-syntax-trailing-function-commas": "6.22.0",
     "babel-plugin-transform-class-properties": "6.24.1",
@@ -202,6 +202,7 @@
     "yarn": ">=1.0.0"
   },
   "workspaces": [
+    "src/platform",
     "packages/*"
   ]
 }

src/dao/AbstractContractDAO.js → packages/core/dao/AbstractContractDAO.js

@@ -5,14 +5,14 @@
 
 import BigNumber from 'bignumber.js'
 import resultCodes from 'chronobank-smart-contracts/common/errors'
-import validator from 'models/validator'
+import validator from '../models/validator'
 import web3Provider from '@chronobank/login/network/Web3Provider'
-import AbstractModel from 'models/AbstractModel'
-import TxError from 'models/TxError'
-import TxExecModel from 'models/TxExecModel'
+import AbstractModel from '../models/AbstractModel'
+import TxError from '../models/TxError'
+import TxExecModel from '../models/TxExecModel'
 import truffleContract from 'truffle-contract'
-import ipfs from 'utils/IPFS'
-import web3Converter from 'utils/Web3Converter'
+import ipfs from '../utils/IPFS'
+import web3Converter from '../utils/Web3Converter'
 import EventEmitter from 'events'
 
 export const EVENT_NEW_BLOCK = 'TokenNewBlock'

src/dao/AbstractMultisigContractDAO.js → packages/core/dao/AbstractMultisigContractDAO.js

@@ -5,11 +5,11 @@
 
 import BigNumber from 'bignumber.js'
 import resultCodes from 'chronobank-smart-contracts/common/errors'
-import type PendingManagerDAO from 'dao/PendingManagerDAO'
+import type PendingManagerDAO from './PendingManagerDAO'
 import ethABI from 'ethereumjs-abi'
-import type AbstractModel from 'models/AbstractModel'
-import TxError from 'models/TxError'
-import TxExecModel from 'models/TxExecModel'
+import type AbstractModel from '../models/AbstractModel'
+import TxError from '../models/TxError'
+import TxExecModel from '../models/TxExecModel'
 import AbstractContractDAO, { DEFAULT_TX_OPTIONS, TX_FRONTEND_ERROR_CODES } from './AbstractContractDAO'
 import contractsManagerDAO from './ContractsManagerDAO'
 

src/dao/AbstractTokenDAO.js → packages/core/dao/AbstractTokenDAO.js

@@ -3,10 +3,10 @@
  * Licensed under the AGPL Version 3 license.
  */
 
-import type Amount from 'models/Amount'
-import type TxModel from 'models/TxModel'
-import { address } from 'models/validator'
-import TokenModel from 'models/tokens/TokenModel'
+import type Amount from '../models/Amount'
+import type TxModel from '../models/TxModel'
+import { address } from '../models/validator'
+import TokenModel from '../models/tokens/TokenModel'
 import AbstractContractDAO from './AbstractContractDAO'
 
 export const EVENT_NEW_TRANSFER = 'TokenTxTransfer'

src/dao/AssetHolderDAO.js → packages/core/dao/AssetHolderDAO.js

@@ -3,10 +3,10 @@
  * Licensed under the AGPL Version 3 license.
  */
 
-import Amount from 'models/Amount'
+import Amount from '../models/Amount'
 import BigNumber from 'bignumber.js'
 import resultCodes from 'chronobank-smart-contracts/common/errors'
-import tokenService from 'services/TokenService'
+import tokenService from '../services/TokenService'
 import { AssetHolderABI } from './abi'
 import AbstractContractDAO from './AbstractContractDAO'
 import type ERC20DAO from './ERC20DAO'

src/dao/AssetsManagerDAO.js → packages/core/dao/AssetsManagerDAO.js

@@ -4,16 +4,16 @@
  */
 
 import Immutable from 'immutable'
-import web3Converter from 'utils/Web3Converter'
+import web3Converter from '../utils/Web3Converter'
 import web3Provider from '@chronobank/login/network/Web3Provider'
 import { ethereumProvider } from '@chronobank/login/network/EthereumProvider'
 import BigNumber from 'bignumber.js'
-import contractManager from 'dao/ContractsManagerDAO'
-import TxModel from 'models/TxModel'
+import contractManager from './ContractsManagerDAO'
+import TxModel from '../models/TxModel'
 import { unionBy } from 'lodash'
-import OwnerCollection from 'models/wallet/OwnerCollection'
-import OwnerModel from 'models/wallet/OwnerModel'
-import BlacklistModel from 'models/tokens/BlacklistModel'
+import OwnerCollection from '../models/wallet/OwnerCollection'
+import OwnerModel from '../models/wallet/OwnerModel'
+import BlacklistModel from '../models/tokens/BlacklistModel'
 import { AssetsManagerABI, MultiEventsHistoryABI } from './abi'
 import AbstractContractDAO from './AbstractContractDAO'
 import { TX_ISSUE, TX_OWNERSHIP_CHANGE, TX_REVOKE } from './ChronoBankPlatformDAO'

src/dao/BitcoinDAO.js → packages/core/dao/BitcoinDAO.js

@@ -15,11 +15,11 @@ import {
 } from '@chronobank/login/network/BitcoinProvider'
 import EventEmitter from 'events'
 import BigNumber from 'bignumber.js'
-import Amount from 'models/Amount'
-import TokenModel from 'models/tokens/TokenModel'
-import TxModel from 'models/TxModel'
-import TransferExecModel from 'models/TransferExecModel'
-import { bitcoinAddress } from 'models/validator'
+import Amount from '../models/Amount'
+import TokenModel from '../models/tokens/TokenModel'
+import TxModel from '../models/TxModel'
+import TransferExecModel from '../models/TransferExecModel'
+import { bitcoinAddress } from '../models/validator'
 import { EVENT_NEW_TRANSFER, EVENT_UPDATE_BALANCE, EVENT_UPDATE_LAST_BLOCK } from './AbstractTokenDAO'
 
 const EVENT_TX = 'tx'

src/dao/ContractsManagerDAO.js → packages/core/dao/ContractsManagerDAO.js

@@ -3,7 +3,7 @@
  * Licensed under the AGPL Version 3 license.
  */
 
-import * as validator from 'models/validator'
+import * as validator from '../models/validator'
 import { ContractsManagerABI } from './abi'
 import AbstractContractDAO from './AbstractContractDAO'
 import AssetsManagerDAO from './AssetsManagerDAO'

src/dao/ERC20DAO.js → packages/core/dao/ERC20DAO.js

@@ -4,10 +4,10 @@
  */
 
 import BigNumber from 'bignumber.js'
-import Amount from 'models/Amount'
-import TokenModel from 'models/tokens/TokenModel'
-import TxModel from 'models/TxModel'
-import { TXS_PER_PAGE } from 'models/wallet/TransactionsCollection'
+import Amount from '../models/Amount'
+import TokenModel from '../models/tokens/TokenModel'
+import TxModel from '../models/TxModel'
+import { TXS_PER_PAGE } from '../models/wallet/TransactionsCollection'
 import ERC20DAODefaultABI from './abi/ERC20DAODefaultABI'
 import AbstractTokenDAO, { EVENT_APPROVAL_TRANSFER, EVENT_NEW_TRANSFER } from './AbstractTokenDAO'
 import { BLOCKCHAIN_ETHEREUM } from './EthereumDAO'

src/dao/ERC20ManagerDAO.js → packages/core/dao/ERC20ManagerDAO.js

@@ -3,8 +3,8 @@
  * Licensed under the AGPL Version 3 license.
  */
 
-import TokenNoticeModel from 'models/notices/TokenNoticeModel'
-import TokenModel from 'models/tokens/TokenModel'
+import TokenNoticeModel from '../models/notices/TokenNoticeModel'
+import TokenModel from '../models/tokens/TokenModel'
 import { ERC20ManagerABI } from './abi'
 import AbstractContractDAO from './AbstractContractDAO'
 import ethereumDAO, { BLOCKCHAIN_ETHEREUM } from './EthereumDAO'

src/dao/EthereumDAO.js → packages/core/dao/EthereumDAO.js

@@ -5,11 +5,11 @@
 
 import { ethereumProvider } from '@chronobank/login/network/EthereumProvider'
 import BigNumber from 'bignumber.js'
-import Amount from 'models/Amount'
-import TokenModel from 'models/tokens/TokenModel'
-import TxError from 'models/TxError'
-import TxExecModel from 'models/TxExecModel'
-import TxModel from 'models/TxModel'
+import Amount from '../models/Amount'
+import TokenModel from '../models/tokens/TokenModel'
+import TxError from '../models/TxError'
+import TxExecModel from '../models/TxExecModel'
+import TxModel from '../models/TxModel'
 import solidityEvent from 'web3/lib/web3/event'
 import AbstractContractDAO, { DEFAULT_GAS, EVENT_NEW_BLOCK, TX_FRONTEND_ERROR_CODES } from './AbstractContractDAO'
 import AbstractTokenDAO, { EVENT_NEW_TRANSFER, FETCH_NEW_BALANCE } from './AbstractTokenDAO'

src/dao/ExchangeDAO.js → packages/core/dao/ExchangeDAO.js

@@ -3,11 +3,11 @@
  * Licensed under the AGPL Version 3 license.
  */
 
-import tokenService from 'services/TokenService'
+import tokenService from '../services/TokenService'
 import BigNumber from 'bignumber.js'
-import Amount from 'models/Amount'
-import AbstractContractDAO from 'dao/AbstractContractDAO'
-import TokenModel from 'models/tokens/TokenModel'
+import Amount from '../models/Amount'
+import AbstractContractDAO from './AbstractContractDAO'
+import TokenModel from '../models/tokens/TokenModel'
 import ExchangeOrderModel from '../models/exchange/ExchangeOrderModel'
 import { ExchangeABI, MultiEventsHistoryABI } from './abi'
 

src/dao/ExchangeManagerDAO.js → packages/core/dao/ExchangeManagerDAO.js

@@ -4,10 +4,10 @@
  */
 
 import exchangeProvider from '@chronobank/login/network/ExchangeProvider'
-import ExchangeOrderModel from 'models/exchange/ExchangeOrderModel'
-import ExchangesCollection from 'models/exchange/ExchangesCollection'
+import ExchangeOrderModel from '../models/exchange/ExchangeOrderModel'
+import ExchangesCollection from '../models/exchange/ExchangesCollection'
 import BigNumber from 'bignumber.js'
-import web3Converter from 'utils/Web3Converter'
+import web3Converter from '../utils/Web3Converter'
 import { ExchangeManagerABI, MultiEventsHistoryABI } from './abi'
 import AbstractContractDAO from './AbstractContractDAO'
 

src/dao/LHTDAO.js → packages/core/dao/LHTDAO.js

@@ -3,9 +3,9 @@
  * Licensed under the AGPL Version 3 license.
  */
 
-import TokenModel from 'models/tokens/TokenModel'
+import TokenModel from '../models/tokens/TokenModel'
 import type BigNumber from 'bignumber.js'
-import contractsManagerDAO from 'dao/ContractsManagerDAO'
+import contractsManagerDAO from './ContractsManagerDAO'
 import ERC20DAO from './ERC20DAO'
 import { ChronoBankAssetWithFeeProxyABI } from './abi'
 

src/dao/LOCManagerDAO.js → packages/core/dao/LOCManagerDAO.js

@@ -4,12 +4,12 @@
  */
 
 import Immutable from 'immutable'
-import LOCModel from 'models/LOCModel'
-import LOCNoticeModel, { statuses } from 'models/notices/LOCNoticeModel'
-import type TokenModel from 'models/tokens/TokenModel'
-import tokenService from 'services/TokenService'
+import LOCModel from '../models/LOCModel'
+import LOCNoticeModel, { statuses } from '../models/notices/LOCNoticeModel'
+import type TokenModel from '../models/tokens/TokenModel'
+import tokenService from '../services/TokenService'
 import BigNumber from 'bignumber.js'
-import Amount from 'models/Amount'
+import Amount from '../models/Amount'
 import { LOCManagerABI, MultiEventsHistoryABI } from './abi'
 import AbstractMultisigContractDAO from './AbstractMultisigContractDAO'
 import { LHT } from './LHTDAO'

src/dao/MultisigWalletDAO.js → packages/core/dao/MultisigWalletDAO.js

@@ -5,16 +5,16 @@
 
 import BigNumber from 'bignumber.js'
 import resultCodes from 'chronobank-smart-contracts/common/errors'
-import AbstractMultisigContractDAO from 'dao/AbstractMultisigContractDAO'
-import Amount from 'models/Amount'
-import TokenModel from 'models/tokens/TokenModel'
-import TxExecModel from 'models/TxExecModel'
-import MultisigTransactionModel from 'models/wallet/MultisigTransactionModel'
-import MultisigWalletModel from 'models/wallet/MultisigWalletModel'
-import MultisigWalletPendingTxCollection from 'models/wallet/MultisigWalletPendingTxCollection'
-import MultisigWalletPendingTxModel from 'models/wallet/MultisigWalletPendingTxModel'
+import AbstractMultisigContractDAO from './AbstractMultisigContractDAO'
+import Amount from '../models/Amount'
+import TokenModel from '../models/tokens/TokenModel'
+import TxExecModel from '../models/TxExecModel'
+import MultisigTransactionModel from '../models/wallet/MultisigTransactionModel'
+import MultisigWalletModel from '../models/wallet/MultisigWalletModel'
+import MultisigWalletPendingTxCollection from '../models/wallet/MultisigWalletPendingTxCollection'
+import MultisigWalletPendingTxModel from '../models/wallet/MultisigWalletPendingTxModel'
 import { ethereumProvider } from '@chronobank/login/network/EthereumProvider'
-import OwnerModel from 'models/wallet/OwnerModel'
+import OwnerModel from '../models/wallet/OwnerModel'
 import { MultiEventsHistoryABI, WalletABI } from './abi'
 
 export default class MultisigWalletDAO extends AbstractMultisigContractDAO {