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

Adapting safeContracts to create safes without any module

This commit is contained in:
apanizo 2018-10-11 19:11:29 +02:00
parent 039f4527bb
commit b836f656ed
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/logic/contracts/safeContracts.js
View File

@ -96,7 +96,8 @@ const createMasterCopies = async () => {
createAndAddModuleMaster = await CreateAndAddExtension.new({ from: userAccount, gas: '5000000' }) createAndAddModuleMaster = await CreateAndAddExtension.new({ from: userAccount, gas: '5000000' })
const GnosisSafe = getGnosisSafeContract(web3) const GnosisSafe = getGnosisSafeContract(web3)
safeMaster = await GnosisSafe.new([userAccount], 1, 0, 0, { from: userAccount, gas: '5000000' }) safeMaster = await GnosisSafe.new({ from: userAccount, gas: '6000000' })
// safeMaster.setup([userAccount], 1, 0, '0x', { from: userAccount, gas: '5000000' })
const DailyLimitExtension = getCreateDailyLimitExtensionContract(web3) const DailyLimitExtension = getCreateDailyLimitExtensionContract(web3)
dailyLimitMaster = await DailyLimitExtension.new([], [], { from: userAccount, gas: '5000000' }) dailyLimitMaster = await DailyLimitExtension.new([], [], { from: userAccount, gas: '5000000' })
@ -104,7 +105,9 @@ const createMasterCopies = async () => {
export const initContracts = ensureOnce(process.env.NODE_ENV === 'test' ? createMasterCopies : instanciateMasterCopies) export const initContracts = ensureOnce(process.env.NODE_ENV === 'test' ? createMasterCopies : instanciateMasterCopies)
const getSafeDataBasedOn = async (accounts, numConfirmations, dailyLimitInEth) => { // ANCHOR Method to be used once we enable dailyLimit again
// eslint-disable-next-line
const getSafeDataWithDailyLimitBasedOn = async (accounts, numConfirmations, dailyLimitInEth) => {
const web3 = getWeb3() const web3 = getWeb3()
const moduleData = await dailyLimitMaster.contract.setup const moduleData = await dailyLimitMaster.contract.setup
@ -122,13 +125,26 @@ const getSafeDataBasedOn = async (accounts, numConfirmations, dailyLimitInEth) =
.getData(accounts, numConfirmations, createAndAddModuleMaster.address, createAndAddModuleData) .getData(accounts, numConfirmations, createAndAddModuleMaster.address, createAndAddModuleData)
} }
export const deploySafeContract = async ( export const deploySafeContractWithDailyLimit = async (
safeAccounts: string[], safeAccounts: string[],
numConfirmations: number, numConfirmations: number,
dailyLimit: number, dailyLimit: number,
userAccount: string, userAccount: string,
) => { ) => {
const gnosisSafeData = await getSafeDataBasedOn(safeAccounts, numConfirmations, dailyLimit) const gnosisSafeData = await getSafeDataWithDailyLimitBasedOn(safeAccounts, numConfirmations, dailyLimit)
const proxyFactoryData = proxyFactoryMaster.contract.createProxy.getData(safeMaster.address, gnosisSafeData)
const gas = await calculateGasOf(proxyFactoryData, userAccount, proxyFactoryMaster.address)
const gasPrice = await calculateGasPrice()
return proxyFactoryMaster.createProxy(safeMaster.address, gnosisSafeData, { from: userAccount, gas, gasPrice })
}
export const deploySafeContract = async (
safeAccounts: string[],
numConfirmations: number,
userAccount: string,
) => {
const gnosisSafeData = await safeMaster.contract.setup.getData(safeAccounts, numConfirmations, 0, '0x')
const proxyFactoryData = proxyFactoryMaster.contract.createProxy.getData(safeMaster.address, gnosisSafeData) const proxyFactoryData = proxyFactoryMaster.contract.createProxy.getData(safeMaster.address, gnosisSafeData)
const gas = await calculateGasOf(proxyFactoryData, userAccount, proxyFactoryMaster.address) const gas = await calculateGasOf(proxyFactoryData, userAccount, proxyFactoryMaster.address)
const gasPrice = await calculateGasPrice() const gasPrice = await calculateGasPrice()