Skip to content

Commit

Permalink
add shelley dev config
Browse files Browse the repository at this point in the history
  • Loading branch information
SebastienGllmt committed Oct 19, 2019
1 parent 679169d commit d0c4de3
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 16 deletions.
27 changes: 15 additions & 12 deletions app/components/wallet/WalletAdd.js
Expand Up @@ -12,6 +12,8 @@ import daedalusIcon from '../../assets/images/top-bar/daedalus-migration.inline.
import { MAX_ADA_WALLETS_COUNT } from '../../config/numbersConfig';
import styles from './WalletAdd.scss';

import environmnent from '../../environment';

const messages = defineMessages({
title: {
id: 'wallet.add.page.title',
Expand Down Expand Up @@ -82,7 +84,6 @@ export default class WalletAdd extends Component<Props> {
if (isRestoreActive) {
activeNotification = 'restoreNotificationMessage';
}

return (
<div className={styles.component}>
{/* Setting button */}
Expand All @@ -106,18 +107,20 @@ export default class WalletAdd extends Component<Props> {
<div className={styles.heroRight}>
<div className={styles.heroCardsList}>
{/* Connect to hardware wallet */}
<button
type="button"
className="WalletAdd_btnConnectHW"
onClick={onHardwareConnect}
>
<div className={styles.heroCardsItem}>
<div className={classnames([styles.heroCardsItemBg, styles.bgConnectHW])} />
<div className={styles.heroCardsItemTitle}>
{intl.formatMessage(messages.connectToHWTitle)}
{!environmnent.isShelley() &&
<button
type="button"
className="WalletAdd_btnConnectHW"
onClick={onHardwareConnect}
>
<div className={styles.heroCardsItem}>
<div className={classnames([styles.heroCardsItemBg, styles.bgConnectHW])} />
<div className={styles.heroCardsItemTitle}>
{intl.formatMessage(messages.connectToHWTitle)}
</div>
</div>
</div>
</button>
</button>
}
{/* Create wallet */}
<button
type="button"
Expand Down
2 changes: 2 additions & 0 deletions app/environment.js
Expand Up @@ -32,6 +32,7 @@ export const environment = ((
isJest: () => process.env.NODE_ENV === 'jest' || process.env.NODE_ENV === 'test',
branch: process.env.BRANCH || '',
isDev: () => CONFIG.network.name === NetworkType.DEVELOPMENT,
isShelley: () => CONFIG.network.name === NetworkType.SHELLEY_DEV,
isTest: () => CONFIG.network.name === NetworkType.TEST,
isMainnet: () => environment.NETWORK === NetworkType.MAINNET,
isAdaApi: () => environment.API === 'ada',
Expand All @@ -49,6 +50,7 @@ export const environment = ((
branch: string,
isJest: void => boolean,
isDev: void => boolean,
isShelley: void => boolean,
isTest: void => boolean,
isMainnet: void => boolean,
isAdaApi: void => boolean,
Expand Down
6 changes: 6 additions & 0 deletions babel.config.js
Expand Up @@ -59,6 +59,12 @@ module.exports = function (api) {
'react-hot-loader/babel',
'@babel/plugin-transform-runtime'
]
},
'shelley-dev': {
plugins: [
'react-hot-loader/babel',
'@babel/plugin-transform-runtime'
]
}
}
}
Expand Down
9 changes: 9 additions & 0 deletions chrome/manifest.shelley-dev.js
@@ -0,0 +1,9 @@
import buildManifest from './manifest.template';
import { SEIZA_URL, SEIZA_FOR_YOROI_URL } from './manifestEnvs';

export default buildManifest({
description: '[shelley-dev] Cardano ADA wallet',
defaultTitle: '[shelley-devdev] Yoroi',
contentSecurityPolicy: `default-src 'self' http://localhost:3000 https://localhost:3000 http://localhost:8097; frame-src ${SEIZA_FOR_YOROI_URL} ${SEIZA_URL} https://connect.trezor.io/ https://emurgo.github.io/yoroi-extension-ledger-bridge; script-src 'self' 'unsafe-eval' http://localhost:3000 https://localhost:3000 http://localhost:8097 blob:; object-src 'self'; connect-src https://iohk-mainnet.yoroiwallet.com wss://iohk-mainnet.yoroiwallet.com:443 http://localhost:3000 https://localhost:3000 http://localhost:8080 https://localhost:8080 http://localhost:8097 ws://localhost:8080 ws://localhost:8097 wss://localhost:8080 wss://testnet-yoroi-backend.yoroiwallet.com:443 https://testnet-yoroi-backend.yoroiwallet.com; style-src * 'unsafe-inline' 'self' blob:; img-src 'self' http://localhost:3000 data:;`,
extensionKey: 'pojejnpjgcacmnpkdiklhlnlbkjechfh',
});
16 changes: 13 additions & 3 deletions config/config-types.js
Expand Up @@ -24,9 +24,19 @@ export type NetworkConfigType = {
name: Network
};

export type Network = 'development' | 'mainnet' | 'staging' | 'testnet' | 'test';
export type Network = 'shelley-dev' | 'development' | 'mainnet' | 'staging' | 'testnet' | 'test';
export const NetworkType: {
DEVELOPMENT: Network, MAINNET: Network, STAGING: Network, TESTNET: Network, TEST: Network
SHELLEY_DEV: Network,
DEVELOPMENT: Network,
MAINNET: Network,
STAGING: Network,
TESTNET: Network,
TEST: Network
} = {
DEVELOPMENT: 'development', MAINNET: 'mainnet', STAGING: 'staging', TESTNET: 'testnet', TEST: 'test',
SHELLEY_DEV: 'shelley-dev',
DEVELOPMENT: 'development',
MAINNET: 'mainnet',
STAGING: 'staging',
TESTNET: 'testnet',
TEST: 'test',
};
22 changes: 22 additions & 0 deletions config/shelley-dev.json
@@ -0,0 +1,22 @@
{
"network": {
"protocolMagic": 1097911063,
"backendUrl": "https://testnet-yoroi-backend.yoroiwallet.com",
"websocketUrl": "wss://testnet-yoroi-backend.yoroiwallet.com:443",
"name": "shelley-dev"
},
"app": {
"walletRefreshInterval": 20000,
"serverStatusRefreshInterval": 20000,
"logsBufferSize": 500,
"logsFileSuffix": "-yoroi-shelley-dev.log",
"addressRequestSize": 50,
"txsBodiesRequestSize": 150,
"linearFee": {
"constant": "2",
"coefficient": "1",
"certificate": "4"
},
"genesisHash": "adbdd5ede31637f6c9bad5c271eec0bc3d0cb9efb86a5b913bb55cba549d0770"
}
}
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -4,6 +4,7 @@
"description": "Cardano ADA wallet",
"scripts": {
"dev": "babel-node scripts/start --env 'development'",
"shelley-dev": "babel-node scripts/start --env 'shelley-dev'",
"dev-mock-backend": "babel-node scripts/startWithMockServer.js",
"build": "babel-node scripts/build",
"compress": "babel-node scripts/compress",
Expand Down
2 changes: 1 addition & 1 deletion webpack/customPublicPath.js
Expand Up @@ -2,7 +2,7 @@
/* eslint no-global-assign: 0 camelcase: 0 */
/* eslint no-unused-vars: 0 */

if (process.env.NODE_ENV !== 'development') {
if (process.env.NODE_ENV !== 'development' && process.env.NODE_ENV !== 'shelley-dev') {
__webpack_public_path__ = chrome.extension.getURL('/js/');
} else {
// In development mode,
Expand Down

0 comments on commit d0c4de3

Please sign in to comment.