Replace some usages web3Store with injected web3

poanetwork · Mar 12, 2018 · 7ac61e3 · 7ac61e3
1 parent 9eb190f
commit 7ac61e3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/src/components/stepFour/index.js b/src/components/stepFour/index.js
@@ -31,6 +31,7 @@ import { isObservableArray } from 'mobx'
 import JSZip from 'jszip'
 import executeSequentially from '../../utils/executeSequentially'
 import { PreventRefresh } from '../Common/PreventRefresh'
+import PropTypes from 'prop-types'
 
 const { PUBLISH } = NAVIGATION_STEPS
 
@@ -46,6 +47,10 @@ export class stepFour extends React.Component {
     }
   }
 
+  static contextTypes = {
+    web3: PropTypes.object
+  }
+
   contractDownloadSuccess = options => {
     this.setState({ contractDownloaded: true })
     toast.showToaster({ message: TOAST.MESSAGE.CONTRACT_DOWNLOAD_SUCCESS, options })
@@ -63,12 +68,13 @@ export class stepFour extends React.Component {
 
   deployCrowdsale = () => {
     const { contractStore, deploymentStore } = this.props
+    const { web3 } = this.context
     const isWhitelistWithCap = contractStore.contractType === CONTRACT_TYPES.whitelistwithcap
     const firstRun = deploymentStore.deploymentStep === null
 
     if (isWhitelistWithCap) {
       if (firstRun) {
-        setupContractDeployment()
+        setupContractDeployment(web3)
           .then(this.resumeContractDeployment)
       } else {
         this.resumeContractDeployment()
@@ -78,8 +84,9 @@ export class stepFour extends React.Component {
 
   resumeContractDeployment = () => {
     const { deploymentStore } = this.props
+    const { web3 } = this.context
     const startAt = deploymentStore.deploymentStep ? deploymentStore.deploymentStep : 0
-    const deploymentSteps = buildDeploymentSteps()
+    const deploymentSteps = buildDeploymentSteps(web3)
 
     executeSequentially(deploymentSteps, startAt, (index) => {
       deploymentStore.setDeploymentStep(index)

diff --git a/src/components/stepFour/utils.js b/src/components/stepFour/utils.js
@@ -22,7 +22,7 @@ import {
 } from '../../stores'
 import { getEncodedABIClientSide } from '../../utils/microservices'
 
-export const setupContractDeployment = () => {
+export const setupContractDeployment = (web3) => {
   if (!contractStore.safeMathLib) {
     noContractDataAlert()
     return Promise.reject('no contract data')
@@ -35,7 +35,7 @@ export const setupContractDeployment = () => {
   const whenTokenABIConstructor = Promise.resolve(tokenAddr)
     .then(tokenAddr => {
       if (!tokenAddr) {
-        return getEncodedABIClientSide(tokenABI, [], 0)
+        return getEncodedABIClientSide(web3, tokenABI, [], 0)
           .then(ABIEncoded => {
             console.log('token ABI Encoded params constructor:', ABIEncoded)
             contractStore.setContractProperty('token', 'abiConstructor', ABIEncoded)
@@ -44,7 +44,7 @@ export const setupContractDeployment = () => {
     })
 
   const whenPricingStrategyContract = tierStore.tiers.map((value, index) => {
-    return getEncodedABIClientSide(pricingStrategyABI, [], index)
+    return getEncodedABIClientSide(web3, pricingStrategyABI, [], index)
       .then(ABIEncoded => {
         console.log('pricingStrategy ABI Encoded params constructor:', ABIEncoded)
         const newContract = contractStore.pricingStrategy.abiConstructor.concat(ABIEncoded)
@@ -55,14 +55,14 @@ export const setupContractDeployment = () => {
   return Promise.all([whenTokenABIConstructor, ...whenPricingStrategyContract])
 }
 
-export const buildDeploymentSteps = () => {
+export const buildDeploymentSteps = (web3) => {
   const stepFnCorrelation = {
     safeMathLibrary: deploySafeMathLibrary,
     token: deployToken,
-    pricingStrategy: deployPricingStrategy,
+    pricingStrategy: deployPricingStrategy(web3),
     crowdsale: deployCrowdsale,
     registerCrowdsaleAddress: registerCrowdsaleAddress,
-    finalizeAgent: deployFinalizeAgent,
+    finalizeAgent: deployFinalizeAgent(web3),
     tier: setTier,
     setReservedTokens: setReservedTokensListMultiple,
     updateJoinedCrowdsales: updateJoinedCrowdsales,
@@ -154,7 +154,7 @@ const getPricingStrategyParams = tier => {
   ]
 }
 
-export const deployPricingStrategy = () => {
+export const deployPricingStrategy = (web3) => () => {
   return tierStore.tiers.map((tier, index) => {
     return () => {
       const abiPricingStrategy = contractStore.pricingStrategy.abi || []
@@ -166,7 +166,7 @@ export const deployPricingStrategy = () => {
       return deployContract(abiPricingStrategy, binPricingStrategy, paramsPricingStrategy)
         .then(pricingStrategyAddr => contractStore.pricingStrategy.addr.concat(pricingStrategyAddr))
         .then(newPricingStrategy => contractStore.setContractProperty('pricingStrategy', 'addr', newPricingStrategy))
-        .then(() => getEncodedABIClientSide(abiCrowdsale, [], index, true))
+        .then(() => getEncodedABIClientSide(web3, abiCrowdsale, [], index, true))
         .then(ABIEncoded => contractStore.crowdsale.abiConstructor.concat(ABIEncoded))
         .then(newContract => contractStore.setContractProperty('crowdsale', 'abiConstructor', newContract))
         .then(() => deploymentStore.setAsSuccessful('pricingStrategy'))
@@ -264,7 +264,7 @@ const getFinalizeAgentParams = index => {
   ]
 }
 
-export const deployFinalizeAgent = () => {
+export const deployFinalizeAgent = (web3) => () => {
   return tierStore.tiers.map((tier, index, tiers) => {
     return () => {
       let abi, bin, paramsFinalizeAgent
@@ -279,7 +279,7 @@ export const deployFinalizeAgent = () => {
         bin = contractStore.nullFinalizeAgent.bin || ''
       }
 
-      return getEncodedABIClientSide(abi, [], index)
+      return getEncodedABIClientSide(web3, abi, [], index)
         .then(ABIEncoded => {
           console.log('finalizeAgent ABI encoded params constructor:', ABIEncoded)
 

diff --git a/src/utils/microservices.js b/src/utils/microservices.js
@@ -1,17 +1,14 @@
 import { findConstructor, toFixed } from '../utils/utils'
 import { getconstructorParams } from '../stores/utils'
-import { web3Store } from '../stores'
 
-export const getEncodedABIClientSide = (abi, vals, crowdsaleNum, isCrowdsale) => {
+export const getEncodedABIClientSide = (web3, abi, vals, crowdsaleNum, isCrowdsale) => {
   const abiConstructor = findConstructor(abi)
   let params = getconstructorParams(abiConstructor, vals, crowdsaleNum, isCrowdsale)
 
-  return getABIEncoded(params.types, params.vals)
+  return getABIEncoded(web3, params.types, params.vals)
 }
 
-const getABIEncoded = (types, vals) => {
-  const { web3 } = web3Store
-
+const getABIEncoded = (web3, types, vals) => {
   return new Promise((resolve, reject) => {
     if (vals) {
       for (let i = 0; i < vals.length; i++) {