status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

WA-238 FIX creating master copy if contract has not been deployed

This commit is contained in:
apanizo 2018-05-02 16:43:16 +02:00
parent b5bafe2baa
commit 7f53e43fe9
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/wallets/safeContracts.js
View File

@ -53,30 +53,34 @@ const createMasterCopies = async () => {
// Create ProxyFactory Master Copy // Create ProxyFactory Master Copy
const ProxyFactory = getCreateProxyFactoryContract(web3) const ProxyFactory = getCreateProxyFactoryContract(web3)
proxyFactoryMaster = await ProxyFactory.deployed() try {
if (!proxyFactoryMaster) { proxyFactoryMaster = await ProxyFactory.deployed()
} catch (err) {
proxyFactoryMaster = await ProxyFactory.new({ from: userAccount, gas: '5000000' }) proxyFactoryMaster = await ProxyFactory.new({ from: userAccount, gas: '5000000' })
} }
// Create AddExtension Master Copy // Create AddExtension Master Copy
const CreateAndAddExtension = getCreateAddExtensionContract(web3) const CreateAndAddExtension = getCreateAddExtensionContract(web3)
createAndAddExtensionMaster = await CreateAndAddExtension.deployed() try {
if (!createAndAddExtensionMaster) { createAndAddExtensionMaster = await CreateAndAddExtension.deployed()
} catch (err) {
createAndAddExtensionMaster = await CreateAndAddExtension.new({ from: userAccount, gas: '5000000' }) createAndAddExtensionMaster = await CreateAndAddExtension.new({ from: userAccount, gas: '5000000' })
} }
// Initialize safe master copy // Initialize safe master copy
const GnosisSafe = getGnosisSafeContract(web3) const GnosisSafe = getGnosisSafeContract(web3)
safeMaster = await GnosisSafe.deployed() try {
if (!safeMaster) { safeMaster = await GnosisSafe.deployed()
} catch (err) {
safeMaster = await GnosisSafe.new({ from: userAccount, gas: '5000000' }) safeMaster = await GnosisSafe.new({ from: userAccount, gas: '5000000' })
safeMaster.setup([userAccount], 1, 0, 0, { from: userAccount, gas: '5000000' }) safeMaster.setup([userAccount], 1, 0, 0, { from: userAccount, gas: '5000000' })
} }
// Initialize extension master copy // Initialize extension master copy
const DailyLimitExtension = getCreateDailyLimitExtensionContract(web3) const DailyLimitExtension = getCreateDailyLimitExtensionContract(web3)
dailyLimitMaster = await DailyLimitExtension.deployed() try {
if (!dailyLimitMaster) { dailyLimitMaster = await DailyLimitExtension.deployed()
} catch (err) {
dailyLimitMaster = await DailyLimitExtension.new({ from: userAccount, gas: '5000000' }) dailyLimitMaster = await DailyLimitExtension.new({ from: userAccount, gas: '5000000' })
dailyLimitMaster.setup([], [], { from: userAccount, gas: '5000000' }) dailyLimitMaster.setup([], [], { from: userAccount, gas: '5000000' })
} }