Skip to content

Commit

Permalink
Merge pull request #199 from bitholla/testnet
Browse files Browse the repository at this point in the history 
Testnet
  • Loading branch information
@abeikverdi
abeikverdi authored Jul 22, 2020
2 parents d5b5682 + 8260cc5 commit e8afaeb
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 24 deletions.
34 changes: 24 additions & 10 deletions settings/configmap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ ENVIRONMENT_DOCKER_IMAGE_LOCAL_NGINX_VERSION=1.15.8
ENVIRONMENT_LOCAL_NGINX_HTTP_PORT=80
ENVIRONMENT_LOCAL_NGINX_HTTPS_PORT=443

ENVIRONMENT_KUBERNETES_API_SERVER_REPLICAS=2
ENVIRONMENT_KUBERNETES_API_SERVER_REPLICAS=1

ENVIRONMENT_DOCKER_COMPOSE_GENERATE_ENV_ENABLE=true
ENVIRONMENT_DOCKER_COMPOSE_GENERATE_YAML_ENABLE=true
Expand All @@ -138,23 +138,23 @@ ENVIRONMENT_USER_HOLLAEX_CORE_IMAGE_VERSION=$ENVIRONMENT_DOCKER_IMAGE_VERSION
ENVIRONMENT_USER_HOLLAEX_WEB_IMAGE_REGISTRY=bitholla/my-hollaex-web
ENVIRONMENT_USER_HOLLAEX_WEB_IMAGE_VERSION=latest

ENVIRONMENT_KUBERNETES_API_CPU_LIMITS=500m
ENVIRONMENT_KUBERNETES_API_MEMORY_LIMITS=1024Mi
ENVIRONMENT_KUBERNETES_API_CPU_LIMITS=200m
ENVIRONMENT_KUBERNETES_API_MEMORY_LIMITS=512Mi
ENVIRONMENT_KUBERNETES_API_CPU_REQUESTS=10m
ENVIRONMENT_KUBERNETES_API_MEMORY_REQUESTS=1024Mi
ENVIRONMENT_KUBERNETES_API_MEMORY_REQUESTS=512Mi

ENVIRONMENT_KUBERNETES_STREAM_CPU_LIMITS=500m
ENVIRONMENT_KUBERNETES_STREAM_MEMORY_LIMITS=512Mi
ENVIRONMENT_KUBERNETES_STREAM_CPU_LIMITS=200m
ENVIRONMENT_KUBERNETES_STREAM_MEMORY_LIMITS=256Mi
ENVIRONMENT_KUBERNETES_STREAM_CPU_REQUESTS=10m
ENVIRONMENT_KUBERNETES_STREAM_MEMORY_REQUESTS=128Mi

ENVIRONMENT_KUBERNETES_PLUGINS_CPU_LIMITS=500m
ENVIRONMENT_KUBERNETES_PLUGINS_CPU_LIMITS=200m
ENVIRONMENT_KUBERNETES_PLUGINS_MEMORY_LIMITS=512Mi
ENVIRONMENT_KUBERNETES_PLUGINS_CPU_REQUESTS=10m
ENVIRONMENT_KUBERNETES_PLUGINS_MEMORY_REQUESTS=128Mi

ENVIRONMENT_KUBERNETES_ENGINE_CPU_LIMITS=500m
ENVIRONMENT_KUBERNETES_ENGINE_MEMORY_LIMITS=1024Mi
ENVIRONMENT_KUBERNETES_ENGINE_CPU_LIMITS=200m
ENVIRONMENT_KUBERNETES_ENGINE_MEMORY_LIMITS=256Mi
ENVIRONMENT_KUBERNETES_ENGINE_CPU_REQUESTS=10m
ENVIRONMENT_KUBERNETES_ENGINE_MEMORY_REQUESTS=128Mi

Expand All @@ -176,4 +176,18 @@ ENVIRONMENT_KUBERNETES_INFLUXDB_MEMORY_REQUESTS=256Mi
ENVIRONMENT_KUBERNETES_S3_BACKUP_CRONJOB_RULE='0 1 * * *'
ENVIRONMENT_KUBERNETES_S3_BACKUP_CRONJOB_REGION=
ENVIRONMENT_KUBERNETES_S3_BACKUP_CRONJOB_BUCKET=
ENVIRONMENT_KUBERNETES_S3_BACKUP_CRONJOB_TIMEZONE=
ENVIRONMENT_KUBERNETES_S3_BACKUP_CRONJOB_TIMEZONE=

ENVIRONMENT_KUBERNETES_STREAM_SERVER_REPLICAS=1
ENVIRONMENT_KUBERNETES_WEB_SERVER_REPLICAS=1

ENVIRONMENT_KUBERNETES_API_HPA_ENABLE=false
ENVIRONMENT_KUBERNETES_STREAM_HPA_ENABLE=false
ENVIRONMENT_KUBERNETES_WEB_HPA_ENABLE=false
ENVIRONMENT_KUBERNETES_API_HPA_AVGMEMORY=1300000000
ENVIRONMENT_KUBERNETES_STREAM_HPA_AVGMEMORY=300000000
ENVIRONMENT_KUBERNETES_WEB_HPA_AVGMEMORY=500000000

ENVIRONMENT_KUBERNETES_API_HPA_MAXREPLICAS=4
ENVIRONMENT_KUBERNETES_STREAM_HPA_MAXREPLICAS=4
ENVIRONMENT_KUBERNETES_WEB_HPA_MAXREPLICAS=4
2 changes: 1 addition & 1 deletion version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.6
1.5.7
2 changes: 1 addition & 1 deletion web/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hollaex-kit",
"version": "1.5.6",
"version": "1.5.7",
"private": true,
"dependencies": {
"@material/button": "0.7.0",
Expand Down
9 changes: 5 additions & 4 deletions web/src/containers/Signup/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class Signup extends Component {
componentDidMount() {
const affiliation_code = this.getReferralCode();
if (affiliation_code) {
this.props.change(FORM_NAME, 'referral', affiliation_code)
this.setState({ isReferral: true });
}
}
Expand All @@ -70,10 +71,10 @@ class Signup extends Component {
}

onSubmitSignup = (values) => {
const affiliation_code = this.getReferralCode();
if (affiliation_code && !values.referral) {
values.referral = affiliation_code;
}
// const affiliation_code = this.getReferralCode();
// if (affiliation_code && !values.referral) {
// values.referral = affiliation_code;
// }
return performSignup(values)
.then((res) => {
this.setState({ success: true });
Expand Down
16 changes: 8 additions & 8 deletions web/src/containers/TransactionsHistory/utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,12 @@ export const generateTradeHeaders = (symbol, pairs, coins, discount) => {
key: 'price',
exportToCsv: ({ price = 0, size = 0, quick, symbol }) => {
if (pairs[symbol]) {
const { pair_2, increment_size } = pairs[symbol];
const { pair_2, increment_price } = pairs[symbol];
const { min, ...rest } =
coins[pair_2 || BASE_CURRENCY] || DEFAULT_COIN_DATA;
return STRINGS.formatString(
CURRENCY_PRICE_FORMAT,
formatToCurrency(calculatePrice(quick, price, size), increment_size),
formatToCurrency(calculatePrice(quick, price, size), increment_price),
rest.symbol.toUpperCase()
).join('');
} else {
Expand All @@ -156,7 +156,7 @@ export const generateTradeHeaders = (symbol, pairs, coins, discount) => {
},
renderCell: ({ price = 0, size = 0, quick, symbol }, key, index) => {
if (pairs[symbol]) {
const { pair_2, increment_size } = pairs[symbol];
const { pair_2, increment_price } = pairs[symbol];
const { min, ...rest } =
coins[pair_2 || BASE_CURRENCY] || DEFAULT_COIN_DATA;
return (
Expand All @@ -165,7 +165,7 @@ export const generateTradeHeaders = (symbol, pairs, coins, discount) => {
CURRENCY_PRICE_FORMAT,
formatToCurrency(
calculatePrice(quick, price, size),
increment_size
increment_price
),
rest.symbol.toUpperCase()
)}
Expand All @@ -181,12 +181,12 @@ export const generateTradeHeaders = (symbol, pairs, coins, discount) => {
key: 'amount',
exportToCsv: ({ price = 0, size = 0, quick, symbol }) => {
if (pairs[symbol]) {
const { pair_2 } = pairs[symbol];
const { pair_2, increment_price } = pairs[symbol];
const { min, ...rest } =
coins[pair_2 || BASE_CURRENCY] || DEFAULT_COIN_DATA;
return STRINGS.formatString(
CURRENCY_PRICE_FORMAT,
formatToCurrency(calculateAmount(quick, price, size), min),
formatToCurrency(calculateAmount(quick, price, size), increment_price),
rest.symbol.toUpperCase()
).join('');
} else {
Expand All @@ -195,7 +195,7 @@ export const generateTradeHeaders = (symbol, pairs, coins, discount) => {
},
renderCell: ({ price = 0, size = 0, quick, symbol }, key, index) => {
if (pairs[symbol]) {
const { pair_2 } = pairs[symbol];
const { pair_2, increment_price } = pairs[symbol];
const { min, ...rest } =
coins[pair_2 || BASE_CURRENCY] || DEFAULT_COIN_DATA;
return (
Expand All @@ -204,7 +204,7 @@ export const generateTradeHeaders = (symbol, pairs, coins, discount) => {
CURRENCY_PRICE_FORMAT,
formatToCurrency(
calculateAmount(quick, price, size),
min
increment_price
),
rest.symbol.toUpperCase()
)}
Expand Down

0 comments on commit e8afaeb

Please sign in to comment.