Merge pull request #1108 from poanetwork/issue#1045

(Fix) crowdsale config should support exec-id and address of proxy as well
poanetwork · Aug 28, 2018 · c0a7993 · c0a7993
2 parents d7f3a21 + 1731b89
commit c0a7993
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/src/components/Common/config.js b/src/components/Common/config.js
@@ -10,9 +10,10 @@
 }
 
 export const CrowdsaleConfig = {
-  crowdsaleContractURL: '0x338f47C1AA1DBdB56DfEA17cc376C0b21f4fbDa2',
   networkID: networks.sokolPOA,
-  showHeaderAndFooterInIframe: true
+  showHeaderAndFooterInIframe: true,
+  execID: '',
+  proxyAddress: '0xf638119be6229634b3c2f7e234bfe38b368016d5'
 };*/
 
 export const CrowdsaleConfig = {}
diff --git a/src/components/crowdsale/index.js b/src/components/crowdsale/index.js
@@ -144,7 +144,7 @@ export class Crowdsale extends React.Component {
     const { crowdsale } = contractStore
     const { proxyName } = crowdsaleStore
     let queryStr = ''
-    if (!CrowdsaleConfig.crowdsaleContractURL || !CrowdsaleConfig.networkID) {
+    if (!CrowdsaleConfig.proxyAddress || !CrowdsaleConfig.networkID) {
       const crowdsaleParamVal = crowdsale.execID || (contractStore[proxyName] ? contractStore[proxyName].addr : null)
       if (crowdsaleParamVal) {
         let crowdsaleParam

diff --git a/src/components/crowdsale/utils.js b/src/components/crowdsale/utils.js
@@ -6,7 +6,7 @@ import {
 } from '../../utils/blockchainHelpers'
 import { contractStore, crowdsalePageStore, tokenStore, web3Store, crowdsaleStore } from '../../stores'
 import { toJS } from 'mobx'
-import { _getAddr, _getExecID, removeTrailingNUL, toBigNumber } from '../../utils/utils'
+import { getAddrFromQuery, getExecIDFromQuery, isAddressValid, removeTrailingNUL, toBigNumber } from '../../utils/utils'
 import { BigNumber } from 'bignumber.js'
 import logdown from 'logdown'
 import { CrowdsaleConfig } from '../Common/config'
@@ -819,23 +819,23 @@ export const getInitializeDataFromContractStore = async () => {
 }
 
 export const getExecID = () => {
-  return CrowdsaleConfig.crowdsaleContractURL || _getExecID()
+  return CrowdsaleConfig.execID || getExecIDFromQuery()
 }
 
 export const getAddr = async () => {
   try {
     let address
 
     // First: add the contract config if exist
-    if (CrowdsaleConfig && CrowdsaleConfig.crowdsaleContractURL) {
-      address = CrowdsaleConfig.crowdsaleContractURL
+    if (CrowdsaleConfig && CrowdsaleConfig.proxyAddress) {
+      address = isAddressValid(CrowdsaleConfig.proxyAddress)
     } else {
-      address = _getAddr()
+      address = getAddrFromQuery()
     }
 
     // Second: get the addr and validate if is a valid address
     if (!address) {
-      return sendAddressError(`There is no addr`)
+      return handleAddressError(`There is no addr`)
     }
 
     // Exist a race condition between clear the storage an initialize data from contract, so ...
@@ -851,22 +851,22 @@ export const getAddr = async () => {
     const appExecIdVar = await app_exec_id().call()
 
     if (!appExecIdVar) {
-      return sendAddressError(`There is no app exec id`)
+      return handleAddressError(`There is no app exec id`)
     }
 
     // Four: validate that exec id that exec-id of this Proxy smart-contract exists in Auth-os registry
     let ownerAccount = await getAdmin().call()
     if (!ownerAccount) {
-      return sendAddressError(`There is no owner account `)
+      return handleAddressError(`There is no owner account `)
     }
 
     return address
   } catch (e) {
-    sendAddressError(e)
+    handleAddressError(e)
   }
 }
 
-export const sendAddressError = message => {
+export const handleAddressError = message => {
   logger.log('Error getting address', message)
   invalidCrowdsaleProxyAlert()
   return Promise.reject(message)

diff --git a/src/utils/utils.js b/src/utils/utils.js
@@ -15,13 +15,13 @@ export const isExecIDValid = execID => /^0x[a-f0-9]{64}$/i.test(execID)
 
 export const isAddressValid = address => Web3.utils.isAddress(address)
 
-export const _getExecID = () => {
+export const getExecIDFromQuery = () => {
   const execID = getQueryVariableExecId()
   logger.log('getExecID:', execID)
   return isExecIDValid(execID) ? execID : null
 }
 
-export const _getAddr = () => {
+export const getAddrFromQuery = () => {
   const addr = getQueryVariableAddr()
   logger.log('getAddr:', addr)
   return isAddressValid(addr) ? addr : null