From 4d0adc5027b39e675f1c5a74944598bc6c4af528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Mart=C3=ADnez?= Date: Mon, 15 Jul 2019 12:51:51 +0200 Subject: [PATCH] Refactor sentinel address --- src/logic/contracts/safeContracts.js | 2 ++ .../Settings/ManageOwners/RemoveOwnerModal/index.jsx | 4 +--- .../Settings/ManageOwners/ReplaceOwnerModal/index.jsx | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/logic/contracts/safeContracts.js b/src/logic/contracts/safeContracts.js index 3669d257..d90d8366 100644 --- a/src/logic/contracts/safeContracts.js +++ b/src/logic/contracts/safeContracts.js @@ -7,6 +7,8 @@ import { getWeb3 } from '~/logic/wallets/getWeb3' import { calculateGasOf, calculateGasPrice } from '~/logic/wallets/ethTransactions' import { ZERO_ADDRESS } from '~/logic/wallets/ethAddresses' +export const SENTINEL_ADDRESS = '0x0000000000000000000000000000000000000001' + let proxyFactoryMaster let safeMaster diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.jsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.jsx index 4dc4512c..244c6b9d 100644 --- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.jsx @@ -5,7 +5,7 @@ import { withStyles } from '@material-ui/core/styles' import { SharedSnackbarConsumer } from '~/components/SharedSnackBar' import Modal from '~/components/Modal' import { type Owner } from '~/routes/safe/store/models/owner' -import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts' +import { getGnosisSafeInstanceAt, SENTINEL_ADDRESS } from '~/logic/contracts/safeContracts' import CheckOwner from './screens/CheckOwner' import ThresholdForm from './screens/ThresholdForm' import ReviewRemoveOwner from './screens/Review' @@ -34,8 +34,6 @@ type Props = { } type ActiveScreen = 'checkOwner' | 'selectThreshold' | 'reviewRemoveOwner' -const SENTINEL_ADDRESS = '0x0000000000000000000000000000000000000001' - export const sendRemoveOwner = async ( values: Object, safeAddress: string, diff --git a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.jsx b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.jsx index 25393b0c..74089e60 100644 --- a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.jsx @@ -4,7 +4,7 @@ import { List } from 'immutable' import { withStyles } from '@material-ui/core/styles' import { SharedSnackbarConsumer } from '~/components/SharedSnackBar' import Modal from '~/components/Modal' -import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts' +import { getGnosisSafeInstanceAt, SENTINEL_ADDRESS } from '~/logic/contracts/safeContracts' import OwnerForm from './screens/OwnerForm' import ReviewReplaceOwner from './screens/Review' @@ -32,8 +32,6 @@ type Props = { } type ActiveScreen = 'checkOwner' | 'reviewReplaceOwner' -const SENTINEL_ADDRESS = '0x0000000000000000000000000000000000000001' - export const sendReplaceOwner = async ( values: Object, safeAddress: string,