fix safe loading by awaiting .at function

This commit is contained in:
mmv 2019-03-12 16:35:25 +04:00
parent aad76abaee
commit 2593b8a765
5 changed files with 8 additions and 8 deletions

View File

@ -76,7 +76,7 @@ export const deploySafeContract = async (safeAccounts: string[], numConfirmation
export const getGnosisSafeInstanceAt = async (safeAddress: string) => {
const web3 = getWeb3()
const GnosisSafe = await getGnosisSafeContract(web3)
const gnosisSafe = GnosisSafe.at(safeAddress)
const gnosisSafe = await GnosisSafe.at(safeAddress)
return gnosisSafe
}

View File

@ -26,7 +26,8 @@ const hasOneOwner = (safe: Safe) => {
export const getSafeEthereumInstance = async (safeAddress: string) => {
const web3 = getWeb3()
const GnosisSafe = await getGnosisSafeContract(web3)
return GnosisSafe.at(safeAddress)
const safeInstance = await GnosisSafe.at(safeAddress)
return safeInstance
}
export const createTransaction = async (

View File

@ -47,7 +47,7 @@ export const safeFieldsValidation = async (values: Object) => {
// https://solidity.readthedocs.io/en/latest/metadata.html#usage-for-source-code-verification
const metaData = 'a165'
const code = await promisify(cb => web3.eth.getCode(safeAddress, cb))
const code = await web3.eth.getCode(safeAddress)
const codeWithoutMetadata = code.substring(0, code.lastIndexOf(metaData))
const proxyCode = SafeProxy.deployedBytecode
@ -63,7 +63,7 @@ export const safeFieldsValidation = async (values: Object) => {
// check mastercopy
const proxy = contract(SafeProxy)
proxy.setProvider(web3.currentProvider)
const proxyInstance = proxy.at(safeAddress)
const proxyInstance = await proxy.at(safeAddress)
const proxyImplementation = await proxyInstance.implementation()
const safeMaster = await getSafeMasterContract()

View File

@ -62,6 +62,8 @@ class ReviewComponent extends React.PureComponent<Props, State> {
isOwner: false,
}
mounted = false
componentDidMount = async () => {
this.mounted = true
@ -70,7 +72,7 @@ class ReviewComponent extends React.PureComponent<Props, State> {
const web3 = getWeb3()
const GnosisSafe = getGnosisSafeContract(web3)
const gnosisSafe = GnosisSafe.at(safeAddress)
const gnosisSafe = await GnosisSafe.at(safeAddress)
const owners = await gnosisSafe.getOwners()
if (!owners) {
return
@ -86,8 +88,6 @@ class ReviewComponent extends React.PureComponent<Props, State> {
this.mounted = false
}
mounted = false
render() {
const { values, classes, network } = this.props
const { isOwner } = this.state

View File

@ -1,4 +1,3 @@
// @flow
export const FIELD_LOAD_NAME: string = 'name'
export const FIELD_LOAD_ADDRESS: string = 'address'