From 5e24cfc93e5a685a3dbae6248d1da9d5cc319ad1 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 30 Jul 2020 17:02:20 -0300
Subject: [PATCH 01/69] fix: Card component requires `className` instead of
 `styles`

---
 src/routes/safe/components/Apps/index.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/routes/safe/components/Apps/index.tsx b/src/routes/safe/components/Apps/index.tsx
index afea195525..64fbeaf6d1 100644
--- a/src/routes/safe/components/Apps/index.tsx
+++ b/src/routes/safe/components/Apps/index.tsx
@@ -1,4 +1,5 @@
 import { Card, FixedDialog, FixedIcon, IconText, Loader, Menu, Text, Title } from '@gnosis.pm/safe-react-components'
+import { createStyles, makeStyles } from '@material-ui/core/styles'
 import { withSnackbar } from 'notistack'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
@@ -23,6 +24,12 @@ import { loadFromStorage, saveToStorage } from 'src/utils/storage'
 import { isSameHref } from 'src/utils/url'
 import { SafeApp, StoredSafeApp } from './types'
 
+const useStyles = makeStyles(
+  createStyles({
+    card: { marginBottom: '24px' },
+  }),
+)
+
 const APPS_STORAGE_KEY = 'APPS_STORAGE_KEY'
 const APPS_LEGAL_DISCLAIMER_STORAGE_KEY = 'APPS_LEGAL_DISCLAIMER_STORAGE_KEY'
 
@@ -64,6 +71,7 @@ const operations = {
 }
 
 function Apps({ closeModal, closeSnackbar, enqueueSnackbar, openModal }) {
+  const classes = useStyles()
   const [appList, setAppList] = useState<Array<SafeApp>>([])
   const [legalDisclaimerAccepted, setLegalDisclaimerAccepted] = useState(false)
   const [selectedApp, setSelectedApp] = useState<string>()
@@ -419,7 +427,7 @@ function Apps({ closeModal, closeSnackbar, enqueueSnackbar, openModal }) {
           </LCL.Footer> */}
         </LCL.Wrapper>
       ) : (
-        <Card style={{ marginBottom: '24px' }}>
+        <Card className={classes.card}>
           <Centered>
             <Title size="xs">No Apps Enabled</Title>
           </Centered>

From f669a3a4928b633470801818d2c9d38a9bdbe3ab Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 30 Jul 2020 17:02:40 -0300
Subject: [PATCH 02/69] update `safe-react-components`

---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 40f5fa81bd..db3bd3511f 100644
--- a/package.json
+++ b/package.json
@@ -160,7 +160,7 @@
   },
   "dependencies": {
     "@gnosis.pm/safe-contracts": "1.1.1-dev.2",
-    "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#7bb55de",
+    "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#2b4635b",
     "@gnosis.pm/util-contracts": "2.0.6",
     "@ledgerhq/hw-transport-node-hid": "5.19.1",
     "@material-ui/core": "4.11.0",
diff --git a/yarn.lock b/yarn.lock
index 5228fddaa6..3ae950c673 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1337,9 +1337,9 @@
     solc "0.5.14"
     truffle "^5.1.21"
 
-"@gnosis.pm/safe-react-components@https://github.com/gnosis/safe-react-components.git#7bb55de":
+"@gnosis.pm/safe-react-components@https://github.com/gnosis/safe-react-components.git#2b4635b":
   version "0.2.0"
-  resolved "https://github.com/gnosis/safe-react-components.git#7bb55de2d8a2b6f192466043dc643387fb42dbf6"
+  resolved "https://github.com/gnosis/safe-react-components.git#2b4635b22bebfca0260486f1ae7a9a35b02d71c2"
   dependencies:
     classnames "^2.2.6"
     polished "3.6.5"

From 2583e57c6f58f35b6d345738995f73dcf31f4335 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 30 Jul 2020 17:03:11 -0300
Subject: [PATCH 03/69] change `Spending Limit` icon from `allowances` to
 `fuelIndicator`

---
 src/routes/safe/components/Settings/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/safe/components/Settings/index.tsx b/src/routes/safe/components/Settings/index.tsx
index 78c0a05fb8..36010cd4ab 100644
--- a/src/routes/safe/components/Settings/index.tsx
+++ b/src/routes/safe/components/Settings/index.tsx
@@ -122,7 +122,7 @@ const Settings: React.FC = () => {
               <IconText
                 iconSize="sm"
                 textSize="xl"
-                iconType="allowances"
+                iconType="fuelIndicator"
                 text="Spending Limit"
                 color={menuOptionIndex === 4 ? 'primary' : 'secondary'}
               />

From df6547a99b7e15328d9c20dd1b75811fc47ade76 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 6 Aug 2020 21:28:04 -0300
Subject: [PATCH 04/69] add types to `TokenSelectField` component

- marked `isValid` as optional, with default `true` value
- marked `initialValue` as optional
- migrated to hooks for material-ui styles
---
 .../SendFunds/TokenSelectField/index.tsx      | 81 ++++++++++++-------
 .../SendFunds/TokenSelectField/style.ts       |  6 +-
 2 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.tsx
index d33974ed40..c87f53052f 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.tsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.tsx
@@ -1,8 +1,10 @@
 import ListItemIcon from '@material-ui/core/ListItemIcon'
 import ListItemText from '@material-ui/core/ListItemText'
 import MenuItem from '@material-ui/core/MenuItem'
-import { withStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@material-ui/core/styles'
+import { List } from 'immutable'
 import React from 'react'
+import { Token } from 'src/logic/tokens/store/model/token'
 
 import { selectStyles, selectedTokenStyles } from './style'
 
@@ -15,7 +17,15 @@ import Paragraph from 'src/components/layout/Paragraph'
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 
-const SelectedToken = ({ classes, tokenAddress, tokens }) => {
+const useSelectedTokenStyles = makeStyles(selectedTokenStyles)
+
+interface SelectTokenProps {
+  tokenAddress: string
+  tokens: List<Token>
+}
+
+const SelectedToken = ({ tokenAddress, tokens }: SelectTokenProps): React.ReactElement => {
+  const classes = useSelectedTokenStyles()
   const token = tokens.find(({ address }) => address === tokenAddress)
 
   return (
@@ -28,7 +38,7 @@ const SelectedToken = ({ classes, tokenAddress, tokens }) => {
           <ListItemText
             className={classes.tokenData}
             primary={token.name}
-            secondary={`${formatAmount(token.balance)} ${token.symbol}`}
+            secondary={`${formatAmount(token.balance.toString())} ${token.symbol}`}
           />
         </>
       ) : (
@@ -39,32 +49,43 @@ const SelectedToken = ({ classes, tokenAddress, tokens }) => {
     </MenuItem>
   )
 }
-const SelectedTokenStyled = withStyles(selectedTokenStyles)(SelectedToken)
 
-const TokenSelectField = ({ classes, initialValue, isValid, tokens }) => (
-  <Field
-    classes={{ selectMenu: classes.selectMenu }}
-    className={isValid ? 'isValid' : 'isInvalid'}
-    component={SelectField}
-    displayEmpty
-    initialValue={initialValue}
-    name="token"
-    renderValue={(tokenAddress) => <SelectedTokenStyled tokenAddress={tokenAddress} tokens={tokens} />}
-    validate={required}
-  >
-    {tokens.map((token) => (
-      <MenuItem key={token.address} value={token.address}>
-        <ListItemIcon>
-          <Img alt={token.name} height={28} onError={setImageToPlaceholder} src={token.logoUri} />
-        </ListItemIcon>
-        <ListItemText
-          primary={token.name}
-          secondary={`${formatAmount(token.balance)} ${token.symbol}`}
-          data-testid={`select-token-${token.name}`}
-        />
-      </MenuItem>
-    ))}
-  </Field>
-)
+const useSelectStyles = makeStyles(selectStyles)
+
+interface TokenSelectFieldProps {
+  initialValue?: string
+  isValid?: boolean
+  tokens: List<Token>
+}
+
+const TokenSelectField = ({ initialValue, isValid = true, tokens }: TokenSelectFieldProps): React.ReactElement => {
+  const classes = useSelectStyles()
+
+  return (
+    <Field
+      classes={{ selectMenu: classes.selectMenu }}
+      className={isValid ? 'isValid' : 'isInvalid'}
+      component={SelectField}
+      displayEmpty
+      initialValue={initialValue}
+      name="token"
+      renderValue={(tokenAddress) => <SelectedToken tokenAddress={tokenAddress} tokens={tokens} />}
+      validate={required}
+    >
+      {tokens.map((token) => (
+        <MenuItem key={token.address} value={token.address}>
+          <ListItemIcon>
+            <Img alt={token.name} height={28} onError={setImageToPlaceholder} src={token.logoUri} />
+          </ListItemIcon>
+          <ListItemText
+            primary={token.name}
+            secondary={`${formatAmount(token.balance.toString())} ${token.symbol}`}
+            data-testid={`select-token-${token.name}`}
+          />
+        </MenuItem>
+      ))}
+    </Field>
+  )
+}
 
-export default withStyles(selectStyles)(TokenSelectField)
+export default TokenSelectField
diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/style.ts b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/style.ts
index 561dd1691d..f5bd385d93 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/style.ts
+++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/style.ts
@@ -1,6 +1,8 @@
+import { createStyles } from '@material-ui/core'
+
 import { sm } from 'src/theme/variables'
 
-export const selectedTokenStyles = () => ({
+export const selectedTokenStyles = createStyles({
   container: {
     minHeight: '55px',
     padding: 0,
@@ -16,7 +18,7 @@ export const selectedTokenStyles = () => ({
   },
 })
 
-export const selectStyles = () => ({
+export const selectStyles = createStyles({
   selectMenu: {
     paddingRight: 0,
   },

From 7616e8f79f1b141e2caf32ed1a34fd02a2a541a2 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 6 Aug 2020 21:30:33 -0300
Subject: [PATCH 05/69] refactor `AddressBookInput`

- migrated to hooks for material-ui styles
- make `label` parametrized and optional, with default value
- make `setIsValidAddress` optional
---
 .../screens/AddressBookInput/index.tsx          | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.tsx
index 6079daefc4..29ea088105 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.tsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.tsx
@@ -1,6 +1,5 @@
 import MuiTextField from '@material-ui/core/TextField'
-import { withStyles } from '@material-ui/core/styles'
-import makeStyles from '@material-ui/core/styles/makeStyles'
+import { makeStyles } from '@material-ui/core/styles'
 import Autocomplete from '@material-ui/lab/Autocomplete'
 import { List } from 'immutable'
 import React, { useEffect, useState } from 'react'
@@ -24,7 +23,8 @@ export interface AddressBookProps {
   setSelectedEntry: (
     entry: { address?: string; name?: string } | React.SetStateAction<{ address: string; name: string }>,
   ) => void
-  setIsValidAddress: (valid?: boolean) => void
+  setIsValidAddress?: (valid?: boolean) => void
+  label?: string
 }
 
 const useStyles = makeStyles(styles)
@@ -67,11 +67,12 @@ interface FilteredAddressBookEntry {
 const AddressBookInput = ({
   fieldMutator,
   isCustomTx,
+  label = 'Recipient',
   pristine,
   recipientAddress,
   setIsValidAddress,
   setSelectedEntry,
-}: AddressBookProps) => {
+}: AddressBookProps): React.ReactElement => {
   const classes = useStyles()
   const addressBook = useSelector(getAddressBook)
   const [isValidForm, setIsValidForm] = useState(true)
@@ -90,7 +91,7 @@ const AddressBookInput = ({
     if (inputTouched && !normalizedAddress) {
       setIsValidForm(false)
       setValidationText('Required')
-      setIsValidAddress(false)
+      setIsValidAddress?.(false)
       return
     }
     if (normalizedAddress) {
@@ -121,7 +122,7 @@ const AddressBookInput = ({
     setIsValidForm(isValidText === undefined)
     setValidationText(isValidText)
     fieldMutator(resolvedAddress)
-    setIsValidAddress(isValidText === undefined)
+    setIsValidAddress?.(isValidText === undefined)
   }
 
   useEffect(() => {
@@ -201,7 +202,7 @@ const AddressBookInput = ({
               },
               className: statusClasses,
             }}
-            label={!isValidForm ? validationText : 'Recipient'}
+            label={!isValidForm ? validationText : label}
             onChange={(event) => {
               setInputTouched(true)
               onAddressInputChanged(event.target.value)
@@ -232,4 +233,4 @@ const AddressBookInput = ({
   )
 }
 
-export default withStyles(styles as any)(AddressBookInput)
+export default AddressBookInput

From 32e5d50a21072a81bd98da594478ece5a8771cb4 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 6 Aug 2020 21:32:59 -0300
Subject: [PATCH 06/69] add types to `GnoModal` component

- migrated to hooks for material-ui styles
---
 src/components/Modal/index.tsx              | 88 +++++++++++++--------
 src/routes/safe/components/Layout/index.tsx |  4 +-
 2 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx
index 9a7f23e916..94ff2e8981 100644
--- a/src/components/Modal/index.tsx
+++ b/src/components/Modal/index.tsx
@@ -1,52 +1,70 @@
 import Modal from '@material-ui/core/Modal'
-import { withStyles } from '@material-ui/core/styles'
+import { makeStyles, createStyles } from '@material-ui/core/styles'
 import cn from 'classnames'
 import * as React from 'react'
 
 import { sm } from 'src/theme/variables'
 
-const styles = () => ({
-  root: {
-    alignItems: 'center',
-    justifyContent: 'center',
-    display: 'flex',
-    overflowY: 'scroll',
-  },
-  paper: {
-    position: 'absolute',
-    top: '120px',
-    width: '500px',
-    height: '530px',
-    borderRadius: sm,
-    backgroundColor: '#ffffff',
-    boxShadow: '0 0 5px 0 rgba(74, 85, 121, 0.5)',
-    '&:focus': {
-      outline: 'none',
+const useStyles = makeStyles(
+  createStyles({
+    root: {
+      alignItems: 'center',
+      justifyContent: 'center',
+      display: 'flex',
+      overflowY: 'scroll',
     },
-    display: 'flex',
-    flexDirection: 'column',
-  },
-})
+    paper: {
+      position: 'absolute',
+      top: '120px',
+      width: '500px',
+      height: '530px',
+      borderRadius: sm,
+      backgroundColor: '#ffffff',
+      boxShadow: '0 0 5px 0 rgba(74, 85, 121, 0.5)',
+      '&:focus': {
+        outline: 'none',
+      },
+      display: 'flex',
+      flexDirection: 'column',
+    },
+  }),
+)
+
+interface GnoModalProps {
+  children: React.ReactNode
+  description: string
+  // type copied from Material-UI Modal's `close` prop
+  handleClose?: {
+    bivarianceHack(event: Record<string, unknown>, reason: 'backdropClick' | 'escapeKeyDown'): void
+  }['bivarianceHack']
+  modalClassName?: string
+  open: boolean
+  paperClassName?: string
+  title: string
+}
 
 const GnoModal = ({
   children,
-  classes,
   description,
   handleClose,
   modalClassName,
   open,
   paperClassName,
   title,
-}: any) => (
-  <Modal
-    aria-describedby={description}
-    aria-labelledby={title}
-    className={cn(classes.root, modalClassName)}
-    onClose={handleClose}
-    open={open}
-  >
-    <div className={cn(classes.paper, paperClassName)}>{children}</div>
-  </Modal>
-)
+}: GnoModalProps): React.ReactElement => {
+  const classes = useStyles()
+
+  return (
+    <Modal
+      aria-describedby={description}
+      aria-labelledby={title}
+      className={cn(classes.root, modalClassName)}
+      onClose={handleClose}
+      open={open}
+    >
+      <div className={cn(classes.paper, paperClassName)}>{children}</div>
+    </Modal>
+  )
+}
 
-export default withStyles(styles as any)(GnoModal)
+export default GnoModal
diff --git a/src/routes/safe/components/Layout/index.tsx b/src/routes/safe/components/Layout/index.tsx
index 2473eda00c..3b8974103a 100644
--- a/src/routes/safe/components/Layout/index.tsx
+++ b/src/routes/safe/components/Layout/index.tsx
@@ -35,8 +35,8 @@ const AddressBookTable = React.lazy(() => import('src/routes/safe/components/Add
 interface Props extends RouteComponentProps {
   sendFunds: Record<string, any>
   showReceive: boolean
-  onShow: (value: string) => void
-  onHide: (value: string) => void
+  onShow: (value: string) => () => void
+  onHide: (value: string) => () => void
   showSendFunds: (value: string) => void
   hideSendFunds: () => void
 }

From d0b2c7d5301945838a2f831a2461e9e597973094 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 6 Aug 2020 21:34:19 -0300
Subject: [PATCH 07/69] update `safe-react-components`

---
 package.json | 2 +-
 yarn.lock    | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 31c549ca9d..ed79858c14 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,7 @@
   },
   "dependencies": {
     "@gnosis.pm/safe-contracts": "1.1.1-dev.2",
-    "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#2b4635b",
+    "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#4df39fe",
     "@gnosis.pm/util-contracts": "2.0.6",
     "@ledgerhq/hw-transport-node-hid": "5.19.1",
     "@material-ui/core": "4.11.0",
diff --git a/yarn.lock b/yarn.lock
index 117189ded8..6e0416c878 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1337,9 +1337,9 @@
     solc "0.5.14"
     truffle "^5.1.21"
 
-"@gnosis.pm/safe-react-components@https://github.com/gnosis/safe-react-components.git#2b4635b":
+"@gnosis.pm/safe-react-components@https://github.com/gnosis/safe-react-components.git#4df39fe":
   version "0.2.0"
-  resolved "https://github.com/gnosis/safe-react-components.git#2b4635b22bebfca0260486f1ae7a9a35b02d71c2"
+  resolved "https://github.com/gnosis/safe-react-components.git#4df39fea2665000bb07bacba19e6f7631cca2de3"
   dependencies:
     classnames "^2.2.6"
     polished "3.6.5"
@@ -2327,11 +2327,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.28.tgz#0e36d718a29355ee51cec83b42d921299200f6d9"
   integrity sha512-dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ==
 
-"@types/node@^10.12.18":
-  version "10.17.28"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.28.tgz#0e36d718a29355ee51cec83b42d921299200f6d9"
-  integrity sha512-dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ==
-
 "@types/node@^10.3.2":
   version "10.17.27"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.27.tgz#391cb391c75646c8ad2a7b6ed3bbcee52d1bdf19"

From cea0817eb5e02228179b99294b34a8f5427199ec Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 6 Aug 2020 21:34:46 -0300
Subject: [PATCH 08/69] WIP: New Spending Limit form

---
 .../Settings/SpendingLimit/index.tsx          | 425 +++++++++++++++++-
 .../Settings/SpendingLimit/style.ts           |   3 +
 2 files changed, 416 insertions(+), 12 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 26251d949e..ab96ceef72 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -1,18 +1,33 @@
-import { Text, Title } from '@gnosis.pm/safe-react-components'
+import { Button, EthHashInfo, Icon, RadioButtons, Text, TextField, Title } from '@gnosis.pm/safe-react-components'
+import { FormControlLabel, hexToRgb, Switch as SwitchMui } from '@material-ui/core'
 import { makeStyles } from '@material-ui/core/styles'
+import { Mutator } from 'final-form'
 import React from 'react'
+import { useField, useForm, useFormState } from 'react-final-form'
+import { useSelector } from 'react-redux'
+
+import GnoField from 'src/components/forms/Field'
+import GnoForm from 'src/components/forms/GnoForm'
+import { composeValidators, minValue, mustBeFloat, required } from 'src/components/forms/validator'
+import Block from 'src/components/layout/Block'
+import Col from 'src/components/layout/Col'
+import Img from 'src/components/layout/Img'
+import Row from 'src/components/layout/Row'
+import GnoModal from 'src/components/Modal'
+import { ScanQRWrapper } from 'src/components/ScanQRModal/ScanQRWrapper'
+import { getNetwork } from 'src/config'
+import { getAddressBook } from 'src/logic/addressBook/store/selectors'
+import { getNameFromAdbk } from 'src/logic/addressBook/utils'
+import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/screens/AddressBookInput'
+import TokenSelectField from 'src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField'
+import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
 import styled from 'styled-components'
 
-import { styles } from './style'
-import Beneficiary from './assets/beneficiary.svg'
 import AssetAmount from './assets/asset-amount.svg'
+import Beneficiary from './assets/beneficiary.svg'
 import Time from './assets/time.svg'
 
-import Block from 'src/components/layout/Block'
-import Img from 'src/components/layout/Img'
-import Row from 'src/components/layout/Row'
-import Col from 'src/components/layout/Col'
-import Button from 'src/components/layout/Button'
+import { styles } from './style'
 
 const useStyles = makeStyles(styles)
 
@@ -41,8 +56,394 @@ const SpendingLimitStep = styled.div`
   max-width: 164px;
 `
 
+//
+// TODO: refactor and split into components for better readability
+//
+
+const Field = styled(GnoField)`
+  margin: 8px 0;
+  width: 100%;
+`
+
+/**
+ * beneficiary - START
+ */
+const KEYCODES = {
+  TAB: 9,
+  SHIFT: 16,
+}
+const SelectAddressRow = (): React.ReactElement => {
+  const classes = useStyles()
+
+  const { mutators } = useForm()
+
+  const [selectedEntry, setSelectedEntry] = React.useState<{ address: string; name: string } | null>({
+    address: '',
+    name: '',
+  })
+
+  const [pristine, setPristine] = React.useState<boolean>(true)
+  React.useMemo(() => {
+    if (selectedEntry === null && pristine) {
+      setPristine(false)
+    }
+  }, [selectedEntry, pristine])
+
+  const addressBook = useSelector(getAddressBook)
+  const handleScan = (value, closeQrModal) => {
+    let scannedAddress = value
+
+    if (scannedAddress.startsWith('ethereum:')) {
+      scannedAddress = scannedAddress.replace('ethereum:', '')
+    }
+    const scannedName = addressBook ? getNameFromAdbk(addressBook, scannedAddress) : ''
+    mutators?.setBeneficiary?.(scannedAddress)
+    setSelectedEntry({
+      name: scannedName,
+      address: scannedAddress,
+    })
+    closeQrModal()
+  }
+
+  return (
+    <Row margin="md">
+      {!!selectedEntry?.address ? (
+        <Col xs={12}>
+          <div
+            role="button"
+            aria-pressed="false"
+            tabIndex={0}
+            onKeyDown={(e) => {
+              if (![KEYCODES.TAB, KEYCODES.SHIFT].includes(e.keyCode)) {
+                setSelectedEntry(null)
+              }
+            }}
+            onClick={() => {
+              setSelectedEntry(null)
+            }}
+          >
+            <EthHashInfo
+              hash={selectedEntry.address}
+              name={selectedEntry.name}
+              showCopyBtn
+              showEtherscanBtn
+              showIdenticon
+              textSize="lg"
+              network={getNetwork()}
+            />
+          </div>
+        </Col>
+      ) : (
+        <>
+          <Col xs={11}>
+            <AddressBookInput
+              fieldMutator={mutators?.setBeneficiary}
+              pristine={pristine}
+              setSelectedEntry={setSelectedEntry}
+              label="Beneficiary"
+            />
+          </Col>
+          <Col center="xs" className={classes} middle="xs" xs={1}>
+            <ScanQRWrapper handleScan={handleScan} />
+          </Col>
+        </>
+      )}
+    </Row>
+  )
+}
+/**
+ * beneficiary - END
+ */
+
+/**
+ * token
+ */
+const TokenSelectRow = (): React.ReactElement => {
+  const tokens = useSelector(extendedSafeTokensSelector)
+  // const {
+  //   input: { value: tokenAddress },
+  //   meta: { pristine, dirty },
+  // } = useField('token', { subscription: { value: true, pristine: true, dirty: true } })
+  // const {  } = useFormState()
+  // const setRed = dirty && !pristine && !tokenAddress
+
+  return (
+    <Row margin="md">
+      <Col>
+        <TokenSelectField tokens={tokens} />
+      </Col>
+    </Row>
+  )
+}
+
+/**
+ * amount
+ */
+const AmountSetRow = (): React.ReactElement => {
+  const classes = useStyles()
+
+  const {
+    input: { value: tokenAddress },
+    meta: { pristine: tokenAddressPristine },
+  } = useField('token', { subscription: { value: true, pristine: true } })
+  const tokens = useSelector(extendedSafeTokensSelector)
+  const selectedTokenRecord = tokens.find((token) => token.address === tokenAddress)
+  const validate = !tokenAddressPristine && composeValidators(required, mustBeFloat, minValue(0, false))
+
+  return (
+    <Row margin="md">
+      <Col>
+        <Field
+          component={TextField}
+          label="Amount"
+          name="amount"
+          type="text"
+          data-testid="amount-input"
+          endAdornment={selectedTokenRecord?.symbol}
+          className={classes.amountInput}
+          validate={validate}
+        />
+      </Col>
+    </Row>
+  )
+}
+
+/**
+ * resetTime - START
+ */
+// TODO: propose refactor in safe-react-components based on this requirements
+const SpendingLimitRadioButtons = styled(RadioButtons)`
+  & .MuiRadio-colorPrimary.Mui-checked {
+    color: ${({ theme }) => theme.colors.primary};
+  }
+`
+const StyledSwitch = styled(({ ...rest }) => <SwitchMui {...rest} />)`
+  && {
+    .MuiIconButton-label,
+    .MuiSwitch-colorSecondary {
+      color: ${({ theme }) => theme.colors.icon};
+    }
+
+    .MuiSwitch-colorSecondary.Mui-checked .MuiIconButton-label {
+      color: ${({ theme }) => theme.colors.primary};
+    }
+
+    .MuiSwitch-colorSecondary.Mui-checked:hover {
+      background-color: ${({ theme }) => hexToRgb(`${theme.colors.primary}03`)};
+    }
+
+    .Mui-checked + .MuiSwitch-track {
+      background-color: ${({ theme }) => theme.colors.primaryLight};
+    }
+  }
+`
+interface RadioButtonOption {
+  label: string
+  value: string
+}
+interface RadioButtonProps {
+  options: RadioButtonOption[]
+  initialValue: string
+  groupName: string
+}
+const SafeRadioButtons = ({ options, initialValue, groupName }: RadioButtonProps): React.ReactElement => (
+  <Field name={groupName} initialValue={initialValue}>
+    {({ input: { name, value, onChange } }) => (
+      <SpendingLimitRadioButtons name={name} value={value || initialValue} onRadioChange={onChange} options={options} />
+    )}
+  </Field>
+)
+const Switch = ({ label, name }: { label: string; name: string }): React.ReactElement => (
+  <FormControlLabel
+    label={label}
+    control={
+      <Field
+        name={name}
+        type="checkbox"
+        render={({ input: { checked, onChange, name, value } }) => (
+          <StyledSwitch checked={checked} onChange={onChange} name={name} value={value} />
+        )}
+      />
+    }
+  />
+)
+const RESET_TIME_OPTIONS = [
+  { label: '1 day', value: '1' },
+  { label: '1 week', value: '7' },
+  { label: '1 month', value: '30' },
+]
+const ResetTime = (): React.ReactElement => {
+  const {
+    input: { value: withResetTime },
+  } = useField('withResetTime', { subscription: { value: true } })
+
+  return (
+    <>
+      <Row margin="md">
+        <Col>
+          <Text size="xl">
+            Set a reset-time to have the allowance automatically refill after a defined time-period.
+          </Text>
+        </Col>
+      </Row>
+      <Row margin="md">
+        <Col>
+          <Switch label="Reset time" name="withResetTime" />
+        </Col>
+      </Row>
+      {withResetTime && (
+        <Row margin="md">
+          <Col>
+            <SafeRadioButtons
+              groupName="resetTime"
+              initialValue={RESET_TIME_OPTIONS[0].value}
+              options={RESET_TIME_OPTIONS}
+            />
+          </Col>
+        </Row>
+      )}
+    </>
+  )
+}
+/**
+ * resetTime - END
+ */
+
+const canSubmit = ({ dirty, invalid, submitting, dirtyFieldsSinceLastSubmit, pristine, values }): boolean => {
+  return !(
+    submitting ||
+    invalid ||
+    pristine ||
+    !dirty ||
+    (values.token && !values.amount) ||
+    (values.withResetTime && !values.resetTime) ||
+    !dirtyFieldsSinceLastSubmit
+  )
+}
+const SpendingLimitFormButtons = ({ onClose }: { onClose: () => void }): React.ReactElement => {
+  const formState = useFormState()
+
+  return (
+    <>
+      <Button color="secondary" size="md" onClick={onClose}>
+        Cancel
+      </Button>
+
+      <Button color="primary" size="md" variant="contained" type="submit" disabled={!canSubmit(formState)}>
+        Submit
+      </Button>
+    </>
+  )
+}
+
+/**
+ * New Spending Limit Form - START
+ */
+// TODO: propose refactor in safe-react-components based on this requirements
+const TitleSection = styled.div`
+  display: flex;
+  justify-content: space-between;
+  padding: 16px 24px;
+  border-bottom: 2px solid ${({ theme }) => theme.colors.separator};
+`
+const StyledButton = styled.button`
+  background: none;
+  border: none;
+  padding: 5px;
+  width: 26px;
+  height: 26px;
+
+  span {
+    margin-right: 0;
+  }
+
+  :hover {
+    background: ${({ theme }) => theme.colors.separator};
+    border-radius: 16px;
+    cursor: pointer;
+  }
+`
+const FormContainer = styled.div`
+  padding: 24px;
+`
+const FooterSection = styled.div`
+  border-top: 2px solid ${({ theme }) => theme.colors.separator};
+  padding: 16px 24px;
+`
+const FooterWrapper = styled.div`
+  display: flex;
+  justify-content: space-around;
+`
+const formMutators: Record<string, Mutator<{ beneficiary: { name: string } }>> = {
+  setBeneficiary: (args, state, utils) => {
+    utils.changeValue(state, 'beneficiary', () => args[0])
+  },
+}
+const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boolean }): React.ReactElement => {
+  const classes = useStyles()
+
+  const handleSubmit = (values) => {
+    console.log(values)
+  }
+
+  return (
+    <GnoModal
+      handleClose={close}
+      open={open}
+      title="New Spending Limit"
+      description="set rules for specific beneficiaries to access funds from this Safe without having to collect all signatures"
+      paperClassName={classes.modal}
+    >
+      <TitleSection>
+        <Title size="xs" withoutMargin>
+          New Spending Limit
+        </Title>
+
+        <StyledButton onClick={close}>
+          <Icon size="sm" type="cross" />
+        </StyledButton>
+      </TitleSection>
+
+      <GnoForm
+        formMutators={formMutators}
+        onSubmit={handleSubmit}
+        subscription={{ submitting: true, pristine: true, values: true }}
+      >
+        {() => (
+          <>
+            <FormContainer>
+              <SelectAddressRow />
+              <TokenSelectRow />
+              <AmountSetRow />
+              <ResetTime />
+            </FormContainer>
+
+            <FooterSection>
+              <FooterWrapper>
+                <SpendingLimitFormButtons onClose={close} />
+              </FooterWrapper>
+            </FooterSection>
+          </>
+        )}
+      </GnoForm>
+    </GnoModal>
+  )
+}
+/**
+ * New Spending Limit Form - END
+ */
+
 const SpendingLimit = (): React.ReactElement => {
   const classes = useStyles()
+  const [showNewSpendingLimitModal, setShowNewSpendingLimitModal] = React.useState(false)
+
+  const openNewSpendingLimitModal = () => {
+    setShowNewSpendingLimitModal(true)
+  }
+
+  const closeNewSpendingLimitModal = () => {
+    setShowNewSpendingLimitModal(false)
+  }
 
   return (
     <>
@@ -95,16 +496,16 @@ const SpendingLimit = (): React.ReactElement => {
           <Button
             className={classes.actionButton}
             color="primary"
-            size="small"
-            testId="new-spending-limit-button"
-            onClick={() => {}}
+            size="md"
+            data-testid="new-spending-limit-button"
+            onClick={openNewSpendingLimitModal}
             variant="contained"
-            disabled
           >
             New spending limit
           </Button>
         </Col>
       </Row>
+      {showNewSpendingLimitModal && <NewSpendingLimitModal close={closeNewSpendingLimitModal} open={true} />}
     </>
   )
 }
diff --git a/src/routes/safe/components/Settings/SpendingLimit/style.ts b/src/routes/safe/components/Settings/SpendingLimit/style.ts
index 43cb78c445..b01a6cf360 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/style.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/style.ts
@@ -125,4 +125,7 @@ export const styles = createStyles({
     maxWidth: 'calc(100% - 30px)',
     overflow: 'hidden',
   },
+  amountInput: {
+    width: '100% !important',
+  },
 })

From 83a047887079a2e05cd869ca3aec901261ba98e8 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 6 Aug 2020 21:51:36 -0300
Subject: [PATCH 09/69] fix compatibility with new `safe-react-components`
 version

---
 src/routes/safe/components/Apps/index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/routes/safe/components/Apps/index.tsx b/src/routes/safe/components/Apps/index.tsx
index 4495bf9492..19e0e68244 100644
--- a/src/routes/safe/components/Apps/index.tsx
+++ b/src/routes/safe/components/Apps/index.tsx
@@ -1,4 +1,5 @@
 import { Card, FixedIcon, IconText, Loader, Menu, Title } from '@gnosis.pm/safe-react-components'
+import { makeStyles, createStyles } from '@material-ui/core/styles'
 import { withSnackbar } from 'notistack'
 import React, { useCallback, useEffect, useState, useMemo } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
@@ -23,6 +24,8 @@ import {
 } from 'src/routes/safe/store/selectors'
 import { isSameHref } from 'src/utils/url'
 
+const useStyles = makeStyles(createStyles({ card: { marginBottom: '24px' } }))
+
 const StyledIframe = styled.iframe`
   padding: 15px;
   box-sizing: border-box;
@@ -60,6 +63,7 @@ const operations = {
 }
 
 function Apps({ closeModal, closeSnackbar, enqueueSnackbar, openModal }) {
+  const classes = useStyles()
   const { appList, loadingAppList, onAppToggle, onAppAdded } = useAppList()
 
   const [appIsLoading, setAppIsLoading] = useState<boolean>(true)
@@ -271,7 +275,7 @@ function Apps({ closeModal, closeSnackbar, enqueueSnackbar, openModal }) {
           <LCL.Content>{getContent()}</LCL.Content>
         </LCL.Wrapper>
       ) : (
-        <Card style={{ marginBottom: '24px' }}>
+        <Card className={classes.card}>
           <Centered>
             <Title size="xs">No Apps Enabled</Title>
           </Centered>

From 66c1e85d930de3da0d5c7b53676f883490691c73 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 7 Aug 2020 10:19:53 -0300
Subject: [PATCH 10/69] update `safe-react-components` version

---
 package.json | 2 +-
 yarn.lock    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index ed79858c14..27b5976288 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,7 @@
   },
   "dependencies": {
     "@gnosis.pm/safe-contracts": "1.1.1-dev.2",
-    "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#4df39fe",
+    "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#45c746a",
     "@gnosis.pm/util-contracts": "2.0.6",
     "@ledgerhq/hw-transport-node-hid": "5.19.1",
     "@material-ui/core": "4.11.0",
diff --git a/yarn.lock b/yarn.lock
index a5a185d928..065aba1167 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1337,9 +1337,9 @@
     solc "0.5.14"
     truffle "^5.1.21"
 
-"@gnosis.pm/safe-react-components@https://github.com/gnosis/safe-react-components.git#4df39fe":
+"@gnosis.pm/safe-react-components@https://github.com/gnosis/safe-react-components.git#45c746a":
   version "0.2.0"
-  resolved "https://github.com/gnosis/safe-react-components.git#4df39fea2665000bb07bacba19e6f7631cca2de3"
+  resolved "https://github.com/gnosis/safe-react-components.git#45c746a12661b9c38e839e76022b6a0a92285db7"
   dependencies:
     classnames "^2.2.6"
     polished "3.6.5"
@@ -18784,7 +18784,6 @@ websocket@^1.0.31:
   dependencies:
     debug "^2.2.0"
     es5-ext "^0.10.50"
-    gulp "^4.0.2"
     nan "^2.14.0"
     typedarray-to-buffer "^3.1.5"
     yaeti "^0.0.6"

From debf1cea762adb42afde780e97aa471a91f42f6f Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Mon, 10 Aug 2020 21:45:57 -0300
Subject: [PATCH 11/69] fix styles for `TokenSelectField`'s placeholder

---
 .../SendModal/screens/SendFunds/TokenSelectField/index.tsx  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.tsx
index c87f53052f..02b50b561b 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.tsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.tsx
@@ -1,3 +1,4 @@
+import { Text } from '@gnosis.pm/safe-react-components'
 import ListItemIcon from '@material-ui/core/ListItemIcon'
 import ListItemText from '@material-ui/core/ListItemText'
 import MenuItem from '@material-ui/core/MenuItem'
@@ -12,7 +13,6 @@ import Field from 'src/components/forms/Field'
 import SelectField from 'src/components/forms/SelectField'
 import { required } from 'src/components/forms/validator'
 import Img from 'src/components/layout/Img'
-import Paragraph from 'src/components/layout/Paragraph'
 
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
@@ -42,9 +42,9 @@ const SelectedToken = ({ tokenAddress, tokens }: SelectTokenProps): React.ReactE
           />
         </>
       ) : (
-        <Paragraph color="disabled" size="md" style={{ opacity: 0.5 }} weight="light">
+        <Text color="placeHolder" size="xl">
           Select an asset*
-        </Paragraph>
+        </Text>
       )}
     </MenuItem>
   )

From 7c109f032ddb9298525b9bcaafa4fae1cfdff9e7 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Mon, 10 Aug 2020 21:47:22 -0300
Subject: [PATCH 12/69] WIP: add review screen

Also:
- fixed styles
- handled form state while going back and forth between create and review
- had to change `Review` Button as submitting wasn't triggered on the first click.
---
 .../Settings/SpendingLimit/index.tsx          | 294 ++++++++++++++----
 1 file changed, 229 insertions(+), 65 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index ab96ceef72..0a593fef14 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -1,6 +1,16 @@
-import { Button, EthHashInfo, Icon, RadioButtons, Text, TextField, Title } from '@gnosis.pm/safe-react-components'
+import {
+  Button,
+  EthHashInfo,
+  Icon,
+  IconText,
+  RadioButtons,
+  Text,
+  TextField,
+  Title,
+} from '@gnosis.pm/safe-react-components'
 import { FormControlLabel, hexToRgb, Switch as SwitchMui } from '@material-ui/core'
 import { makeStyles } from '@material-ui/core/styles'
+import { Skeleton } from '@material-ui/lab'
 import { Mutator } from 'final-form'
 import React from 'react'
 import { useField, useForm, useFormState } from 'react-final-form'
@@ -10,6 +20,7 @@ import GnoField from 'src/components/forms/Field'
 import GnoForm from 'src/components/forms/GnoForm'
 import { composeValidators, minValue, mustBeFloat, required } from 'src/components/forms/validator'
 import Block from 'src/components/layout/Block'
+import GnoButton from 'src/components/layout/Button'
 import Col from 'src/components/layout/Col'
 import Img from 'src/components/layout/Img'
 import Row from 'src/components/layout/Row'
@@ -18,8 +29,10 @@ import { ScanQRWrapper } from 'src/components/ScanQRModal/ScanQRWrapper'
 import { getNetwork } from 'src/config'
 import { getAddressBook } from 'src/logic/addressBook/store/selectors'
 import { getNameFromAdbk } from 'src/logic/addressBook/utils'
+import { Token } from 'src/logic/tokens/store/model/token'
 import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/screens/AddressBookInput'
 import TokenSelectField from 'src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField'
+import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
 import styled from 'styled-components'
 
@@ -75,19 +88,29 @@ const KEYCODES = {
 const SelectAddressRow = (): React.ReactElement => {
   const classes = useStyles()
 
+  const { initialValues } = useFormState()
   const { mutators } = useForm()
+  React.useEffect(() => {
+    if (initialValues?.beneficiary) {
+      mutators?.setBeneficiary?.(initialValues.beneficiary)
+    }
+  }, [initialValues, mutators])
 
   const [selectedEntry, setSelectedEntry] = React.useState<{ address: string; name: string } | null>({
-    address: '',
+    address: initialValues?.beneficiary || '',
     name: '',
   })
 
-  const [pristine, setPristine] = React.useState<boolean>(true)
+  const [pristine, setPristine] = React.useState<boolean>(!initialValues?.beneficiary)
   React.useMemo(() => {
-    if (selectedEntry === null && pristine) {
-      setPristine(false)
+    if (selectedEntry === null) {
+      mutators?.setBeneficiary?.('')
+
+      if (pristine) {
+        setPristine(false)
+      }
     }
-  }, [selectedEntry, pristine])
+  }, [selectedEntry, mutators, pristine])
 
   const addressBook = useSelector(getAddressBook)
   const handleScan = (value, closeQrModal) => {
@@ -160,12 +183,6 @@ const SelectAddressRow = (): React.ReactElement => {
  */
 const TokenSelectRow = (): React.ReactElement => {
   const tokens = useSelector(extendedSafeTokensSelector)
-  // const {
-  //   input: { value: tokenAddress },
-  //   meta: { pristine, dirty },
-  // } = useField('token', { subscription: { value: true, pristine: true, dirty: true } })
-  // const {  } = useFormState()
-  // const setRed = dirty && !pristine && !tokenAddress
 
   return (
     <Row margin="md">
@@ -184,18 +201,22 @@ const AmountSetRow = (): React.ReactElement => {
 
   const {
     input: { value: tokenAddress },
-    meta: { pristine: tokenAddressPristine },
-  } = useField('token', { subscription: { value: true, pristine: true } })
+  } = useField('token', { subscription: { value: true } })
+  const {
+    meta: { touched, visited },
+  } = useField('amount', { subscription: { touched: true, visited: true } })
   const tokens = useSelector(extendedSafeTokensSelector)
   const selectedTokenRecord = tokens.find((token) => token.address === tokenAddress)
-  const validate = !tokenAddressPristine && composeValidators(required, mustBeFloat, minValue(0, false))
+  const validate = (touched || visited) && composeValidators(required, mustBeFloat, minValue(0, false))
+
+  console.log({ validate })
 
   return (
     <Row margin="md">
       <Col>
         <Field
           component={TextField}
-          label="Amount"
+          label="Amount*"
           name="amount"
           type="text"
           data-testid="amount-input"
@@ -309,36 +330,189 @@ const ResetTime = (): React.ReactElement => {
  * resetTime - END
  */
 
-const canSubmit = ({ dirty, invalid, submitting, dirtyFieldsSinceLastSubmit, pristine, values }): boolean => {
+const YetAnotherButton = styled(GnoButton)`
+  &.Mui-disabled {
+    background-color: ${({ theme }) => theme.colors.primary};
+    color: ${({ theme }) => theme.colors.white};
+    opacity: 0.5;
+  }
+`
+const canReview = ({ invalid, submitting, dirtyFieldsSinceLastSubmit, values }): boolean => {
   return !(
     submitting ||
     invalid ||
-    pristine ||
-    !dirty ||
+    !values.beneficiary ||
     (values.token && !values.amount) ||
+    // TODO: review the next validation, as resetTime has a default value, this check looks unnecessary
     (values.withResetTime && !values.resetTime) ||
     !dirtyFieldsSinceLastSubmit
   )
 }
-const SpendingLimitFormButtons = ({ onClose }: { onClose: () => void }): React.ReactElement => {
-  const formState = useFormState()
+interface NewSpendingLimitProps {
+  initialValues?: Record<string, string>
+  onCancel: () => void
+  onReview: (values) => void
+}
+/**
+ * New Spending Limit Form - START
+ */
+const NewSpendingLimit = ({ initialValues, onCancel, onReview }: NewSpendingLimitProps): React.ReactElement => (
+  <>
+    <TitleSection>
+      <Title size="xs" withoutMargin>
+        New Spending Limit{' '}
+        <Text size="lg" color="secondaryLight">
+          1 of 2
+        </Text>
+      </Title>
+
+      <StyledButton onClick={onCancel}>
+        <Icon size="sm" type="cross" />
+      </StyledButton>
+    </TitleSection>
+
+    <GnoForm formMutators={formMutators} onSubmit={onReview} initialValues={initialValues}>
+      {(...args) => (
+        <>
+          <FormContainer>
+            <SelectAddressRow />
+            <TokenSelectRow />
+            <AmountSetRow />
+            <ResetTime />
+          </FormContainer>
+
+          <FooterSection>
+            <FooterWrapper>
+              <Button color="secondary" size="md" onClick={onCancel}>
+                Cancel
+              </Button>
+
+              <YetAnotherButton
+                color="primary"
+                size="medium"
+                variant="contained"
+                type="submit"
+                disabled={!canReview(args[2])}
+              >
+                Review
+              </YetAnotherButton>
+            </FooterWrapper>
+          </FooterSection>
+        </>
+      )}
+    </GnoForm>
+  </>
+)
+
+const StyledImage = styled.img`
+  width: 32px;
+  height: 32px;
+  object-fit: contain;
+  margin: 0 8px 0 0;
+`
+const StyledImageName = styled.div`
+  display: flex;
+  align-items: center;
+`
+interface ReviewSpendingLimitProps {
+  onBack: () => void
+  onClose: () => void
+  onSubmit: () => void
+  txToken: Token | null
+  values: Record<string, string>
+}
+const ReviewSpendingLimit = ({
+  onBack,
+  onClose,
+  onSubmit,
+  txToken,
+  values,
+}: ReviewSpendingLimitProps): React.ReactElement => {
+  const addressBook = useSelector(getAddressBook)
 
   return (
     <>
-      <Button color="secondary" size="md" onClick={onClose}>
-        Cancel
-      </Button>
+      <TitleSection>
+        <Title size="xs" withoutMargin>
+          New Spending Limit{' '}
+          <Text size="lg" color="secondaryLight">
+            2 of 2
+          </Text>
+        </Title>
+
+        <StyledButton onClick={onClose}>
+          <Icon size="sm" type="cross" />
+        </StyledButton>
+      </TitleSection>
 
-      <Button color="primary" size="md" variant="contained" type="submit" disabled={!canSubmit(formState)}>
-        Submit
-      </Button>
+      <FormContainer>
+        <Col margin="lg">
+          <Text size="lg" color="secondaryLight">
+            Beneficiary
+          </Text>
+          <EthHashInfo
+            hash={values.beneficiary}
+            name={addressBook ? getNameFromAdbk(addressBook, values.beneficiary) : ''}
+            showCopyBtn
+            showEtherscanBtn
+            showIdenticon
+            textSize="lg"
+            network={getNetwork()}
+          />
+        </Col>
+        <Col margin="lg">
+          <Text size="lg" color="secondaryLight">
+            Amount
+          </Text>
+          {txToken !== null ? (
+            <StyledImageName>
+              <StyledImage alt={txToken.name} onError={setImageToPlaceholder} src={txToken.logoUri} />
+              <Text size="lg">
+                {values.amount} {txToken.symbol}
+              </Text>
+            </StyledImageName>
+          ) : (
+            <Skeleton animation="wave" variant="text" />
+          )}
+        </Col>
+        <Col margin="lg">
+          <Text size="lg" color="secondaryLight">
+            Reset Time
+          </Text>
+          {values.withResetTime ? (
+            <Row align="center" margin="md">
+              <IconText
+                iconSize="md"
+                iconType="fuelIndicator"
+                text={RESET_TIME_OPTIONS.find(({ value }) => value === values.resetTime).label}
+                textSize="lg"
+              />
+            </Row>
+          ) : (
+            <Row align="center" margin="md">
+              <Text size="lg">
+                {/* TODO: review message */}
+                One-time spending limit allowance
+              </Text>
+            </Row>
+          )}
+        </Col>
+      </FormContainer>
+
+      <FooterSection>
+        <FooterWrapper>
+          <Button color="secondary" size="md" onClick={onBack}>
+            Back
+          </Button>
+
+          <Button color="primary" size="md" variant="contained" onClick={onSubmit}>
+            Submit
+          </Button>
+        </FooterWrapper>
+      </FooterSection>
     </>
   )
 }
-
-/**
- * New Spending Limit Form - START
- */
 // TODO: propose refactor in safe-react-components based on this requirements
 const TitleSection = styled.div`
   display: flex;
@@ -382,8 +556,20 @@ const formMutators: Record<string, Mutator<{ beneficiary: { name: string } }>> =
 const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boolean }): React.ReactElement => {
   const classes = useStyles()
 
-  const handleSubmit = (values) => {
-    console.log(values)
+  const [step, setStep] = React.useState<'create' | 'review'>('create')
+  const [values, setValues] = React.useState()
+  const tokens = useSelector(extendedSafeTokensSelector)
+  const [txToken, setTxToken] = React.useState(null)
+  const handleReview = (values) => {
+    setValues(values)
+    if (values.token) {
+      setTxToken(tokens.find((token) => token.address === values.token))
+    }
+    setStep('review')
+  }
+  const handleSubmit = () => {
+    // TODO: here we do the magic. FINALLY!!!!
+    console.log({ values })
   }
 
   return (
@@ -394,38 +580,16 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
       description="set rules for specific beneficiaries to access funds from this Safe without having to collect all signatures"
       paperClassName={classes.modal}
     >
-      <TitleSection>
-        <Title size="xs" withoutMargin>
-          New Spending Limit
-        </Title>
-
-        <StyledButton onClick={close}>
-          <Icon size="sm" type="cross" />
-        </StyledButton>
-      </TitleSection>
-
-      <GnoForm
-        formMutators={formMutators}
-        onSubmit={handleSubmit}
-        subscription={{ submitting: true, pristine: true, values: true }}
-      >
-        {() => (
-          <>
-            <FormContainer>
-              <SelectAddressRow />
-              <TokenSelectRow />
-              <AmountSetRow />
-              <ResetTime />
-            </FormContainer>
-
-            <FooterSection>
-              <FooterWrapper>
-                <SpendingLimitFormButtons onClose={close} />
-              </FooterWrapper>
-            </FooterSection>
-          </>
-        )}
-      </GnoForm>
+      {step === 'create' && <NewSpendingLimit initialValues={values} onCancel={close} onReview={handleReview} />}
+      {step === 'review' && (
+        <ReviewSpendingLimit
+          onBack={() => setStep('create')}
+          onClose={close}
+          onSubmit={handleSubmit}
+          txToken={txToken}
+          values={values}
+        />
+      )}
     </GnoModal>
   )
 }

From b8540533a7fb70830cb8bc30074492725a3f0240 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Tue, 11 Aug 2020 16:26:21 -0300
Subject: [PATCH 13/69] WIP: fix styles/layout

- also refactored `ScanQRWrapper` so it uses the specified icon
---
 .../ScanQRModal/ScanQRWrapper/index.tsx       |  32 +--
 .../Settings/SpendingLimit/index.tsx          | 270 +++++++++---------
 2 files changed, 156 insertions(+), 146 deletions(-)

diff --git a/src/components/ScanQRModal/ScanQRWrapper/index.tsx b/src/components/ScanQRModal/ScanQRWrapper/index.tsx
index 9982e6c400..1a4cbca479 100644
--- a/src/components/ScanQRModal/ScanQRWrapper/index.tsx
+++ b/src/components/ScanQRModal/ScanQRWrapper/index.tsx
@@ -1,20 +1,24 @@
+import { Icon } from '@gnosis.pm/safe-react-components'
 import { makeStyles } from '@material-ui/core/styles'
-import { useState } from 'react'
-import * as React from 'react'
+import React from 'react'
 
-import QRIcon from 'src/assets/icons/qrcode.svg'
 import ScanQRModal from 'src/components/ScanQRModal'
-import Img from 'src/components/layout/Img'
 
 const useStyles = makeStyles({
   qrCodeBtn: {
     cursor: 'pointer',
+    border: 'none',
+    backgroundColor: 'transparent',
   },
 })
 
-export const ScanQRWrapper = (props) => {
+interface ScanQRWrapperProps {
+  handleScan: (value: string, closeQRCallback: () => void) => void
+}
+
+export const ScanQRWrapper = ({ handleScan }: ScanQRWrapperProps): React.ReactElement => {
   const classes = useStyles()
-  const [qrModalOpen, setQrModalOpen] = useState(false)
+  const [qrModalOpen, setQrModalOpen] = React.useState(false)
 
   const openQrModal = () => {
     setQrModalOpen(true)
@@ -25,22 +29,14 @@ export const ScanQRWrapper = (props) => {
   }
 
   const onScanFinished = (value) => {
-    props.handleScan(value, closeQrModal)
+    handleScan(value, closeQrModal)
   }
 
   return (
     <>
-      <Img
-        alt="Scan QR"
-        className={classes.qrCodeBtn}
-        height={20}
-        onClick={() => {
-          openQrModal()
-        }}
-        role="button"
-        src={QRIcon}
-        testId="qr-icon"
-      />
+      <button onClick={openQrModal} className={classes.qrCodeBtn} title="Scan QR" data-testid="qr-icon" type="button">
+        <Icon type="qrCode" size="sm" />
+      </button>
       {qrModalOpen && <ScanQRModal isOpen={qrModalOpen} onClose={closeQrModal} onScan={onScanFinished} />}
     </>
   )
diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 0a593fef14..d5aaa332db 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -15,6 +15,7 @@ import { Mutator } from 'final-form'
 import React from 'react'
 import { useField, useForm, useFormState } from 'react-final-form'
 import { useSelector } from 'react-redux'
+import styled from 'styled-components'
 
 import GnoField from 'src/components/forms/Field'
 import GnoForm from 'src/components/forms/GnoForm'
@@ -34,7 +35,6 @@ import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/scre
 import TokenSelectField from 'src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
-import styled from 'styled-components'
 
 import AssetAmount from './assets/asset-amount.svg'
 import Beneficiary from './assets/beneficiary.svg'
@@ -68,7 +68,6 @@ const SpendingLimitStep = styled.div`
   min-width: 120px;
   max-width: 164px;
 `
-
 //
 // TODO: refactor and split into components for better readability
 //
@@ -85,9 +84,13 @@ const KEYCODES = {
   TAB: 9,
   SHIFT: 16,
 }
+const BeneficiaryInput = styled.div`
+  grid-area: beneficiaryInput;
+`
+const BeneficiaryScan = styled.div`
+  grid-area: beneficiaryScan;
+`
 const SelectAddressRow = (): React.ReactElement => {
-  const classes = useStyles()
-
   const { initialValues } = useFormState()
   const { mutators } = useForm()
   React.useEffect(() => {
@@ -128,50 +131,44 @@ const SelectAddressRow = (): React.ReactElement => {
     closeQrModal()
   }
 
-  return (
-    <Row margin="md">
-      {!!selectedEntry?.address ? (
-        <Col xs={12}>
-          <div
-            role="button"
-            aria-pressed="false"
-            tabIndex={0}
-            onKeyDown={(e) => {
-              if (![KEYCODES.TAB, KEYCODES.SHIFT].includes(e.keyCode)) {
-                setSelectedEntry(null)
-              }
-            }}
-            onClick={() => {
-              setSelectedEntry(null)
-            }}
-          >
-            <EthHashInfo
-              hash={selectedEntry.address}
-              name={selectedEntry.name}
-              showCopyBtn
-              showEtherscanBtn
-              showIdenticon
-              textSize="lg"
-              network={getNetwork()}
-            />
-          </div>
-        </Col>
-      ) : (
-        <>
-          <Col xs={11}>
-            <AddressBookInput
-              fieldMutator={mutators?.setBeneficiary}
-              pristine={pristine}
-              setSelectedEntry={setSelectedEntry}
-              label="Beneficiary"
-            />
-          </Col>
-          <Col center="xs" className={classes} middle="xs" xs={1}>
-            <ScanQRWrapper handleScan={handleScan} />
-          </Col>
-        </>
-      )}
-    </Row>
+  return !!selectedEntry?.address ? (
+    <BeneficiaryInput
+      role="button"
+      aria-pressed="false"
+      tabIndex={0}
+      onKeyDown={(e) => {
+        if (![KEYCODES.TAB, KEYCODES.SHIFT].includes(e.keyCode)) {
+          setSelectedEntry(null)
+        }
+      }}
+      onClick={() => {
+        setSelectedEntry(null)
+      }}
+    >
+      <EthHashInfo
+        hash={selectedEntry.address}
+        name={selectedEntry.name}
+        showCopyBtn
+        showEtherscanBtn
+        showIdenticon
+        textSize="lg"
+        network={getNetwork()}
+      />
+    </BeneficiaryInput>
+  ) : (
+    <>
+      <BeneficiaryInput>
+        <AddressBookInput
+          fieldMutator={mutators?.setBeneficiary}
+          pristine={pristine}
+          setSelectedEntry={setSelectedEntry}
+          label="Beneficiary"
+        />
+      </BeneficiaryInput>
+      <BeneficiaryScan>
+        <ScanQRWrapper handleScan={handleScan} />
+      </BeneficiaryScan>
+    </>
   )
 }
 /**
@@ -181,21 +178,28 @@ const SelectAddressRow = (): React.ReactElement => {
 /**
  * token
  */
+const TokenInput = styled.div`
+  grid-area: tokenInput;
+`
 const TokenSelectRow = (): React.ReactElement => {
   const tokens = useSelector(extendedSafeTokensSelector)
 
   return (
-    <Row margin="md">
-      <Col>
-        <TokenSelectField tokens={tokens} />
-      </Col>
-    </Row>
+    <TokenInput>
+      <TokenSelectField tokens={tokens} />
+    </TokenInput>
   )
 }
 
 /**
  * amount
  */
+const AmountInput = styled.div`
+  grid-area: amountInput;
+`
+const GnoTextField = styled(TextField)`
+  margin: 0;
+`
 const AmountSetRow = (): React.ReactElement => {
   const classes = useStyles()
 
@@ -209,23 +213,19 @@ const AmountSetRow = (): React.ReactElement => {
   const selectedTokenRecord = tokens.find((token) => token.address === tokenAddress)
   const validate = (touched || visited) && composeValidators(required, mustBeFloat, minValue(0, false))
 
-  console.log({ validate })
-
   return (
-    <Row margin="md">
-      <Col>
-        <Field
-          component={TextField}
-          label="Amount*"
-          name="amount"
-          type="text"
-          data-testid="amount-input"
-          endAdornment={selectedTokenRecord?.symbol}
-          className={classes.amountInput}
-          validate={validate}
-        />
-      </Col>
-    </Row>
+    <AmountInput>
+      <Field
+        component={GnoTextField}
+        label="Amount*"
+        name="amount"
+        type="text"
+        data-testid="amount-input"
+        endAdornment={selectedTokenRecord?.symbol}
+        className={classes.amountInput}
+        validate={validate}
+      />
+    </AmountInput>
   )
 }
 
@@ -293,6 +293,15 @@ const RESET_TIME_OPTIONS = [
   { label: '1 week', value: '7' },
   { label: '1 month', value: '30' },
 ]
+const ResetTimeLabel = styled.div`
+  grid-area: resetTimeLabel;
+`
+const ResetTimeToggle = styled.div`
+  grid-area: resetTimeToggle;
+`
+const ResetTimeOptions = styled.div`
+  grid-area: resetTimeOption;
+`
 const ResetTime = (): React.ReactElement => {
   const {
     input: { value: withResetTime },
@@ -300,28 +309,20 @@ const ResetTime = (): React.ReactElement => {
 
   return (
     <>
-      <Row margin="md">
-        <Col>
-          <Text size="xl">
-            Set a reset-time to have the allowance automatically refill after a defined time-period.
-          </Text>
-        </Col>
-      </Row>
-      <Row margin="md">
-        <Col>
-          <Switch label="Reset time" name="withResetTime" />
-        </Col>
-      </Row>
+      <ResetTimeLabel>
+        <Text size="xl">Set a reset-time to have the allowance automatically refill after a defined time-period.</Text>
+      </ResetTimeLabel>
+      <ResetTimeToggle>
+        <Switch label="Reset time" name="withResetTime" />
+      </ResetTimeToggle>
       {withResetTime && (
-        <Row margin="md">
-          <Col>
-            <SafeRadioButtons
-              groupName="resetTime"
-              initialValue={RESET_TIME_OPTIONS[0].value}
-              options={RESET_TIME_OPTIONS}
-            />
-          </Col>
-        </Row>
+        <ResetTimeOptions>
+          <SafeRadioButtons
+            groupName="resetTime"
+            initialValue={RESET_TIME_OPTIONS[0].value}
+            options={RESET_TIME_OPTIONS}
+          />
+        </ResetTimeOptions>
       )}
     </>
   )
@@ -356,6 +357,52 @@ interface NewSpendingLimitProps {
 /**
  * New Spending Limit Form - START
  */
+const TitleSection = styled.div`
+  display: flex;
+  justify-content: space-between;
+  padding: 16px 24px;
+  border-bottom: 2px solid ${({ theme }) => theme.colors.separator};
+`
+const StyledButton = styled.button`
+  background: none;
+  border: none;
+  padding: 5px;
+  width: 26px;
+  height: 26px;
+
+  span {
+    margin-right: 0;
+  }
+
+  :hover {
+    background: ${({ theme }) => theme.colors.separator};
+    border-radius: 16px;
+    cursor: pointer;
+  }
+`
+const FormContainer = styled.div`
+  padding: 24px;
+  align-items: center;
+  display: grid;
+  grid-template-columns: 4fr 1fr;
+  grid-template-rows: 6fr;
+  gap: 16px 8px;
+  grid-template-areas:
+    'beneficiaryInput beneficiaryScan'
+    'tokenInput .'
+    'amountInput .'
+    'resetTimeLabel resetTimeLabel'
+    'resetTimeToggle resetTimeToggle'
+    'resetTimeOption resetTimeOption';
+`
+const FooterSection = styled.div`
+  border-top: 2px solid ${({ theme }) => theme.colors.separator};
+  padding: 16px 24px;
+`
+const FooterWrapper = styled.div`
+  display: flex;
+  justify-content: space-around;
+`
 const NewSpendingLimit = ({ initialValues, onCancel, onReview }: NewSpendingLimitProps): React.ReactElement => (
   <>
     <TitleSection>
@@ -383,7 +430,7 @@ const NewSpendingLimit = ({ initialValues, onCancel, onReview }: NewSpendingLimi
 
           <FooterSection>
             <FooterWrapper>
-              <Button color="secondary" size="md" onClick={onCancel}>
+              <Button color="primary" size="md" onClick={onCancel}>
                 Cancel
               </Button>
 
@@ -428,6 +475,7 @@ const ReviewSpendingLimit = ({
   txToken,
   values,
 }: ReviewSpendingLimitProps): React.ReactElement => {
+  const classes = useStyles()
   const addressBook = useSelector(getAddressBook)
 
   return (
@@ -445,7 +493,7 @@ const ReviewSpendingLimit = ({
         </StyledButton>
       </TitleSection>
 
-      <FormContainer>
+      <Block className={classes.container}>
         <Col margin="lg">
           <Text size="lg" color="secondaryLight">
             Beneficiary
@@ -497,11 +545,11 @@ const ReviewSpendingLimit = ({
             </Row>
           )}
         </Col>
-      </FormContainer>
+      </Block>
 
       <FooterSection>
         <FooterWrapper>
-          <Button color="secondary" size="md" onClick={onBack}>
+          <Button color="primary" size="md" onClick={onBack}>
             Back
           </Button>
 
@@ -514,40 +562,6 @@ const ReviewSpendingLimit = ({
   )
 }
 // TODO: propose refactor in safe-react-components based on this requirements
-const TitleSection = styled.div`
-  display: flex;
-  justify-content: space-between;
-  padding: 16px 24px;
-  border-bottom: 2px solid ${({ theme }) => theme.colors.separator};
-`
-const StyledButton = styled.button`
-  background: none;
-  border: none;
-  padding: 5px;
-  width: 26px;
-  height: 26px;
-
-  span {
-    margin-right: 0;
-  }
-
-  :hover {
-    background: ${({ theme }) => theme.colors.separator};
-    border-radius: 16px;
-    cursor: pointer;
-  }
-`
-const FormContainer = styled.div`
-  padding: 24px;
-`
-const FooterSection = styled.div`
-  border-top: 2px solid ${({ theme }) => theme.colors.separator};
-  padding: 16px 24px;
-`
-const FooterWrapper = styled.div`
-  display: flex;
-  justify-content: space-around;
-`
 const formMutators: Record<string, Mutator<{ beneficiary: { name: string } }>> = {
   setBeneficiary: (args, state, utils) => {
     utils.changeValue(state, 'beneficiary', () => args[0])

From 3c9543d27bc58b6618a9e6edb21d648f951ffcb8 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 13 Aug 2020 10:58:25 -0300
Subject: [PATCH 14/69] disable Spending Limit button for non-owners

---
 src/routes/safe/components/Settings/SpendingLimit/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index d5aaa332db..1db9e81a41 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -34,7 +34,7 @@ import { Token } from 'src/logic/tokens/store/model/token'
 import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/screens/AddressBookInput'
 import TokenSelectField from 'src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
-import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
+import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
 
 import AssetAmount from './assets/asset-amount.svg'
 import Beneficiary from './assets/beneficiary.svg'
@@ -613,6 +613,7 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
 
 const SpendingLimit = (): React.ReactElement => {
   const classes = useStyles()
+  const granted = useSelector(grantedSelector)
   const [showNewSpendingLimitModal, setShowNewSpendingLimitModal] = React.useState(false)
 
   const openNewSpendingLimitModal = () => {
@@ -674,6 +675,7 @@ const SpendingLimit = (): React.ReactElement => {
           <Button
             className={classes.actionButton}
             color="primary"
+            disabled={!granted}
             size="md"
             data-testid="new-spending-limit-button"
             onClick={openNewSpendingLimitModal}

From a3b9ee2435e523632609b8324bd5846415d6ec88 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Sat, 15 Aug 2020 21:15:54 -0300
Subject: [PATCH 15/69] WIP: Add new spending limit

- if the module is not enabled it will be enabled on the first tx
- beneficiary is added to the delegate list in the contract
- allowance is set

Still several things to address, like informing the user about an existing allowance, code cleanup
---
 .../Settings/SpendingLimit/index.tsx          |   116 +-
 src/utils/AllowanceModule.json                | 34594 ++++++++++++++++
 src/utils/constants.ts                        |     2 +
 yarn.lock                                     |   863 +-
 4 files changed, 34735 insertions(+), 840 deletions(-)
 create mode 100644 src/utils/AllowanceModule.json

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 1db9e81a41..21a718e8a9 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -1,3 +1,6 @@
+import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
+import { useSnackbar } from 'notistack'
+import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import {
   Button,
   EthHashInfo,
@@ -14,7 +17,13 @@ import { Skeleton } from '@material-ui/lab'
 import { Mutator } from 'final-form'
 import React from 'react'
 import { useField, useForm, useFormState } from 'react-final-form'
-import { useSelector } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
+import generateBatchRequests from 'src/logic/contracts/generateBatchRequests'
+import { getGnosisSafeInstanceAt, SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
+import { getWeb3, web3ReadOnly } from 'src/logic/wallets/getWeb3'
+import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
+import { safeModulesSelector, safeParamAddressFromStateSelector } from 'src/routes/safe/store/selectors'
+import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 import styled from 'styled-components'
 
 import GnoField from 'src/components/forms/Field'
@@ -567,6 +576,32 @@ const formMutators: Record<string, Mutator<{ beneficiary: { name: string } }>> =
     utils.changeValue(state, 'beneficiary', () => args[0])
   },
 }
+
+const requestModuleData = (safeAddress: string): Promise<any[]> => {
+  const batch = new web3ReadOnly.BatchRequest()
+
+  const requests = [
+    {
+      abi: GnosisSafeSol.abi,
+      address: safeAddress,
+      methods: [{ method: 'getModulesPaginated', args: [SENTINEL_ADDRESS, 100] }],
+    },
+    {
+      abi: SpendingLimitModule.abi,
+      address: SPENDING_LIMIT_MODULE_ADDRESS,
+      methods: [{ method: 'getDelegates', args: [safeAddress, 0, 100] }],
+    },
+  ]
+
+  const whenRequestsValues = requests.map(generateBatchRequests)
+
+  batch.execute()
+
+  return Promise.all(whenRequestsValues)
+}
+
+const currentMinutes = () => Math.floor(Date.now() / (1000 * 60))
+
 const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boolean }): React.ReactElement => {
   const classes = useStyles()
 
@@ -581,11 +616,82 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
     }
     setStep('review')
   }
-  const handleSubmit = () => {
+
+  const safeAddress = useSelector(safeParamAddressFromStateSelector)
+  const modules = useSelector(safeModulesSelector)
+  const { enqueueSnackbar, closeSnackbar } = useSnackbar()
+  const dispatch = useDispatch()
+
+  const handleSubmit = async (values: Record<string, string>) => {
     // TODO: here we do the magic. FINALLY!!!!
-    console.log({ values })
-  }
+    const [enabledModules, delegates] = await requestModuleData(safeAddress)
+    const isSpendingLimitEnabled =
+      enabledModules[0]?.array?.some(
+        (module) => module.toLowerCase() === SPENDING_LIMIT_MODULE_ADDRESS.toLowerCase(),
+      ) ?? false
+    const transactions = []
+
+    // is spendingLimit module enabled? -> if not, create the tx to enable it, and encode it
+    if (!isSpendingLimitEnabled) {
+      const safeInstance = await getGnosisSafeInstanceAt(safeAddress)
+      transactions.push({
+        to: safeAddress,
+        value: 0,
+        data: safeInstance.methods.enableModule(SPENDING_LIMIT_MODULE_ADDRESS).encodeABI(),
+      })
+    }
+
+    // does `delegate` already exist? (`getDelegates`, previously queried to build the table with allowances (??))
+    //                                  ^ - shall we rely on this or query the list of delegates once again?
+    const isDelegateAlreadyAdded =
+      delegates[0].results.some((delegate) => delegate.toLowerCase() === values?.beneficiary.toLowerCase()) ?? false
+
+    // if `delegate` does not exist, add it by calling `addDelegate(beneficiary)`
+    if (!isDelegateAlreadyAdded) {
+      const web3 = getWeb3()
+      const spendingLimit = new web3.eth.Contract(SpendingLimitModule.abi as any, SPENDING_LIMIT_MODULE_ADDRESS)
+      transactions.push({
+        to: SPENDING_LIMIT_MODULE_ADDRESS,
+        value: 0,
+        data: spendingLimit.methods.addDelegate(values?.beneficiary).encodeABI(),
+      })
+    } else {
+      // if `delegate` already exist, check what tokens were delegated to the _beneficiary_ `getTokens(safe, delegate)`
+      // if tokens were delegated to the _beneficiary_, prevent "setting a 'new' allowance", and inform the user about the current allowance and opt in for replacement (??)
+      // TODO: we must do this check before building the tx
+    }
+
+    // prepare the setAllowance tx
+    const web3 = getWeb3()
+    const spendingLimit = new web3.eth.Contract(SpendingLimitModule.abi as any, SPENDING_LIMIT_MODULE_ADDRESS)
+    const startTime = currentMinutes() - 30
+    transactions.push({
+      to: SPENDING_LIMIT_MODULE_ADDRESS,
+      value: 0,
+      data: spendingLimit.methods
+        .setAllowance(
+          values.beneficiary,
+          values.token,
+          values.amount,
+          values.withResetTime ? +values.resetTime * 60 * 24 : 0,
+          startTime,
+        )
+        .encodeABI(),
+    })
 
+    console.log({ modules, enabledModules, delegates, values })
+
+    await sendTransactions(
+      dispatch,
+      safeAddress,
+      transactions,
+      enqueueSnackbar,
+      closeSnackbar,
+      JSON.stringify({ name: 'Spending Limit', message: 'New Allowance' }),
+    )
+      .then(close)
+      .catch(console.error)
+  }
   return (
     <GnoModal
       handleClose={close}
@@ -599,7 +705,7 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
         <ReviewSpendingLimit
           onBack={() => setStep('create')}
           onClose={close}
-          onSubmit={handleSubmit}
+          onSubmit={() => handleSubmit(values)}
           txToken={txToken}
           values={values}
         />
diff --git a/src/utils/AllowanceModule.json b/src/utils/AllowanceModule.json
new file mode 100644
index 0000000000..5145062965
--- /dev/null
+++ b/src/utils/AllowanceModule.json
@@ -0,0 +1,34594 @@
+{
+  "contractName": "AllowanceModule",
+  "abi": [
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "DOMAIN_SEPARATOR_TYPEHASH",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "name": "delegatesStart",
+      "outputs": [
+        {
+          "internalType": "uint48",
+          "name": "",
+          "type": "uint48"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "ALLOWANCE_TRANSFER_TYPEHASH",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "NAME",
+      "outputs": [
+        {
+          "internalType": "string",
+          "name": "",
+          "type": "string"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "name": "allowances",
+      "outputs": [
+        {
+          "internalType": "uint96",
+          "name": "amount",
+          "type": "uint96"
+        },
+        {
+          "internalType": "uint96",
+          "name": "spent",
+          "type": "uint96"
+        },
+        {
+          "internalType": "uint16",
+          "name": "resetTimeMin",
+          "type": "uint16"
+        },
+        {
+          "internalType": "uint32",
+          "name": "lastResetMin",
+          "type": "uint32"
+        },
+        {
+          "internalType": "uint16",
+          "name": "nonce",
+          "type": "uint16"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        },
+        {
+          "internalType": "uint48",
+          "name": "",
+          "type": "uint48"
+        }
+      ],
+      "name": "delegates",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "delegate",
+          "type": "address"
+        },
+        {
+          "internalType": "uint48",
+          "name": "prev",
+          "type": "uint48"
+        },
+        {
+          "internalType": "uint48",
+          "name": "next",
+          "type": "uint48"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "name": "tokens",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "domainSeparator",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "VERSION",
+      "outputs": [
+        {
+          "internalType": "string",
+          "name": "",
+          "type": "string"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "safe",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "delegate",
+          "type": "address"
+        }
+      ],
+      "name": "AddDelegate",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "safe",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "delegate",
+          "type": "address"
+        }
+      ],
+      "name": "RemoveDelegate",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "safe",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "delegate",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint96",
+          "name": "value",
+          "type": "uint96"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint16",
+          "name": "nonce",
+          "type": "uint16"
+        }
+      ],
+      "name": "ExecuteAllowanceTransfer",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "safe",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "delegate",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint96",
+          "name": "allowanceAmount",
+          "type": "uint96"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint16",
+          "name": "resetTime",
+          "type": "uint16"
+        }
+      ],
+      "name": "SetAllowance",
+      "type": "event"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "delegate",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "internalType": "uint96",
+          "name": "allowanceAmount",
+          "type": "uint96"
+        },
+        {
+          "internalType": "uint16",
+          "name": "resetTimeMin",
+          "type": "uint16"
+        },
+        {
+          "internalType": "uint32",
+          "name": "resetBaseMin",
+          "type": "uint32"
+        }
+      ],
+      "name": "setAllowance",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "delegate",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "resetAllowance",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "internalType": "contract GnosisSafe",
+          "name": "safe",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "internalType": "address payable",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "uint96",
+          "name": "amount",
+          "type": "uint96"
+        },
+        {
+          "internalType": "address",
+          "name": "paymentToken",
+          "type": "address"
+        },
+        {
+          "internalType": "uint96",
+          "name": "payment",
+          "type": "uint96"
+        },
+        {
+          "internalType": "address",
+          "name": "delegate",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "signature",
+          "type": "bytes"
+        }
+      ],
+      "name": "executeAllowanceTransfer",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "safe",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "uint96",
+          "name": "amount",
+          "type": "uint96"
+        },
+        {
+          "internalType": "address",
+          "name": "paymentToken",
+          "type": "address"
+        },
+        {
+          "internalType": "uint96",
+          "name": "payment",
+          "type": "uint96"
+        },
+        {
+          "internalType": "uint16",
+          "name": "nonce",
+          "type": "uint16"
+        }
+      ],
+      "name": "generateTransferHash",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "safe",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "delegate",
+          "type": "address"
+        }
+      ],
+      "name": "getTokens",
+      "outputs": [
+        {
+          "internalType": "address[]",
+          "name": "",
+          "type": "address[]"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "safe",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "delegate",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "getTokenAllowance",
+      "outputs": [
+        {
+          "internalType": "uint256[5]",
+          "name": "",
+          "type": "uint256[5]"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "delegate",
+          "type": "address"
+        }
+      ],
+      "name": "addDelegate",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "delegate",
+          "type": "address"
+        }
+      ],
+      "name": "removeDelegate",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "safe",
+          "type": "address"
+        },
+        {
+          "internalType": "uint48",
+          "name": "start",
+          "type": "uint48"
+        },
+        {
+          "internalType": "uint8",
+          "name": "pageSize",
+          "type": "uint8"
+        }
+      ],
+      "name": "getDelegates",
+      "outputs": [
+        {
+          "internalType": "address[]",
+          "name": "results",
+          "type": "address[]"
+        },
+        {
+          "internalType": "uint48",
+          "name": "next",
+          "type": "uint48"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    }
+  ],
+  "metadata": "{\"compiler\":{\"version\":\"0.5.11+commit.c082d0b4\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":true,\"inputs\":[],\"name\":\"DOMAIN_SEPARATOR_TYPEHASH\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"name\":\"delegatesStart\",\"outputs\":[{\"internalType\":\"uint48\",\"name\":\"\",\"type\":\"uint48\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"ALLOWANCE_TRANSFER_TYPEHASH\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"contract GnosisSafe\",\"name\":\"safe\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"address payable\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"amount\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"paymentToken\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"payment\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"delegate\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"signature\",\"type\":\"bytes\"}],\"name\":\"executeAllowanceTransfer\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"delegate\",\"type\":\"address\"}],\"name\":\"removeDelegate\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"safe\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"delegate\",\"type\":\"address\"}],\"name\":\"getTokens\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"safe\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"delegate\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"getTokenAllowance\",\"outputs\":[{\"internalType\":\"uint256[5]\",\"name\":\"\",\"type\":\"uint256[5]\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"NAME\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"name\":\"allowances\",\"outputs\":[{\"internalType\":\"uint96\",\"name\":\"amount\",\"type\":\"uint96\"},{\"internalType\":\"uint96\",\"name\":\"spent\",\"type\":\"uint96\"},{\"internalType\":\"uint16\",\"name\":\"resetTimeMin\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"lastResetMin\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"nonce\",\"type\":\"uint16\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"delegate\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"allowanceAmount\",\"type\":\"uint96\"},{\"internalType\":\"uint16\",\"name\":\"resetTimeMin\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"resetBaseMin\",\"type\":\"uint32\"}],\"name\":\"setAllowance\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"delegate\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"}],\"name\":\"resetAllowance\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"uint48\",\"name\":\"\",\"type\":\"uint48\"}],\"name\":\"delegates\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"delegate\",\"type\":\"address\"},{\"internalType\":\"uint48\",\"name\":\"prev\",\"type\":\"uint48\"},{\"internalType\":\"uint48\",\"name\":\"next\",\"type\":\"uint48\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"safe\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"amount\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"paymentToken\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"payment\",\"type\":\"uint96\"},{\"internalType\":\"uint16\",\"name\":\"nonce\",\"type\":\"uint16\"}],\"name\":\"generateTransferHash\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"delegate\",\"type\":\"address\"}],\"name\":\"addDelegate\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"safe\",\"type\":\"address\"},{\"internalType\":\"uint48\",\"name\":\"start\",\"type\":\"uint48\"},{\"internalType\":\"uint8\",\"name\":\"pageSize\",\"type\":\"uint8\"}],\"name\":\"getDelegates\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"results\",\"type\":\"address[]\"},{\"internalType\":\"uint48\",\"name\":\"next\",\"type\":\"uint48\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"tokens\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"domainSeparator\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"VERSION\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"safe\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"delegate\",\"type\":\"address\"}],\"name\":\"AddDelegate\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"safe\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"delegate\",\"type\":\"address\"}],\"name\":\"RemoveDelegate\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"safe\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"delegate\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"value\",\"type\":\"uint96\"},{\"indexed\":false,\"internalType\":\"uint16\",\"name\":\"nonce\",\"type\":\"uint16\"}],\"name\":\"ExecuteAllowanceTransfer\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"safe\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"delegate\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"allowanceAmount\",\"type\":\"uint96\"},{\"indexed\":false,\"internalType\":\"uint16\",\"name\":\"resetTime\",\"type\":\"uint16\"}],\"name\":\"SetAllowance\",\"type\":\"event\"}],\"devdoc\":{\"methods\":{\"setAllowance(address,address,uint96,uint16,uint32)\":{\"details\":\"Allows to update the allowance for a specified token. This can only be done via a Safe transaction.\",\"params\":{\"allowanceAmount\":\"allowance in smallest token unit.\",\"delegate\":\"Delegate whose allowance should be updated.\",\"resetBaseMin\":\"Time based on which the reset time should be increased\",\"resetTimeMin\":\"Time after which the allowance should reset\",\"token\":\"Token contract address.\"}}}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/fer/repos/protofire/gnosis/safe-modules/allowances/contracts/AlowanceModule.sol\":\"AllowanceModule\"},\"evmVersion\":\"petersburg\",\"libraries\":{},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/fer/repos/protofire/gnosis/safe-modules/allowances/contracts/AlowanceModule.sol\":{\"keccak256\":\"0x2923bedff3c94826e7a485a59d6d02d7b1821793f856695306cd6967c0b0e90c\",\"urls\":[\"bzz-raw://c19ff4e4b69c3751a32fcc654a22a385997ae16ddc945e5e99ff9392c8e5ee2b\",\"dweb:/ipfs/QmRUC5yXuamwzNsLUDCes2Q9YAya5b3WN8zr9DH9aZfr6H\"]},\"@gnosis.pm/safe-contracts/contracts/common/Enum.sol\":{\"keccak256\":\"0x7bc6e5afb9436d9f7e376c2cdba51ca1f337e1b31c04cca5769db3a77ed40081\",\"urls\":[\"bzz-raw://88b3a68baaff962b69b040af62698034bf9c99319e4a6dce71abc2c0c88fba91\",\"dweb:/ipfs/QmTefyhXcMALQew96u7YRLQBnye9vapqkKBWxbynWpMHDM\"]},\"@gnosis.pm/safe-contracts/contracts/common/SignatureDecoder.sol\":{\"keccak256\":\"0x9d6196319963155fd0a1dd45e6d4992489da251e18572c2fc62084482edb37a9\",\"urls\":[\"bzz-raw://0298c7d98d2368bc99ae8d28befc8d40250fd7128f45095321d3c9e199fec74b\",\"dweb:/ipfs/QmPK4Q2mSnsEuv5ayyDAzURAksYXmbbALQ2Z5xUcfx1q4K\"]},\"@gnosis.pm/safe-contracts/contracts/interfaces/ISignatureValidator.sol\":{\"keccak256\":\"0xb75555e8e2bbbe38c55e164dde9761a016b0b4f1b0004b93d7ec2acd873faca4\",\"urls\":[\"bzz-raw://5985325d13e7aedb3036e9f342e740c14bf57b6202b11c2a36f95867f8c9ad5e\",\"dweb:/ipfs/QmTRKm25xk4jsTQHww3JtaU9fNp1BiM6SKoUNp5LrcLyo5\"]}},\"version\":1}",
+  "bytecode": "0x608060405234801561001057600080fd5b507f035aff83d86937d35b32e04f0ddc6ff469290eef2f1b692d8a815c89404d474960001b30604051602001808381526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200192505050604051602081830303815290604052805190602001206004819055506137d9806100a46000396000f3fe608060405234801561001057600080fd5b50600436106101165760003560e01c8063beaeb388116100a2578063e71bdf4111610071578063e71bdf411461094b578063eb37abe01461098f578063f56e81fa14610a5e578063f698da2514610b0c578063ffa1ad7414610b2a57610116565b8063beaeb38814610693578063c19bf50e1461072d578063ce60c69214610791578063d626e0431461085557610116565b806367e7646f116100e957806367e7646f1461034b5780638d0e8e1d1461038f57806394b31fbd14610448578063a3f4df7e14610508578063b713c9d41461058b57610116565b80631db61b541461011b578063310a3bb11461013957806343abf5fe146101a15780634515641a146101bf575b600080fd5b610123610bad565b6040518082815260200191505060405180910390f35b61017b6004803603602081101561014f57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610bd4565b604051808265ffffffffffff1665ffffffffffff16815260200191505060405180910390f35b6101a9610bf9565b6040518082815260200191505060405180910390f35b61034960048036036101008110156101d657600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080356bffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080356bffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001906401000000008111156102c357600080fd5b8201836020820111156102d557600080fd5b803590602001918460018302840111640100000000831117156102f757600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050509192919290505050610c15565b005b61038d6004803603602081101561036157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611022565b005b6103f1600480360360408110156103a557600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061149e565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b83811015610434578082015181840152602081019050610419565b505050509050019250505060405180910390f35b6104ca6004803603606081101561045e57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506115a9565b6040518082600560200280838360005b838110156104f55780820151818401526020810190506104da565b5050505090500191505060405180910390f35b610510611635565b6040518080602001828103825283818151815260200191508051906020019080838360005b83811015610550578082015181840152602081019050610535565b50505050905090810190601f16801561057d5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b61060d600480360360608110156105a157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061166e565b60405180866bffffffffffffffffffffffff166bffffffffffffffffffffffff168152602001856bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020018461ffff1661ffff1681526020018363ffffffff1663ffffffff1681526020018261ffff1661ffff1681526020019550505050505060405180910390f35b61072b600480360360a08110156106a957600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080356bffffffffffffffffffffffff169060200190929190803561ffff169060200190929190803563ffffffff16906020019092919050505061171a565b005b61078f6004803603604081101561074357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611b71565b005b6107e5600480360360408110156107a757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803565ffffffffffff169060200190929190505050611bc0565b604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018365ffffffffffff1665ffffffffffff1681526020018265ffffffffffff1665ffffffffffff168152602001935050505060405180910390f35b610935600480360360e081101561086b57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080356bffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080356bffffffffffffffffffffffff169060200190929190803561ffff169060200190929190505050611c3b565b6040518082815260200191505060405180910390f35b61098d6004803603602081101561096157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611c60565b005b6109f0600480360360608110156109a557600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803565ffffffffffff169060200190929190803560ff1690602001909291905050506120c5565b60405180806020018365ffffffffffff1665ffffffffffff168152602001828103825284818151815260200191508051906020019060200280838360005b83811015610a49578082015181840152602081019050610a2e565b50505050905001935050505060405180910390f35b610aca60048036036060811015610a7457600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061246e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b610b146124c6565b6040518082815260200191505060405180910390f35b610b326124cc565b6040518080602001828103825283818151815260200191508051906020019080838360005b83811015610b72578082015181840152602081019050610b57565b50505050905090810190601f168015610b9f5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b7f035aff83d86937d35b32e04f0ddc6ff469290eef2f1b692d8a815c89404d474960001b81565b60036020528060005260406000206000915054906101000a900465ffffffffffff1681565b604051808061365e606c9139606c019050604051809103902081565b610c1d61353a565b610c2889848a612505565b90506060610c3f8a8a8a8a8a8a8860800151612766565b90506001826080015101826080019061ffff16908161ffff1681525050600087836020015101905082602001516bffffffffffffffffffffffff16816bffffffffffffffffffffffff16118015610cb6575082600001516bffffffffffffffffffffffff16816bffffffffffffffffffffffff1611155b610d0b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252603a815260200180613723603a913960400191505060405180910390fd5b8083602001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff16815250506000866bffffffffffffffffffffffff161115610eb057610d5261353a565b8a73ffffffffffffffffffffffffffffffffffffffff168873ffffffffffffffffffffffffffffffffffffffff1614610d9557610d908c878a612505565b610d97565b835b905086816020015101915080602001516bffffffffffffffffffffffff16826bffffffffffffffffffffffff16118015610df1575080600001516bffffffffffffffffffffffff16826bffffffffffffffffffffffff1611155b610e46576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252604881526020018061375d6048913960600191505060405180910390fd5b8181602001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff16815250508a73ffffffffffffffffffffffffffffffffffffffff168873ffffffffffffffffffffffffffffffffffffffff1614610eae57610ead8c878a846129ab565b5b505b610ebc8b868c866129ab565b610ec88585848e612b48565b6000866bffffffffffffffffffffffff161115610eec57610eeb8b883289612c9b565b5b610ef88b8b8b8b612c9b565b8a73ffffffffffffffffffffffffffffffffffffffff167fa11cca2c2027e28ab0046aab4d4040f59d8b06e819ccd974c1e53e86aa814c19868c8c8c6001896080015103604051808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001836bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020018261ffff1661ffff1681526020019550505050505060405180910390a25050505050505050505050565b61102a613593565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008365ffffffffffff1665ffffffffffff1681526020019081526020016000206040518060600160405290816000820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016000820160149054906101000a900465ffffffffffff1665ffffffffffff1665ffffffffffff16815260200160008201601a9054906101000a900465ffffffffffff1665ffffffffffff1665ffffffffffff16815250509050600073ffffffffffffffffffffffffffffffffffffffff16816000015173ffffffffffffffffffffffffffffffffffffffff161415611184575061149b565b6000600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020905060008090505b818054905081101561130157600082828154811061122457fe5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061125961353a565b611264338784612505565b9050600081600001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff1681525050600081602001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff16815250506000816040019061ffff16908161ffff16815250506000816060019063ffffffff16908163ffffffff16815250506112f2338784846129ab565b5050808060010191505061120a565b508160400151600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000846020015165ffffffffffff1665ffffffffffff168152602001908152602001600020600001601a6101000a81548165ffffffffffff021916908365ffffffffffff1602179055508160200151600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000846040015165ffffffffffff1665ffffffffffff16815260200190815260200160002060000160146101000a81548165ffffffffffff021916908365ffffffffffff1602179055503373ffffffffffffffffffffffffffffffffffffffff167fdccc2d936ded24d2153d2760581a7f0dcb23ec71190c9726b3584cdd700214d484604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a250505b50565b6060600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801561159c57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311611552575b5050505050905092915050565b6115b16135da565b6115b961353a565b6115c4858585612505565b90506040518060a0016040528082600001516bffffffffffffffffffffffff16815260200182602001516bffffffffffffffffffffffff168152602001826040015161ffff168152602001826060015163ffffffff168152602001826080015161ffff168152509150509392505050565b6040518060400160405280601081526020017f416c6c6f77616e6365204d6f64756c650000000000000000000000000000000081525081565b600060205282600052604060002060205281600052604060002060205280600052604060002060009250925050508060000160009054906101000a90046bffffffffffffffffffffffff169080600001600c9054906101000a90046bffffffffffffffffffffffff16908060000160189054906101000a900461ffff169080600001601a9054906101000a900463ffffffff169080600001601e9054906101000a900461ffff16905085565b8473ffffffffffffffffffffffffffffffffffffffff16600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008765ffffffffffff1665ffffffffffff16815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614611821576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252603c815260200180613622603c913960400191505060405180910390fd5b61182961353a565b611834338787612505565b90506000816080015161ffff16141561193d576001816080019061ffff16908161ffff1681525050600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208590806001815401808255809150509060018203906000526020600020016000909192909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505b6000603c428161194957fe5b04905060008363ffffffff161115611a11578063ffffffff168363ffffffff1611156119dd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601a8152602001807f7265736574426173654d696e203c3d2063757272656e744d696e00000000000081525060200191505060405180910390fd5b8361ffff1683820363ffffffff16816119f257fe5b068103826060019063ffffffff16908163ffffffff1681525050611a3e565b6000826060015163ffffffff161415611a3d5780826060019063ffffffff16908163ffffffff16815250505b5b83826040019061ffff16908161ffff16815250508482600001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff1681525050611a86338888856129ab565b3373ffffffffffffffffffffffffffffffffffffffff167f49caa04c5e1e168069c09df7f88c07ca87be980b0bf4570ab77fe9aae3ca7eba88888888604051808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001836bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020018261ffff1661ffff16815260200194505050505060405180910390a250505050505050565b611b7961353a565b611b84338484612505565b9050600081602001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff1681525050611bbb338484846129ab565b505050565b6002602052816000526040600020602052806000526040600020600091509150508060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060000160149054906101000a900465ffffffffffff169080600001601a9054906101000a900465ffffffffffff16905083565b6000611c4c88888888888888612766565b805190602001209050979650505050505050565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415611d03576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f496e76616c69642064656c65676174652061646472657373000000000000000081525060200191505060405180910390fd5b6000819050600073ffffffffffffffffffffffffffffffffffffffff16600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008365ffffffffffff1665ffffffffffff16815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614611dc557506120c2565b6000600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900465ffffffffffff16905060405180606001604052808473ffffffffffffffffffffffffffffffffffffffff168152602001600065ffffffffffff1681526020018265ffffffffffff16815250600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008465ffffffffffff1665ffffffffffff16815260200190815260200160002060008201518160000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060208201518160000160146101000a81548165ffffffffffff021916908365ffffffffffff160217905550604082015181600001601a6101000a81548165ffffffffffff021916908365ffffffffffff16021790555090505081600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008365ffffffffffff1665ffffffffffff16815260200190815260200160002060000160146101000a81548165ffffffffffff021916908365ffffffffffff16021790555081600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548165ffffffffffff021916908365ffffffffffff1602179055503373ffffffffffffffffffffffffffffffffffffffff167f2fd5b26f00131bd8ca0fc556207292b85a6bec241341df82724333227458e63084604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a250505b50565b606060008260ff166040519080825280602002602001820160405280156120fb5781602001602082028038833980820191505090505b50915060008090506000808665ffffffffffff16141561216c57600360008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900465ffffffffffff1661216e565b855b9050612178613593565b600260008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008365ffffffffffff1665ffffffffffff1681526020019081526020016000206040518060600160405290816000820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016000820160149054906101000a900465ffffffffffff1665ffffffffffff1665ffffffffffff16815260200160008201601a9054906101000a900465ffffffffffff1665ffffffffffff1665ffffffffffff168152505090505b600073ffffffffffffffffffffffffffffffffffffffff16816000015173ffffffffffffffffffffffffffffffffffffffff16141580156122da57508560ff168360ff16105b15612459578060000151858460ff16815181106122f357fe5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508280600101935050600260008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000826040015165ffffffffffff1665ffffffffffff1681526020019081526020016000206040518060600160405290816000820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016000820160149054906101000a900465ffffffffffff1665ffffffffffff1665ffffffffffff16815260200160008201601a9054906101000a900465ffffffffffff1665ffffffffffff1665ffffffffffff16815250509050612294565b80600001519350828552505050935093915050565b6001602052826000526040600020602052816000526040600020818154811061249357fe5b90600052602060002001600092509250509054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60045481565b6040518060400160405280600581526020017f302e312e3000000000000000000000000000000000000000000000000000000081525081565b61250d61353a565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206040518060a00160405290816000820160009054906101000a90046bffffffffffffffffffffffff166bffffffffffffffffffffffff166bffffffffffffffffffffffff16815260200160008201600c9054906101000a90046bffffffffffffffffffffffff166bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020016000820160189054906101000a900461ffff1661ffff1661ffff16815260200160008201601a9054906101000a900463ffffffff1663ffffffff1663ffffffff16815260200160008201601e9054906101000a900461ffff1661ffff1661ffff168152505090506000603c42816126c057fe5b0490506000826040015161ffff161180156126f55750816040015161ffff16810363ffffffff16826060015163ffffffff1611155b1561275b57600082602001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff1681525050816040015161ffff168260600151820363ffffffff168161274057fe5b068103826060019063ffffffff16908163ffffffff16815250505b819150509392505050565b60606000604051808061365e606c9139606c019050604051809103902089898989898989604051602001808981526020018873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001856bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001836bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020018261ffff1661ffff16815260200198505050505050505050604051602081830303815290604052805190602001209050601960f81b600160f81b6004548360405160200180857effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152600101847effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152600101838152602001828152602001945050505050604051602081830303815290604052915050979650505050505050565b806000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008201518160000160006101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550602082015181600001600c6101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff16021790555060408201518160000160186101000a81548161ffff021916908361ffff160217905550606082015181600001601a6101000a81548163ffffffff021916908363ffffffff160217905550608082015181600001601e6101000a81548161ffff021916908361ffff16021790555090505050505050565b6000612b5484846130e5565b90508073ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16148015612c3f57508073ffffffffffffffffffffffffffffffffffffffff16600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008365ffffffffffff1665ffffffffffff16815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16145b612c94576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260598152602001806136ca6059913960600191505060405180910390fd5b5050505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415612e42578373ffffffffffffffffffffffffffffffffffffffff1663468721a7838360006040518463ffffffff1660e01b8152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001836bffffffffffffffffffffffff16815260200180602001836001811115612d5957fe5b60ff168152602001828103825260008152602001602001945050505050602060405180830381600087803b158015612d9057600080fd5b505af1158015612da4573d6000803e3d6000fd5b505050506040513d6020811015612dba57600080fd5b8101908080519060200190929190505050612e3d576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f436f756c64206e6f742065786563757465206574686572207472616e7366657281525060200191505060405180910390fd5b6130df565b60608282604051602401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001826bffffffffffffffffffffffff166bffffffffffffffffffffffff168152602001925050506040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505090508473ffffffffffffffffffffffffffffffffffffffff1663468721a78560008460006040518563ffffffff1660e01b8152600401808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200184815260200180602001836001811115612fa157fe5b60ff168152602001828103825284818151815260200191508051906020019080838360005b83811015612fe1578082015181840152602081019050612fc6565b50505050905090810190601f16801561300e5780820380516001836020036101000a031916815260200191505b5095505050505050602060405180830381600087803b15801561303057600080fd5b505af1158015613044573d6000803e3d6000fd5b505050506040513d602081101561305a57600080fd5b81019080805190602001909291905050506130dd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f436f756c64206e6f74206578656375746520746f6b656e207472616e7366657281525060200191505060405180910390fd5b505b50505050565b600080835114156130f857339050613505565b604183511015613170576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260178152602001807f7369676e6174757265732e6c656e677468203e3d20363500000000000000000081525060200191505060405180910390fd5b600080600061318086600061350b565b80935081945082955050505060008360ff1614156133a8578160001c9350606060208288010190506320c13b0b60e01b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168573ffffffffffffffffffffffffffffffffffffffff166320c13b0b88846040518363ffffffff1660e01b8152600401808060200180602001838103835285818151815260200191508051906020019080838360005b83811015613240578082015181840152602081019050613225565b50505050905090810190601f16801561326d5780820380516001836020036101000a031916815260200191505b50838103825284818151815260200191508051906020019080838360005b838110156132a657808201518184015260208101905061328b565b50505050905090810190601f1680156132d35780820380516001836020036101000a031916815260200191505b5094505050505060206040518083038186803b1580156132f257600080fd5b505afa158015613306573d6000803e3d6000fd5b505050506040513d602081101561331c57600080fd5b81019080805190602001909291905050507bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916146133a2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260258152602001806135fd6025913960400191505060405180910390fd5b50613501565b60018360ff1614156133bc57339350613500565b601e8360ff16111561348e576001858051906020012060405160200180807f19457468657265756d205369676e6564204d6573736167653a0a333200000000815250601c018281526020019150506040516020818303038152906040528051906020012060048503848460405160008152602001604052604051808581526020018460ff1660ff1681526020018381526020018281526020019450505050506020604051602081039080840390855afa15801561347d573d6000803e3d6000fd5b5050506020604051035193506134ff565b6001858051906020012084848460405160008152602001604052604051808581526020018460ff1660ff1681526020018381526020018281526020019450505050506020604051602081039080840390855afa1580156134f2573d6000803e3d6000fd5b5050506020604051035193505b5b5b5050505b92915050565b60008060008360410260208101860151925060408101860151915060ff60418201870151169350509250925092565b6040518060a0016040528060006bffffffffffffffffffffffff16815260200160006bffffffffffffffffffffffff168152602001600061ffff168152602001600063ffffffff168152602001600061ffff1681525090565b6040518060600160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001600065ffffffffffff168152602001600065ffffffffffff1681525090565b6040518060a0016040528060059060208202803883398082019150509050509056fe436f756c64206e6f742076616c6964617465204549502d31323731207369676e617475726564656c6567617465735b6d73672e73656e6465725d5b75696e7434382864656c6567617465295d2e64656c6567617465203d3d2064656c6567617465416c6c6f77616e63655472616e73666572286164647265737320736166652c6164647265737320746f6b656e2c75696e74393620616d6f756e742c61646472657373207061796d656e74546f6b656e2c75696e743936207061796d656e742c75696e743136206e6f6e636529657870656374656444656c6567617465203d3d207369676e65722026262064656c6567617465735b616464726573732873616665295d5b75696e743438287369676e6572295d2e64656c6567617465203d3d207369676e65726e65775370656e74203e20616c6c6f77616e63652e7370656e74202626206e65775370656e74203c3d20616c6c6f77616e63652e616d6f756e746e65775370656e74203e207061796d656e74416c6c6f77616e63652e7370656e74202626206e65775370656e74203c3d207061796d656e74416c6c6f77616e63652e616d6f756e74a265627a7a72315820d3b549675e0dc47e816c54dd93e764695886843e99d7cb6e2e49bf154ee462db64736f6c634300050b0032",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101165760003560e01c8063beaeb388116100a2578063e71bdf4111610071578063e71bdf411461094b578063eb37abe01461098f578063f56e81fa14610a5e578063f698da2514610b0c578063ffa1ad7414610b2a57610116565b8063beaeb38814610693578063c19bf50e1461072d578063ce60c69214610791578063d626e0431461085557610116565b806367e7646f116100e957806367e7646f1461034b5780638d0e8e1d1461038f57806394b31fbd14610448578063a3f4df7e14610508578063b713c9d41461058b57610116565b80631db61b541461011b578063310a3bb11461013957806343abf5fe146101a15780634515641a146101bf575b600080fd5b610123610bad565b6040518082815260200191505060405180910390f35b61017b6004803603602081101561014f57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610bd4565b604051808265ffffffffffff1665ffffffffffff16815260200191505060405180910390f35b6101a9610bf9565b6040518082815260200191505060405180910390f35b61034960048036036101008110156101d657600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080356bffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080356bffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001906401000000008111156102c357600080fd5b8201836020820111156102d557600080fd5b803590602001918460018302840111640100000000831117156102f757600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050509192919290505050610c15565b005b61038d6004803603602081101561036157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611022565b005b6103f1600480360360408110156103a557600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061149e565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b83811015610434578082015181840152602081019050610419565b505050509050019250505060405180910390f35b6104ca6004803603606081101561045e57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506115a9565b6040518082600560200280838360005b838110156104f55780820151818401526020810190506104da565b5050505090500191505060405180910390f35b610510611635565b6040518080602001828103825283818151815260200191508051906020019080838360005b83811015610550578082015181840152602081019050610535565b50505050905090810190601f16801561057d5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b61060d600480360360608110156105a157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061166e565b60405180866bffffffffffffffffffffffff166bffffffffffffffffffffffff168152602001856bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020018461ffff1661ffff1681526020018363ffffffff1663ffffffff1681526020018261ffff1661ffff1681526020019550505050505060405180910390f35b61072b600480360360a08110156106a957600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080356bffffffffffffffffffffffff169060200190929190803561ffff169060200190929190803563ffffffff16906020019092919050505061171a565b005b61078f6004803603604081101561074357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611b71565b005b6107e5600480360360408110156107a757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803565ffffffffffff169060200190929190505050611bc0565b604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018365ffffffffffff1665ffffffffffff1681526020018265ffffffffffff1665ffffffffffff168152602001935050505060405180910390f35b610935600480360360e081101561086b57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080356bffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080356bffffffffffffffffffffffff169060200190929190803561ffff169060200190929190505050611c3b565b6040518082815260200191505060405180910390f35b61098d6004803603602081101561096157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611c60565b005b6109f0600480360360608110156109a557600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803565ffffffffffff169060200190929190803560ff1690602001909291905050506120c5565b60405180806020018365ffffffffffff1665ffffffffffff168152602001828103825284818151815260200191508051906020019060200280838360005b83811015610a49578082015181840152602081019050610a2e565b50505050905001935050505060405180910390f35b610aca60048036036060811015610a7457600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061246e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b610b146124c6565b6040518082815260200191505060405180910390f35b610b326124cc565b6040518080602001828103825283818151815260200191508051906020019080838360005b83811015610b72578082015181840152602081019050610b57565b50505050905090810190601f168015610b9f5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b7f035aff83d86937d35b32e04f0ddc6ff469290eef2f1b692d8a815c89404d474960001b81565b60036020528060005260406000206000915054906101000a900465ffffffffffff1681565b604051808061365e606c9139606c019050604051809103902081565b610c1d61353a565b610c2889848a612505565b90506060610c3f8a8a8a8a8a8a8860800151612766565b90506001826080015101826080019061ffff16908161ffff1681525050600087836020015101905082602001516bffffffffffffffffffffffff16816bffffffffffffffffffffffff16118015610cb6575082600001516bffffffffffffffffffffffff16816bffffffffffffffffffffffff1611155b610d0b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252603a815260200180613723603a913960400191505060405180910390fd5b8083602001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff16815250506000866bffffffffffffffffffffffff161115610eb057610d5261353a565b8a73ffffffffffffffffffffffffffffffffffffffff168873ffffffffffffffffffffffffffffffffffffffff1614610d9557610d908c878a612505565b610d97565b835b905086816020015101915080602001516bffffffffffffffffffffffff16826bffffffffffffffffffffffff16118015610df1575080600001516bffffffffffffffffffffffff16826bffffffffffffffffffffffff1611155b610e46576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252604881526020018061375d6048913960600191505060405180910390fd5b8181602001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff16815250508a73ffffffffffffffffffffffffffffffffffffffff168873ffffffffffffffffffffffffffffffffffffffff1614610eae57610ead8c878a846129ab565b5b505b610ebc8b868c866129ab565b610ec88585848e612b48565b6000866bffffffffffffffffffffffff161115610eec57610eeb8b883289612c9b565b5b610ef88b8b8b8b612c9b565b8a73ffffffffffffffffffffffffffffffffffffffff167fa11cca2c2027e28ab0046aab4d4040f59d8b06e819ccd974c1e53e86aa814c19868c8c8c6001896080015103604051808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001836bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020018261ffff1661ffff1681526020019550505050505060405180910390a25050505050505050505050565b61102a613593565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008365ffffffffffff1665ffffffffffff1681526020019081526020016000206040518060600160405290816000820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016000820160149054906101000a900465ffffffffffff1665ffffffffffff1665ffffffffffff16815260200160008201601a9054906101000a900465ffffffffffff1665ffffffffffff1665ffffffffffff16815250509050600073ffffffffffffffffffffffffffffffffffffffff16816000015173ffffffffffffffffffffffffffffffffffffffff161415611184575061149b565b6000600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020905060008090505b818054905081101561130157600082828154811061122457fe5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061125961353a565b611264338784612505565b9050600081600001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff1681525050600081602001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff16815250506000816040019061ffff16908161ffff16815250506000816060019063ffffffff16908163ffffffff16815250506112f2338784846129ab565b5050808060010191505061120a565b508160400151600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000846020015165ffffffffffff1665ffffffffffff168152602001908152602001600020600001601a6101000a81548165ffffffffffff021916908365ffffffffffff1602179055508160200151600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000846040015165ffffffffffff1665ffffffffffff16815260200190815260200160002060000160146101000a81548165ffffffffffff021916908365ffffffffffff1602179055503373ffffffffffffffffffffffffffffffffffffffff167fdccc2d936ded24d2153d2760581a7f0dcb23ec71190c9726b3584cdd700214d484604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a250505b50565b6060600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801561159c57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311611552575b5050505050905092915050565b6115b16135da565b6115b961353a565b6115c4858585612505565b90506040518060a0016040528082600001516bffffffffffffffffffffffff16815260200182602001516bffffffffffffffffffffffff168152602001826040015161ffff168152602001826060015163ffffffff168152602001826080015161ffff168152509150509392505050565b6040518060400160405280601081526020017f416c6c6f77616e6365204d6f64756c650000000000000000000000000000000081525081565b600060205282600052604060002060205281600052604060002060205280600052604060002060009250925050508060000160009054906101000a90046bffffffffffffffffffffffff169080600001600c9054906101000a90046bffffffffffffffffffffffff16908060000160189054906101000a900461ffff169080600001601a9054906101000a900463ffffffff169080600001601e9054906101000a900461ffff16905085565b8473ffffffffffffffffffffffffffffffffffffffff16600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008765ffffffffffff1665ffffffffffff16815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614611821576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252603c815260200180613622603c913960400191505060405180910390fd5b61182961353a565b611834338787612505565b90506000816080015161ffff16141561193d576001816080019061ffff16908161ffff1681525050600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208590806001815401808255809150509060018203906000526020600020016000909192909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505b6000603c428161194957fe5b04905060008363ffffffff161115611a11578063ffffffff168363ffffffff1611156119dd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601a8152602001807f7265736574426173654d696e203c3d2063757272656e744d696e00000000000081525060200191505060405180910390fd5b8361ffff1683820363ffffffff16816119f257fe5b068103826060019063ffffffff16908163ffffffff1681525050611a3e565b6000826060015163ffffffff161415611a3d5780826060019063ffffffff16908163ffffffff16815250505b5b83826040019061ffff16908161ffff16815250508482600001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff1681525050611a86338888856129ab565b3373ffffffffffffffffffffffffffffffffffffffff167f49caa04c5e1e168069c09df7f88c07ca87be980b0bf4570ab77fe9aae3ca7eba88888888604051808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001836bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020018261ffff1661ffff16815260200194505050505060405180910390a250505050505050565b611b7961353a565b611b84338484612505565b9050600081602001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff1681525050611bbb338484846129ab565b505050565b6002602052816000526040600020602052806000526040600020600091509150508060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060000160149054906101000a900465ffffffffffff169080600001601a9054906101000a900465ffffffffffff16905083565b6000611c4c88888888888888612766565b805190602001209050979650505050505050565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415611d03576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f496e76616c69642064656c65676174652061646472657373000000000000000081525060200191505060405180910390fd5b6000819050600073ffffffffffffffffffffffffffffffffffffffff16600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008365ffffffffffff1665ffffffffffff16815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614611dc557506120c2565b6000600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900465ffffffffffff16905060405180606001604052808473ffffffffffffffffffffffffffffffffffffffff168152602001600065ffffffffffff1681526020018265ffffffffffff16815250600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008465ffffffffffff1665ffffffffffff16815260200190815260200160002060008201518160000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060208201518160000160146101000a81548165ffffffffffff021916908365ffffffffffff160217905550604082015181600001601a6101000a81548165ffffffffffff021916908365ffffffffffff16021790555090505081600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008365ffffffffffff1665ffffffffffff16815260200190815260200160002060000160146101000a81548165ffffffffffff021916908365ffffffffffff16021790555081600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548165ffffffffffff021916908365ffffffffffff1602179055503373ffffffffffffffffffffffffffffffffffffffff167f2fd5b26f00131bd8ca0fc556207292b85a6bec241341df82724333227458e63084604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a250505b50565b606060008260ff166040519080825280602002602001820160405280156120fb5781602001602082028038833980820191505090505b50915060008090506000808665ffffffffffff16141561216c57600360008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900465ffffffffffff1661216e565b855b9050612178613593565b600260008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008365ffffffffffff1665ffffffffffff1681526020019081526020016000206040518060600160405290816000820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016000820160149054906101000a900465ffffffffffff1665ffffffffffff1665ffffffffffff16815260200160008201601a9054906101000a900465ffffffffffff1665ffffffffffff1665ffffffffffff168152505090505b600073ffffffffffffffffffffffffffffffffffffffff16816000015173ffffffffffffffffffffffffffffffffffffffff16141580156122da57508560ff168360ff16105b15612459578060000151858460ff16815181106122f357fe5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508280600101935050600260008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000826040015165ffffffffffff1665ffffffffffff1681526020019081526020016000206040518060600160405290816000820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016000820160149054906101000a900465ffffffffffff1665ffffffffffff1665ffffffffffff16815260200160008201601a9054906101000a900465ffffffffffff1665ffffffffffff1665ffffffffffff16815250509050612294565b80600001519350828552505050935093915050565b6001602052826000526040600020602052816000526040600020818154811061249357fe5b90600052602060002001600092509250509054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60045481565b6040518060400160405280600581526020017f302e312e3000000000000000000000000000000000000000000000000000000081525081565b61250d61353a565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206040518060a00160405290816000820160009054906101000a90046bffffffffffffffffffffffff166bffffffffffffffffffffffff166bffffffffffffffffffffffff16815260200160008201600c9054906101000a90046bffffffffffffffffffffffff166bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020016000820160189054906101000a900461ffff1661ffff1661ffff16815260200160008201601a9054906101000a900463ffffffff1663ffffffff1663ffffffff16815260200160008201601e9054906101000a900461ffff1661ffff1661ffff168152505090506000603c42816126c057fe5b0490506000826040015161ffff161180156126f55750816040015161ffff16810363ffffffff16826060015163ffffffff1611155b1561275b57600082602001906bffffffffffffffffffffffff1690816bffffffffffffffffffffffff1681525050816040015161ffff168260600151820363ffffffff168161274057fe5b068103826060019063ffffffff16908163ffffffff16815250505b819150509392505050565b60606000604051808061365e606c9139606c019050604051809103902089898989898989604051602001808981526020018873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001856bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001836bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020018261ffff1661ffff16815260200198505050505050505050604051602081830303815290604052805190602001209050601960f81b600160f81b6004548360405160200180857effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152600101847effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152600101838152602001828152602001945050505050604051602081830303815290604052915050979650505050505050565b806000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008201518160000160006101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550602082015181600001600c6101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff16021790555060408201518160000160186101000a81548161ffff021916908361ffff160217905550606082015181600001601a6101000a81548163ffffffff021916908363ffffffff160217905550608082015181600001601e6101000a81548161ffff021916908361ffff16021790555090505050505050565b6000612b5484846130e5565b90508073ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16148015612c3f57508073ffffffffffffffffffffffffffffffffffffffff16600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008365ffffffffffff1665ffffffffffff16815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16145b612c94576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260598152602001806136ca6059913960600191505060405180910390fd5b5050505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415612e42578373ffffffffffffffffffffffffffffffffffffffff1663468721a7838360006040518463ffffffff1660e01b8152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001836bffffffffffffffffffffffff16815260200180602001836001811115612d5957fe5b60ff168152602001828103825260008152602001602001945050505050602060405180830381600087803b158015612d9057600080fd5b505af1158015612da4573d6000803e3d6000fd5b505050506040513d6020811015612dba57600080fd5b8101908080519060200190929190505050612e3d576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f436f756c64206e6f742065786563757465206574686572207472616e7366657281525060200191505060405180910390fd5b6130df565b60608282604051602401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001826bffffffffffffffffffffffff166bffffffffffffffffffffffff168152602001925050506040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505090508473ffffffffffffffffffffffffffffffffffffffff1663468721a78560008460006040518563ffffffff1660e01b8152600401808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200184815260200180602001836001811115612fa157fe5b60ff168152602001828103825284818151815260200191508051906020019080838360005b83811015612fe1578082015181840152602081019050612fc6565b50505050905090810190601f16801561300e5780820380516001836020036101000a031916815260200191505b5095505050505050602060405180830381600087803b15801561303057600080fd5b505af1158015613044573d6000803e3d6000fd5b505050506040513d602081101561305a57600080fd5b81019080805190602001909291905050506130dd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f436f756c64206e6f74206578656375746520746f6b656e207472616e7366657281525060200191505060405180910390fd5b505b50505050565b600080835114156130f857339050613505565b604183511015613170576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260178152602001807f7369676e6174757265732e6c656e677468203e3d20363500000000000000000081525060200191505060405180910390fd5b600080600061318086600061350b565b80935081945082955050505060008360ff1614156133a8578160001c9350606060208288010190506320c13b0b60e01b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168573ffffffffffffffffffffffffffffffffffffffff166320c13b0b88846040518363ffffffff1660e01b8152600401808060200180602001838103835285818151815260200191508051906020019080838360005b83811015613240578082015181840152602081019050613225565b50505050905090810190601f16801561326d5780820380516001836020036101000a031916815260200191505b50838103825284818151815260200191508051906020019080838360005b838110156132a657808201518184015260208101905061328b565b50505050905090810190601f1680156132d35780820380516001836020036101000a031916815260200191505b5094505050505060206040518083038186803b1580156132f257600080fd5b505afa158015613306573d6000803e3d6000fd5b505050506040513d602081101561331c57600080fd5b81019080805190602001909291905050507bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916146133a2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260258152602001806135fd6025913960400191505060405180910390fd5b50613501565b60018360ff1614156133bc57339350613500565b601e8360ff16111561348e576001858051906020012060405160200180807f19457468657265756d205369676e6564204d6573736167653a0a333200000000815250601c018281526020019150506040516020818303038152906040528051906020012060048503848460405160008152602001604052604051808581526020018460ff1660ff1681526020018381526020018281526020019450505050506020604051602081039080840390855afa15801561347d573d6000803e3d6000fd5b5050506020604051035193506134ff565b6001858051906020012084848460405160008152602001604052604051808581526020018460ff1660ff1681526020018381526020018281526020019450505050506020604051602081039080840390855afa1580156134f2573d6000803e3d6000fd5b5050506020604051035193505b5b5b5050505b92915050565b60008060008360410260208101860151925060408101860151915060ff60418201870151169350509250925092565b6040518060a0016040528060006bffffffffffffffffffffffff16815260200160006bffffffffffffffffffffffff168152602001600061ffff168152602001600063ffffffff168152602001600061ffff1681525090565b6040518060600160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001600065ffffffffffff168152602001600065ffffffffffff1681525090565b6040518060a0016040528060059060208202803883398082019150509050509056fe436f756c64206e6f742076616c6964617465204549502d31323731207369676e617475726564656c6567617465735b6d73672e73656e6465725d5b75696e7434382864656c6567617465295d2e64656c6567617465203d3d2064656c6567617465416c6c6f77616e63655472616e73666572286164647265737320736166652c6164647265737320746f6b656e2c75696e74393620616d6f756e742c61646472657373207061796d656e74546f6b656e2c75696e743936207061796d656e742c75696e743136206e6f6e636529657870656374656444656c6567617465203d3d207369676e65722026262064656c6567617465735b616464726573732873616665295d5b75696e743438287369676e6572295d2e64656c6567617465203d3d207369676e65726e65775370656e74203e20616c6c6f77616e63652e7370656e74202626206e65775370656e74203c3d20616c6c6f77616e63652e616d6f756e746e65775370656e74203e207061796d656e74416c6c6f77616e63652e7370656e74202626206e65775370656e74203c3d207061796d656e74416c6c6f77616e63652e616d6f756e74a265627a7a72315820d3b549675e0dc47e816c54dd93e764695886843e99d7cb6e2e49bf154ee462db64736f6c634300050b0032",
+  "sourceMap": "769:13528:0:-;;;2421:140;8:9:-1;5:2;;;30:1;27;20:12;5:2;2421:140:0;1082:66;2521:25;;2548:4;2510:43;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;2510:43:0;;;2500:54;;;;;;2482:15;:72;;;;769:13528;;;;;;",
+  "deployedSourceMap": "769:13528:0:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;769:13528:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1030:118;;;:::i;:::-;;;;;;;;;;;;;;;;;;;1654:48;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;1654:48:0;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;1186:189;;;:::i;:::-;;;;;;;;;;;;;;;;;;;5344:2246;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;5344:2246:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;21:11:-1;8;5:28;2:2;;;46:1;43;36:12;2:2;5344:2246:0;;35:9:-1;28:4;12:14;8:25;5:40;2:2;;;58:1;55;48:12;2:2;5344:2246:0;;;;;;100:9:-1;95:1;81:12;77:20;67:8;63:35;60:50;39:11;25:12;22:29;11:107;8:2;;;131:1;128;121:12;8:2;5344:2246:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;30:3:-1;22:6;14;1:33;99:1;93:3;85:6;81:16;74:27;137:4;133:9;126:4;121:3;117:14;113:30;106:37;;169:3;161:6;157:16;147:26;;5344:2246:0;;;;;;;;;;;;;;;:::i;:::-;;12563:967;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;12563:967:0;;;;;;;;;;;;;;;;;;;:::i;:::-;;11419:136;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;11419:136:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;11419:136:0;;;;;;;;;;;;;;;;;11561:427;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;11561:427:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;11561:427:0;;;;;;;;;;;;;;;;851:48;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;851:48:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1419:88;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;1419:88:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3013:1311;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;3013:1311:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;5093:245;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;5093:245:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;1583:65;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;1583:65:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8097:366;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;8097:366:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;11994:563;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;11994:563:0;;;;;;;;;;;;;;;;;;;:::i;:::-;;13536:759;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13536:759:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;13536:759:0;;;;;;;;;;;;;;;;;;1513:64;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;1513:64:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;1708:30;;;:::i;:::-;;;;;;;;;;;;;;;;;;;905:40;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;905:40:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1030:118;1082:66;1030:118;;;:::o;1654:48::-;;;;;;;;;;;;;;;;;;;;;;:::o;1186:189::-;1240:135;;;;;;;;;;;;;;;;;;;1186:189;:::o;5344:2246::-;5641:26;;:::i;:::-;5670:44;5691:4;5698:8;5708:5;5670:12;:44::i;:::-;5641:73;;5724:29;5756:98;5789:4;5796:5;5803:2;5807:6;5815:12;5829:7;5838:9;:15;;;5756:24;:98::i;:::-;5724:130;;5933:1;5915:9;:15;;;:19;5897:9;:15;;:37;;;;;;;;;;;5944:15;5980:6;5962:9;:15;;;:24;5944:42;;6062:9;:15;;;6051:26;;:8;:26;;;:58;;;;;6093:9;:16;;;6081:28;;:8;:28;;;;6051:58;6043:129;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6200:8;6182:9;:15;;:26;;;;;;;;;;;6232:1;6222:7;:11;;;6218:748;;;6325:33;;:::i;:::-;6377:5;6361:21;;:12;:21;;;:87;;6397:51;6418:4;6425:8;6435:12;6397;:51::i;:::-;6361:87;;;6385:9;6361:87;6325:123;;6498:7;6473:16;:22;;;:32;6462:43;;6589:16;:22;;;6578:33;;:8;:33;;;:72;;;;;6627:16;:23;;;6615:35;;:8;:35;;;;6578:72;6570:157;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6766:8;6741:16;:22;;:33;;;;;;;;;;;6876:5;6860:21;;:12;:21;;;6856:99;;6883:72;6907:4;6914:8;6924:12;6938:16;6883:15;:72::i;:::-;6856:99;6218:748;;6975:58;6999:4;7006:8;7016:5;7023:9;6975:15;:58::i;:::-;7157:59;7172:8;7182:9;7193:16;7211:4;7157:14;:59::i;:::-;7241:1;7231:7;:11;;;7227:184;;;7352:48;7361:4;7367:12;7381:9;7392:7;7352:8;:48::i;:::-;7227:184;7446:33;7455:4;7461:5;7468:2;7472:6;7446:8;:33::i;:::-;7527:4;7494:89;;;7534:8;7544:5;7551:2;7555:6;7581:1;7563:9;:15;;;:19;7494:89;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5344:2246;;;;;;;;;;;:::o;12563:967::-;12622:23;;:::i;:::-;12648:9;:21;12658:10;12648:21;;;;;;;;;;;;;;;:39;12677:8;12648:39;;;;;;;;;;;;;;;12622:65;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12778:1;12750:30;;:7;:16;;;:30;;;12747:42;;;12782:7;;;12747:42;12798:32;12833:6;:18;12840:10;12833:18;;;;;;;;;;;;;;;:28;12852:8;12833:28;;;;;;;;;;;;;;;12798:63;;12876:9;12888:1;12876:13;;12871:472;12895:14;:21;;;;12891:1;:25;12871:472;;;12937:13;12953:14;12968:1;12953:17;;;;;;;;;;;;;;;;;;;;;;;;;12937:33;;13046:26;;:::i;:::-;13075:41;13088:10;13100:8;13110:5;13075:12;:41::i;:::-;13046:70;;13149:1;13130:9;:16;;:20;;;;;;;;;;;13182:1;13164:9;:15;;:19;;;;;;;;;;;13222:1;13197:9;:22;;:26;;;;;;;;;;;13262:1;13237:9;:22;;:26;;;;;;;;;;;13277:55;13293:10;13305:8;13315:5;13322:9;13277:15;:55::i;:::-;12871:472;;12918:3;;;;;;;12871:472;;;;13395:7;:12;;;13352:9;:21;13362:10;13352:21;;;;;;;;;;;;;;;:35;13374:7;:12;;;13352:35;;;;;;;;;;;;;;;:40;;;:55;;;;;;;;;;;;;;;;;;13460:7;:12;;;13417:9;:21;13427:10;13417:21;;;;;;;;;;;;;;;:35;13439:7;:12;;;13417:35;;;;;;;;;;;;;;;:40;;;:55;;;;;;;;;;;;;;;;;;13502:10;13487:36;;;13514:8;13487:36;;;;;;;;;;;;;;;;;;;;;;12563:967;;;;:::o;11419:136::-;11491:16;11526:6;:12;11533:4;11526:12;;;;;;;;;;;;;;;:22;11539:8;11526:22;;;;;;;;;;;;;;;11519:29;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11419:136;;;;:::o;11561:427::-;11656:17;;:::i;:::-;11685:26;;:::i;:::-;11714:35;11727:4;11733:8;11743:5;11714:12;:35::i;:::-;11685:64;;11759:222;;;;;;;;11788:9;:16;;;11780:25;;11759:222;;;;11827:9;:15;;;11819:24;;11759:222;;;;11865:9;:22;;;11857:31;;11759:222;;;;11910:9;:22;;;11902:31;;11759:222;;;;11955:9;:15;;;11947:24;;11759:222;;;;;;11561:427;;;;;:::o;851:48::-;;;;;;;;;;;;;;;;;;;:::o;1419:88::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;3013:1311::-;3223:8;3171:60;;:9;:21;3181:10;3171:21;;;;;;;;;;;;;;;:39;3200:8;3171:39;;;;;;;;;;;;;;;:48;;;;;;;;;;;;:60;;;3163:133;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3306:26;;:::i;:::-;3335:41;3348:10;3360:8;3370:5;3335:12;:41::i;:::-;3306:70;;3409:1;3390:9;:15;;;:20;;;3386:210;;;3530:1;3512:9;:15;;:19;;;;;;;;;;;3545:6;:18;3552:10;3545:18;;;;;;;;;;;;;;;:28;3564:8;3545:28;;;;;;;;;;;;;;;3579:5;3545:40;;39:1:-1;33:3;27:10;23:18;57:10;52:3;45:23;79:10;72:17;;0:93;3545:40:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3386:210;3722:17;3755:2;3749:3;:8;;;;;;3722:36;;3787:1;3772:12;:16;;;3768:307;;;3828:10;3812:26;;:12;:26;;;;3804:65;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3952:12;3922:42;;3936:12;3923:10;:25;3922:42;;;;;;;;3908:10;:57;3883:9;:22;;:82;;;;;;;;;;;3768:307;;;4012:1;3986:9;:22;;;:27;;;3982:93;;;4054:10;4029:9;:22;;:35;;;;;;;;;;;3982:93;3768:307;4109:12;4084:9;:22;;:37;;;;;;;;;;;4150:15;4131:9;:16;;:34;;;;;;;;;;;4175:55;4191:10;4203:8;4213:5;4220:9;4175:15;:55::i;:::-;4258:10;4245:72;;;4270:8;4280:5;4287:15;4304:12;4245:72;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3013:1311;;;;;;;:::o;5093:245::-;5167:26;;:::i;:::-;5196:41;5209:10;5221:8;5231:5;5196:12;:41::i;:::-;5167:70;;5265:1;5247:9;:15;;:19;;;;;;;;;;;5276:55;5292:10;5304:8;5314:5;5321:9;5276:15;:55::i;:::-;5093:245;;;:::o;1583:65::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;8097:366::-;8318:7;8354:101;8392:4;8398:5;8405:2;8409:6;8417:12;8431:7;8440:5;8354:24;:101::i;:::-;8344:112;;;;;;8337:119;;8097:366;;;;;;;;;:::o;11994:563::-;12078:1;12058:22;;:8;:22;;;;12050:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12119:12;12141:8;12119:31;;12262:1;12213:51;;:9;:21;12223:10;12213:21;;;;;;;;;;;;;;;:28;12235:5;12213:28;;;;;;;;;;;;;;;:37;;;;;;;;;;;;:51;;;12210:63;;12266:7;;;12210:63;12282:17;12302:14;:26;12317:10;12302:26;;;;;;;;;;;;;;;;;;;;;;;;;12282:46;;12369:33;;;;;;;;12378:8;12369:33;;;;;;12388:1;12369:33;;;;;;12391:10;12369:33;;;;;12338:9;:21;12348:10;12338:21;;;;;;;;;;;;;;;:28;12360:5;12338:28;;;;;;;;;;;;;;;:64;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12453:5;12412:9;:21;12422:10;12412:21;;;;;;;;;;;;;;;:33;12434:10;12412:33;;;;;;;;;;;;;;;:38;;;:46;;;;;;;;;;;;;;;;;;12497:5;12468:14;:26;12483:10;12468:26;;;;;;;;;;;;;;;;:34;;;;;;;;;;;;;;;;;;12529:10;12517:33;;;12541:8;12517:33;;;;;;;;;;;;;;;;;;;;;;11994:563;;;;:::o;13536:759::-;13623:24;13649:11;13696:8;13682:23;;;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;148:4;140:6;136:17;126:27;;0:157;13682:23:0;;;;13672:33;;13715:7;13725:1;13715:11;;13736:19;13768:1;13759:5;:10;;;;13758:43;;13781:14;:20;13796:4;13781:20;;;;;;;;;;;;;;;;;;;;;;;;;13758:43;;;13773:5;13758:43;13736:65;;13811:23;;:::i;:::-;13837:9;:15;13847:4;13837:15;;;;;;;;;;;;;;;:29;13853:12;13837:29;;;;;;;;;;;;;;;13811:55;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13876:178;13910:1;13882:30;;:7;:16;;;:30;;;;:46;;;;;13920:8;13916:12;;:1;:12;;;13882:46;13876:178;;;13957:7;:16;;;13944:7;13952:1;13944:10;;;;;;;;;;;;;;;:29;;;;;;;;;;;13987:3;;;;;;;14014:9;:15;14024:4;14014:15;;;;;;;;;;;;;;;:29;14030:7;:12;;;14014:29;;;;;;;;;;;;;;;14004:39;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13876:178;;;14077:7;:16;;;14063:31;;14277:1;14268:7;14261:18;14247:42;;;;;;;;;:::o;1513:64::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;1708:30::-;;;;:::o;905:40::-;;;;;;;;;;;;;;;;;;;:::o;4330:581::-;4421:26;;:::i;:::-;4471:10;:16;4482:4;4471:16;;;;;;;;;;;;;;;:26;4488:8;4471:26;;;;;;;;;;;;;;;:33;4498:5;4471:33;;;;;;;;;;;;;;;4459:45;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4576:17;4609:2;4603:3;:8;;;;;;4576:36;;4651:1;4626:9;:22;;;:26;;;:91;;;;;4695:9;:22;;;4682:35;;:10;:35;4656:61;;:9;:22;;;:61;;;;4626:91;4622:257;;;4751:1;4733:9;:15;;:19;;;;;;;;;;;4845:9;:22;;;4805:62;;4819:9;:22;;;4806:10;:35;4805:62;;;;;;;;4791:10;:77;4766:9;:22;;:102;;;;;;;;;;;4622:257;4895:9;4888:16;;;4330:581;;;;;:::o;7596:495::-;7822:12;7846:20;1240:135;;;;;;;;;;;;;;;;;;;7932:4;7938:5;7945:2;7949:6;7957:12;7971:7;7980:5;7892:94;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;7892:94:0;;;7869:127;;;;;;7846:150;;8035:4;8030:10;;8047:4;8042:10;;8054:15;;8071:12;8013:71;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;8013:71:0;;;8006:78;;;7596:495;;;;;;;;;:::o;4917:170::-;5071:9;5035:10;:16;5046:4;5035:16;;;;;;;;;;;;;;;:26;5052:8;5035:26;;;;;;;;;;;;;;;:33;5062:5;5035:33;;;;;;;;;;;;;;;:45;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4917:170;;;;:::o;8469:444::-;8609:14;8626:45;8643:9;8654:16;8626;:45::i;:::-;8609:62;;8722:6;8702:26;;:16;:26;;;:89;;;;;8785:6;8732:59;;:9;:24;8750:4;8732:24;;;;;;;;;;;;;;;:40;8764:6;8732:40;;;;;;;;;;;;;;;:49;;;;;;;;;;;;:59;;;8702:89;8681:225;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8469:444;;;;;:::o;10844:569::-;10968:1;10951:19;;:5;:19;;;10947:460;;;11051:4;:30;;;11082:2;11086:6;11098:19;11051:67;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11051:67:0;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11051:67:0;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;11051:67:0;;;;;;;;;;;;;;;;11043:112;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10947:460;;;11186:17;11259:2;11263:6;11206:64;;;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;11206:64:0;;;;;;;38:4:-1;29:7;25:18;67:10;61:17;96:58;199:8;192:4;186;182:15;179:29;167:10;160:49;0:215;;;11206:64:0;11186:84;;11292:4;:30;;;11323:5;11330:1;11333:4;11339:19;11292:67;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;11292:67:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11292:67:0;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11292:67:0;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;11292:67:0;;;;;;;;;;;;;;;;11284:112;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10947:460;;10844:569;;;;:::o;8919:1919::-;9022:13;9138:1;9118:9;:16;:21;9114:44;;;9148:10;9141:17;;;;9114:44;9263:2;9243:9;:16;:22;;9235:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9303:7;9320:9;9339;9370:28;9385:9;9396:1;9370:14;:28::i;:::-;9358:40;;;;;;;;;;;;9470:1;9465;:6;;;9461:1371;;;9606:1;9598:10;;9582:27;;9623:30;9941:4;9937:1;9926:9;9922:17;9918:28;9897:49;;181:10:16;10082:19:0;;9998:103;;;10018:5;9998:43;;;10042:16;10060:17;9998:80;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;9998:80:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;9998:80:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9998:80:0;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9998:80:0;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;9998:80:0;;;;;;;;;;;;;;;;:103;;;;9973:199;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9461:1371;;;;10198:1;10193;:6;;;10189:643;;;10341:10;10333:18;;10189:643;;;10376:2;10372:1;:6;;;10368:464;;;10550:116;10633:16;10623:27;;;;;;10570:81;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;10570:81:0;;;10560:92;;;;;;10658:1;10654;:5;10661:1;10664;10550:116;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;10550:116:0;;;;;;;;10542:124;;10368:464;;;10774:47;10794:16;10784:27;;;;;;10813:1;10816;10819;10774:47;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;10774:47:0;;;;;;;;10766:55;;10368:464;10189:643;9461:1371;8919:1919;;;;;;;;:::o;1223:921:14:-;1332:7;1341:9;1352;1652:3;1646:4;1642:14;1714:4;1700:12;1696:23;1684:10;1680:40;1674:47;1669:52;;1779:4;1765:12;1761:23;1749:10;1745:40;1739:47;1734:52;;2123:4;2114;2100:12;2096:23;2084:10;2080:40;2074:47;2070:58;2065:63;;1608:530;;;;;;:::o;769:13528:0:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;148:4;140:6;136:17;126:27;;0:157;769:13528:0;;;;:::o",
+  "source": "pragma solidity >=0.5.0 <0.7.0;\n\nimport \"@gnosis.pm/safe-contracts/contracts/common/Enum.sol\";\nimport \"@gnosis.pm/safe-contracts/contracts/common/SignatureDecoder.sol\";\nimport \"@gnosis.pm/safe-contracts/contracts/interfaces/ISignatureValidator.sol\";\n\ninterface GnosisSafe {\n    /// @dev Allows a Module to execute a Safe transaction without any further confirmations.\n    /// @param to Destination address of module transaction.\n    /// @param value Ether value of module transaction.\n    /// @param data Data payload of module transaction.\n    /// @param operation Operation type of module transaction.\n    function execTransactionFromModule(address to, uint256 value, bytes calldata data, Enum.Operation operation)\n        external\n        returns (bool success);\n}\n\ncontract AllowanceModule is SignatureDecoder, ISignatureValidatorConstants {\n\n    string public constant NAME = \"Allowance Module\";\n    string public constant VERSION = \"0.1.0\";\n\n    //keccak256(\n    //    \"EIP712Domain(address verifyingContract)\"\n    //);\n    bytes32 public constant DOMAIN_SEPARATOR_TYPEHASH = 0x035aff83d86937d35b32e04f0ddc6ff469290eef2f1b692d8a815c89404d4749;\n\n    // TODO: Fix hardcode hash\n    bytes32 public constant ALLOWANCE_TRANSFER_TYPEHASH = keccak256(\n        \"AllowanceTransfer(address safe,address token,uint96 amount,address paymentToken,uint96 payment,uint16 nonce)\"\n    );\n\n    // Safe -> Delegate -> Allowance\n    mapping(address => mapping (address => mapping(address => Allowance))) public allowances;\n    mapping(address => mapping (address => address[])) public tokens;\n    mapping(address => mapping (uint48 => Delegate)) public delegates;\n    mapping(address => uint48) public delegatesStart;\n    bytes32 public domainSeparator;\n\n    struct Delegate {\n        address delegate;\n        uint48 prev;\n        uint48 next;\n    }\n\n    struct Allowance {\n        uint96 amount;\n        uint96 spent;\n        uint16 resetTimeMin; // Maximum reset time span is 65k minutes\n        uint32 lastResetMin;\n        uint16 nonce;\n    }\n\n    event AddDelegate(address indexed safe, address delegate);\n    event RemoveDelegate(address indexed safe, address delegate);\n    event ExecuteAllowanceTransfer(address indexed safe, address delegate, address token, address to, uint96 value, uint16 nonce);\n    event SetAllowance(address indexed safe, address delegate, address token, uint96 allowanceAmount, uint16 resetTime);\n\n    constructor() public {\n        // TODO: add chain id\n        domainSeparator = keccak256(abi.encode(DOMAIN_SEPARATOR_TYPEHASH, this));\n    }\n\n    /// @dev Allows to update the allowance for a specified token. This can only be done via a Safe transaction.\n    /// @param delegate Delegate whose allowance should be updated.\n    /// @param token Token contract address.\n    /// @param allowanceAmount allowance in smallest token unit.\n    /// @param resetTimeMin Time after which the allowance should reset\n    /// @param resetBaseMin Time based on which the reset time should be increased\n    function setAllowance(address delegate, address token, uint96 allowanceAmount, uint16 resetTimeMin, uint32 resetBaseMin)\n        public\n    {\n        require(delegates[msg.sender][uint48(delegate)].delegate == delegate, \"delegates[msg.sender][uint48(delegate)].delegate == delegate\");\n        Allowance memory allowance = getAllowance(msg.sender, delegate, token);\n        if (allowance.nonce == 0) { // New token\n            // Nonce should never be 0 once allowance has been activated\n            allowance.nonce = 1;\n            tokens[msg.sender][delegate].push(token);\n        }\n        // Divide by 60 to get current time in minutes\n        // solium-disable-next-line security/no-block-members\n        uint32 currentMin = uint32(now / 60);\n        if (resetBaseMin > 0) {\n            require(resetBaseMin <= currentMin, \"resetBaseMin <= currentMin\");\n            allowance.lastResetMin = currentMin - ((currentMin - resetBaseMin) % resetTimeMin);\n        } else if (allowance.lastResetMin == 0) {\n            allowance.lastResetMin = currentMin;\n        }\n        allowance.resetTimeMin = resetTimeMin;\n        allowance.amount = allowanceAmount;\n        updateAllowance(msg.sender, delegate, token, allowance);\n        emit SetAllowance(msg.sender, delegate, token, allowanceAmount, resetTimeMin);\n    }\n\n    function getAllowance(address safe, address delegate, address token) private view returns (Allowance memory allowance) {\n        allowance = allowances[safe][delegate][token];\n        // solium-disable-next-line security/no-block-members\n        uint32 currentMin = uint32(now / 60);\n        if (allowance.resetTimeMin > 0 && allowance.lastResetMin <= currentMin - allowance.resetTimeMin) {\n            allowance.spent = 0;\n            allowance.lastResetMin = currentMin - ((currentMin - allowance.lastResetMin) % allowance.resetTimeMin);\n        }\n        return allowance;\n    }\n\n    function updateAllowance(address safe, address delegate, address token, Allowance memory allowance) private {\n        allowances[safe][delegate][token] = allowance;\n    }\n\n    function resetAllowance(address delegate, address token) public {\n        Allowance memory allowance = getAllowance(msg.sender, delegate, token);\n        allowance.spent = 0;\n        updateAllowance(msg.sender, delegate, token, allowance);\n    }\n\n    function executeAllowanceTransfer(\n        GnosisSafe safe,\n        address token,\n        address payable to,\n        uint96 amount,\n        address paymentToken,\n        uint96 payment,\n        address delegate,\n        bytes memory signature\n    ) public {\n        // Get current state\n        Allowance memory allowance = getAllowance(address(safe), delegate, token);\n        bytes memory transferHashData = generateTransferHashData(address(safe), token, to, amount, paymentToken, payment, allowance.nonce);\n        \n        // Update state\n        allowance.nonce = allowance.nonce + 1;\n        uint96 newSpent = allowance.spent + amount;\n        // Check new spent amount and overflow\n        require(newSpent > allowance.spent && newSpent <= allowance.amount, \"newSpent > allowance.spent && newSpent <= allowance.amount\");\n        allowance.spent = newSpent;\n        if (payment > 0) {\n            // Use updated allowance if token and paymentToken are the same\n            Allowance memory paymentAllowance = paymentToken == token ? allowance : getAllowance(address(safe), delegate, paymentToken);\n            newSpent = paymentAllowance.spent + payment;\n            // Check new spent amount and overflow\n            require(newSpent > paymentAllowance.spent && newSpent <= paymentAllowance.amount, \"newSpent > paymentAllowance.spent && newSpent <= paymentAllowance.amount\");\n            paymentAllowance.spent = newSpent;\n            // Update payment allowance if different from allowance\n            if (paymentToken != token) updateAllowance(address(safe), delegate, paymentToken, paymentAllowance);\n        }\n        updateAllowance(address(safe), delegate, token, allowance);\n\n        // Perform external interactions\n        // Check signature (this contains a potential call -> EIP-1271)\n        checkSignature(delegate, signature, transferHashData, safe);\n\n        if (payment > 0) {\n            // Transfer payment\n            // solium-disable-next-line security/no-tx-origin\n            transfer(safe, paymentToken, tx.origin, payment);\n        }\n        // Transfer token\n        transfer(safe, token, to, amount);\n        emit ExecuteAllowanceTransfer(address(safe), delegate, token, to, amount, allowance.nonce - 1);\n    }\n\n    function generateTransferHashData(\n        address safe,\n        address token,\n        address to,\n        uint96 amount,\n        address paymentToken,\n        uint96 payment,\n        uint16 nonce\n    ) private view returns (bytes memory) {\n        bytes32 transferHash = keccak256(\n            abi.encode(ALLOWANCE_TRANSFER_TYPEHASH, safe, token, to, amount, paymentToken, payment, nonce)\n        );\n        return abi.encodePacked(byte(0x19), byte(0x01), domainSeparator, transferHash);\n    }\n\n    function generateTransferHash(\n        address safe,\n        address token,\n        address to,\n        uint96 amount,\n        address paymentToken,\n        uint96 payment,\n        uint16 nonce\n    ) public view returns (bytes32) {\n        return keccak256(generateTransferHashData(\n            safe, token, to, amount, paymentToken, payment, nonce\n        ));\n    }\n\n    function checkSignature(address expectedDelegate, bytes memory signature, bytes memory transferHashData, GnosisSafe safe) private {\n        address signer = recoverSignature(signature, transferHashData);\n        require(\n            expectedDelegate == signer && delegates[address(safe)][uint48(signer)].delegate == signer,\n            \"expectedDelegate == signer && delegates[address(safe)][uint48(signer)].delegate == signer\"\n        );\n    }\n\n    function recoverSignature(bytes memory signature, bytes memory transferHashData) private view returns (address owner) {\n        // If there is no signature data msg.sender should be used\n        if (signature.length == 0) return msg.sender;\n        // Check that the provided signature data is not too short\n        require(signature.length >= 65, \"signatures.length >= 65\");\n        uint8 v;\n        bytes32 r;\n        bytes32 s;\n        (v, r, s) = signatureSplit(signature, 0);\n        // If v is 0 then it is a contract signature\n        if (v == 0) {\n            // When handling contract signatures the address of the contract is encoded into r\n            owner = address(uint256(r));\n            bytes memory contractSignature;\n            // solium-disable-next-line security/no-inline-assembly\n            assembly {\n                // The signature data for contract signatures is appended to the concatenated signatures and the offset is stored in s\n                contractSignature := add(add(signature, s), 0x20)\n            }\n            require(\n                ISignatureValidator(owner).isValidSignature(transferHashData, contractSignature) == EIP1271_MAGIC_VALUE,\n                \"Could not validate EIP-1271 signature\"\n            );\n        } else if (v == 1) {\n            // If v is 1 we also use msg.sender, this is so that we are compatible to the GnosisSafe signature scheme\n            owner = msg.sender;\n        } else if (v > 30) {\n            // To support eth_sign and similar we adjust v and hash the transferHashData with the Ethereum message prefix before applying ecrecover\n            owner = ecrecover(keccak256(abi.encodePacked(\"\\x19Ethereum Signed Message:\\n32\", keccak256(transferHashData))), v - 4, r, s);\n        } else {\n            // Use ecrecover with the messageHash for EOA signatures\n            owner = ecrecover(keccak256(transferHashData), v, r, s);\n        }\n    }\n\n    function transfer(GnosisSafe safe, address token, address payable to, uint96 amount) private {\n        if (token == address(0)) {\n            // solium-disable-next-line security/no-send\n            require(safe.execTransactionFromModule(to, amount, \"\", Enum.Operation.Call), \"Could not execute ether transfer\");\n        } else {\n            bytes memory data = abi.encodeWithSignature(\"transfer(address,uint256)\", to, amount);\n            require(safe.execTransactionFromModule(token, 0, data, Enum.Operation.Call), \"Could not execute token transfer\");\n        }\n    }\n\n    function getTokens(address safe, address delegate) public view returns (address[] memory) {\n        return tokens[safe][delegate];\n    }\n\n    function getTokenAllowance(address safe, address delegate, address token) public view returns (uint256[5] memory) {\n        Allowance memory allowance = getAllowance(safe, delegate, token);\n        return [\n            uint256(allowance.amount),\n            uint256(allowance.spent),\n            uint256(allowance.resetTimeMin),\n            uint256(allowance.lastResetMin),\n            uint256(allowance.nonce)\n        ];\n    }\n\n    function addDelegate(address delegate) public {\n        require(delegate != address(0), \"Invalid delegate address\");\n        uint48 index = uint48(delegate);\n        // Delegate already exists, nothing to do\n        if(delegates[msg.sender][index].delegate != address(0)) return;\n        uint48 startIndex = delegatesStart[msg.sender];\n        delegates[msg.sender][index] = Delegate(delegate, 0, startIndex);\n        delegates[msg.sender][startIndex].prev = index;\n        delegatesStart[msg.sender] = index;\n        emit AddDelegate(msg.sender, delegate);\n    }\n\n    function removeDelegate(address delegate) public {\n        Delegate memory current = delegates[msg.sender][uint48(delegate)];\n        // Delegate doesn't exists, nothing to do\n        if(current.delegate == address(0)) return;\n        address[] storage delegateTokens = tokens[msg.sender][delegate];\n        for (uint256 i = 0; i < delegateTokens.length; i++) {\n            address token = delegateTokens[i];\n            // Set all allowance params except the nonce to 0\n            Allowance memory allowance = getAllowance(msg.sender, delegate, token);\n            allowance.amount = 0;\n            allowance.spent = 0;\n            allowance.resetTimeMin = 0;\n            allowance.lastResetMin = 0;\n            updateAllowance(msg.sender, delegate, token, allowance);\n        }\n        delegates[msg.sender][current.prev].next = current.next;\n        delegates[msg.sender][current.next].prev = current.prev;\n        emit RemoveDelegate(msg.sender, delegate);\n    }\n\n    function getDelegates(address safe, uint48 start, uint8 pageSize) public view returns (address[] memory results, uint48 next) {\n        results = new address[](pageSize);\n        uint8 i = 0;\n        uint48 initialIndex = (start != 0) ? start : delegatesStart[safe];\n        Delegate memory current = delegates[safe][initialIndex];\n        while(current.delegate != address(0) && i < pageSize) {\n            results[i] = current.delegate;\n            i++;\n            current = delegates[safe][current.next];\n        }\n        next = uint48(current.delegate);\n        // Set the length of the array the number that has been used.\n        // solium-disable-next-line security/no-inline-assembly\n        assembly {\n            mstore(results, i)\n        }\n    }\n}",
+  "sourcePath": "/home/fer/repos/protofire/gnosis/safe-modules/allowances/contracts/AlowanceModule.sol",
+  "ast": {
+    "absolutePath": "/home/fer/repos/protofire/gnosis/safe-modules/allowances/contracts/AlowanceModule.sol",
+    "exportedSymbols": {
+      "AllowanceModule": [
+        1224
+      ],
+      "GnosisSafe": [
+        18
+      ]
+    },
+    "id": 1225,
+    "nodeType": "SourceUnit",
+    "nodes": [
+      {
+        "id": 1,
+        "literals": [
+          "solidity",
+          ">=",
+          "0.5",
+          ".0",
+          "<",
+          "0.7",
+          ".0"
+        ],
+        "nodeType": "PragmaDirective",
+        "src": "0:31:0"
+      },
+      {
+        "absolutePath": "@gnosis.pm/safe-contracts/contracts/common/Enum.sol",
+        "file": "@gnosis.pm/safe-contracts/contracts/common/Enum.sol",
+        "id": 2,
+        "nodeType": "ImportDirective",
+        "scope": 1225,
+        "sourceUnit": 3236,
+        "src": "33:61:0",
+        "symbolAliases": [],
+        "unitAlias": ""
+      },
+      {
+        "absolutePath": "@gnosis.pm/safe-contracts/contracts/common/SignatureDecoder.sol",
+        "file": "@gnosis.pm/safe-contracts/contracts/common/SignatureDecoder.sol",
+        "id": 3,
+        "nodeType": "ImportDirective",
+        "scope": 1225,
+        "sourceUnit": 3371,
+        "src": "95:73:0",
+        "symbolAliases": [],
+        "unitAlias": ""
+      },
+      {
+        "absolutePath": "@gnosis.pm/safe-contracts/contracts/interfaces/ISignatureValidator.sol",
+        "file": "@gnosis.pm/safe-contracts/contracts/interfaces/ISignatureValidator.sol",
+        "id": 4,
+        "nodeType": "ImportDirective",
+        "scope": 1225,
+        "sourceUnit": 3517,
+        "src": "169:80:0",
+        "symbolAliases": [],
+        "unitAlias": ""
+      },
+      {
+        "baseContracts": [],
+        "contractDependencies": [],
+        "contractKind": "interface",
+        "documentation": null,
+        "fullyImplemented": false,
+        "id": 18,
+        "linearizedBaseContracts": [
+          18
+        ],
+        "name": "GnosisSafe",
+        "nodeType": "ContractDefinition",
+        "nodes": [
+          {
+            "body": null,
+            "documentation": "@dev Allows a Module to execute a Safe transaction without any further confirmations.\n @param to Destination address of module transaction.\n @param value Ether value of module transaction.\n @param data Data payload of module transaction.\n @param operation Operation type of module transaction.",
+            "id": 17,
+            "implemented": false,
+            "kind": "function",
+            "modifiers": [],
+            "name": "execTransactionFromModule",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 13,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 6,
+                  "name": "to",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 17,
+                  "src": "643:10:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 5,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "643:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 8,
+                  "name": "value",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 17,
+                  "src": "655:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint256",
+                    "typeString": "uint256"
+                  },
+                  "typeName": {
+                    "id": 7,
+                    "name": "uint256",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "655:7:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 10,
+                  "name": "data",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 17,
+                  "src": "670:19:0",
+                  "stateVariable": false,
+                  "storageLocation": "calldata",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_calldata_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 9,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "670:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 12,
+                  "name": "operation",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 17,
+                  "src": "691:24:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_enum$_Operation_$3234",
+                    "typeString": "enum Enum.Operation"
+                  },
+                  "typeName": {
+                    "contractScope": null,
+                    "id": 11,
+                    "name": "Enum.Operation",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 3234,
+                    "src": "691:14:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_enum$_Operation_$3234",
+                      "typeString": "enum Enum.Operation"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "642:74:0"
+            },
+            "returnParameters": {
+              "id": 16,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 15,
+                  "name": "success",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 17,
+                  "src": "751:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bool",
+                    "typeString": "bool"
+                  },
+                  "typeName": {
+                    "id": 14,
+                    "name": "bool",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "751:4:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "750:14:0"
+            },
+            "scope": 18,
+            "src": "608:157:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "external"
+          }
+        ],
+        "scope": 1225,
+        "src": "251:516:0"
+      },
+      {
+        "baseContracts": [
+          {
+            "arguments": null,
+            "baseName": {
+              "contractScope": null,
+              "id": 19,
+              "name": "SignatureDecoder",
+              "nodeType": "UserDefinedTypeName",
+              "referencedDeclaration": 3370,
+              "src": "797:16:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_contract$_SignatureDecoder_$3370",
+                "typeString": "contract SignatureDecoder"
+              }
+            },
+            "id": 20,
+            "nodeType": "InheritanceSpecifier",
+            "src": "797:16:0"
+          },
+          {
+            "arguments": null,
+            "baseName": {
+              "contractScope": null,
+              "id": 21,
+              "name": "ISignatureValidatorConstants",
+              "nodeType": "UserDefinedTypeName",
+              "referencedDeclaration": 3504,
+              "src": "815:28:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_contract$_ISignatureValidatorConstants_$3504",
+                "typeString": "contract ISignatureValidatorConstants"
+              }
+            },
+            "id": 22,
+            "nodeType": "InheritanceSpecifier",
+            "src": "815:28:0"
+          }
+        ],
+        "contractDependencies": [
+          3370,
+          3504
+        ],
+        "contractKind": "contract",
+        "documentation": null,
+        "fullyImplemented": true,
+        "id": 1224,
+        "linearizedBaseContracts": [
+          1224,
+          3504,
+          3370
+        ],
+        "name": "AllowanceModule",
+        "nodeType": "ContractDefinition",
+        "nodes": [
+          {
+            "constant": true,
+            "id": 25,
+            "name": "NAME",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "851:48:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_string_memory",
+              "typeString": "string"
+            },
+            "typeName": {
+              "id": 23,
+              "name": "string",
+              "nodeType": "ElementaryTypeName",
+              "src": "851:6:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_string_storage_ptr",
+                "typeString": "string"
+              }
+            },
+            "value": {
+              "argumentTypes": null,
+              "hexValue": "416c6c6f77616e6365204d6f64756c65",
+              "id": 24,
+              "isConstant": false,
+              "isLValue": false,
+              "isPure": true,
+              "kind": "string",
+              "lValueRequested": false,
+              "nodeType": "Literal",
+              "src": "881:18:0",
+              "subdenomination": null,
+              "typeDescriptions": {
+                "typeIdentifier": "t_stringliteral_08f58094bad74d8c1150a9739fed54fd2f5fa3e2ab1381a21213c5b33d83bad3",
+                "typeString": "literal_string \"Allowance Module\""
+              },
+              "value": "Allowance Module"
+            },
+            "visibility": "public"
+          },
+          {
+            "constant": true,
+            "id": 28,
+            "name": "VERSION",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "905:40:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_string_memory",
+              "typeString": "string"
+            },
+            "typeName": {
+              "id": 26,
+              "name": "string",
+              "nodeType": "ElementaryTypeName",
+              "src": "905:6:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_string_storage_ptr",
+                "typeString": "string"
+              }
+            },
+            "value": {
+              "argumentTypes": null,
+              "hexValue": "302e312e30",
+              "id": 27,
+              "isConstant": false,
+              "isLValue": false,
+              "isPure": true,
+              "kind": "string",
+              "lValueRequested": false,
+              "nodeType": "Literal",
+              "src": "938:7:0",
+              "subdenomination": null,
+              "typeDescriptions": {
+                "typeIdentifier": "t_stringliteral_aa7cdbe2cce2ec7b606b0e199ddd9b264a6e645e767fb8479a7917dcd1b8693f",
+                "typeString": "literal_string \"0.1.0\""
+              },
+              "value": "0.1.0"
+            },
+            "visibility": "public"
+          },
+          {
+            "constant": true,
+            "id": 31,
+            "name": "DOMAIN_SEPARATOR_TYPEHASH",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1030:118:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_bytes32",
+              "typeString": "bytes32"
+            },
+            "typeName": {
+              "id": 29,
+              "name": "bytes32",
+              "nodeType": "ElementaryTypeName",
+              "src": "1030:7:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_bytes32",
+                "typeString": "bytes32"
+              }
+            },
+            "value": {
+              "argumentTypes": null,
+              "hexValue": "307830333561666638336438363933376433356233326530346630646463366666343639323930656566326631623639326438613831356338393430346434373439",
+              "id": 30,
+              "isConstant": false,
+              "isLValue": false,
+              "isPure": true,
+              "kind": "number",
+              "lValueRequested": false,
+              "nodeType": "Literal",
+              "src": "1082:66:0",
+              "subdenomination": null,
+              "typeDescriptions": {
+                "typeIdentifier": "t_rational_1517718281442037948617199096126532355110765202990829672390711201829802035017_by_1",
+                "typeString": "int_const 1517...(68 digits omitted)...5017"
+              },
+              "value": "0x035aff83d86937d35b32e04f0ddc6ff469290eef2f1b692d8a815c89404d4749"
+            },
+            "visibility": "public"
+          },
+          {
+            "constant": true,
+            "id": 36,
+            "name": "ALLOWANCE_TRANSFER_TYPEHASH",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1186:189:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_bytes32",
+              "typeString": "bytes32"
+            },
+            "typeName": {
+              "id": 32,
+              "name": "bytes32",
+              "nodeType": "ElementaryTypeName",
+              "src": "1186:7:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_bytes32",
+                "typeString": "bytes32"
+              }
+            },
+            "value": {
+              "argumentTypes": null,
+              "arguments": [
+                {
+                  "argumentTypes": null,
+                  "hexValue": "416c6c6f77616e63655472616e73666572286164647265737320736166652c6164647265737320746f6b656e2c75696e74393620616d6f756e742c61646472657373207061796d656e74546f6b656e2c75696e743936207061796d656e742c75696e743136206e6f6e636529",
+                  "id": 34,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": true,
+                  "kind": "string",
+                  "lValueRequested": false,
+                  "nodeType": "Literal",
+                  "src": "1259:110:0",
+                  "subdenomination": null,
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_stringliteral_80b006280932094e7cc965863eb5118dc07e5d272c6670c4a7c87299e04fceeb",
+                    "typeString": "literal_string \"AllowanceTransfer(address safe,address token,uint96 amount,address paymentToken,uint96 payment,uint16 nonce)\""
+                  },
+                  "value": "AllowanceTransfer(address safe,address token,uint96 amount,address paymentToken,uint96 payment,uint16 nonce)"
+                }
+              ],
+              "expression": {
+                "argumentTypes": [
+                  {
+                    "typeIdentifier": "t_stringliteral_80b006280932094e7cc965863eb5118dc07e5d272c6670c4a7c87299e04fceeb",
+                    "typeString": "literal_string \"AllowanceTransfer(address safe,address token,uint96 amount,address paymentToken,uint96 payment,uint16 nonce)\""
+                  }
+                ],
+                "id": 33,
+                "name": "keccak256",
+                "nodeType": "Identifier",
+                "overloadedDeclarations": [],
+                "referencedDeclaration": 4971,
+                "src": "1240:9:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                  "typeString": "function (bytes memory) pure returns (bytes32)"
+                }
+              },
+              "id": 35,
+              "isConstant": false,
+              "isLValue": false,
+              "isPure": true,
+              "kind": "functionCall",
+              "lValueRequested": false,
+              "names": [],
+              "nodeType": "FunctionCall",
+              "src": "1240:135:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_bytes32",
+                "typeString": "bytes32"
+              }
+            },
+            "visibility": "public"
+          },
+          {
+            "constant": false,
+            "id": 44,
+            "name": "allowances",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1419:88:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$_$",
+              "typeString": "mapping(address => mapping(address => mapping(address => struct AllowanceModule.Allowance)))"
+            },
+            "typeName": {
+              "id": 43,
+              "keyType": {
+                "id": 37,
+                "name": "address",
+                "nodeType": "ElementaryTypeName",
+                "src": "1427:7:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_address",
+                  "typeString": "address"
+                }
+              },
+              "nodeType": "Mapping",
+              "src": "1419:70:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$_$",
+                "typeString": "mapping(address => mapping(address => mapping(address => struct AllowanceModule.Allowance)))"
+              },
+              "valueType": {
+                "id": 42,
+                "keyType": {
+                  "id": 38,
+                  "name": "address",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1447:7:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  }
+                },
+                "nodeType": "Mapping",
+                "src": "1438:50:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$",
+                  "typeString": "mapping(address => mapping(address => struct AllowanceModule.Allowance))"
+                },
+                "valueType": {
+                  "id": 41,
+                  "keyType": {
+                    "id": 39,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "1466:7:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "nodeType": "Mapping",
+                  "src": "1458:29:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$",
+                    "typeString": "mapping(address => struct AllowanceModule.Allowance)"
+                  },
+                  "valueType": {
+                    "contractScope": null,
+                    "id": 40,
+                    "name": "Allowance",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 81,
+                    "src": "1477:9:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                      "typeString": "struct AllowanceModule.Allowance"
+                    }
+                  }
+                }
+              }
+            },
+            "value": null,
+            "visibility": "public"
+          },
+          {
+            "constant": false,
+            "id": 51,
+            "name": "tokens",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1513:64:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$_$",
+              "typeString": "mapping(address => mapping(address => address[]))"
+            },
+            "typeName": {
+              "id": 50,
+              "keyType": {
+                "id": 45,
+                "name": "address",
+                "nodeType": "ElementaryTypeName",
+                "src": "1521:7:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_address",
+                  "typeString": "address"
+                }
+              },
+              "nodeType": "Mapping",
+              "src": "1513:50:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$_$",
+                "typeString": "mapping(address => mapping(address => address[]))"
+              },
+              "valueType": {
+                "id": 49,
+                "keyType": {
+                  "id": 46,
+                  "name": "address",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1541:7:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  }
+                },
+                "nodeType": "Mapping",
+                "src": "1532:30:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$",
+                  "typeString": "mapping(address => address[])"
+                },
+                "valueType": {
+                  "baseType": {
+                    "id": 47,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "1552:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "id": 48,
+                  "length": null,
+                  "nodeType": "ArrayTypeName",
+                  "src": "1552:9:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                    "typeString": "address[]"
+                  }
+                }
+              }
+            },
+            "value": null,
+            "visibility": "public"
+          },
+          {
+            "constant": false,
+            "id": 57,
+            "name": "delegates",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1583:65:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+              "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate))"
+            },
+            "typeName": {
+              "id": 56,
+              "keyType": {
+                "id": 52,
+                "name": "address",
+                "nodeType": "ElementaryTypeName",
+                "src": "1591:7:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_address",
+                  "typeString": "address"
+                }
+              },
+              "nodeType": "Mapping",
+              "src": "1583:48:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate))"
+              },
+              "valueType": {
+                "id": 55,
+                "keyType": {
+                  "id": 53,
+                  "name": "uint48",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1611:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint48",
+                    "typeString": "uint48"
+                  }
+                },
+                "nodeType": "Mapping",
+                "src": "1602:28:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                  "typeString": "mapping(uint48 => struct AllowanceModule.Delegate)"
+                },
+                "valueType": {
+                  "contractScope": null,
+                  "id": 54,
+                  "name": "Delegate",
+                  "nodeType": "UserDefinedTypeName",
+                  "referencedDeclaration": 70,
+                  "src": "1621:8:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_struct$_Delegate_$70_storage_ptr",
+                    "typeString": "struct AllowanceModule.Delegate"
+                  }
+                }
+              }
+            },
+            "value": null,
+            "visibility": "public"
+          },
+          {
+            "constant": false,
+            "id": 61,
+            "name": "delegatesStart",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1654:48:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_mapping$_t_address_$_t_uint48_$",
+              "typeString": "mapping(address => uint48)"
+            },
+            "typeName": {
+              "id": 60,
+              "keyType": {
+                "id": 58,
+                "name": "address",
+                "nodeType": "ElementaryTypeName",
+                "src": "1662:7:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_address",
+                  "typeString": "address"
+                }
+              },
+              "nodeType": "Mapping",
+              "src": "1654:26:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_mapping$_t_address_$_t_uint48_$",
+                "typeString": "mapping(address => uint48)"
+              },
+              "valueType": {
+                "id": 59,
+                "name": "uint48",
+                "nodeType": "ElementaryTypeName",
+                "src": "1673:6:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint48",
+                  "typeString": "uint48"
+                }
+              }
+            },
+            "value": null,
+            "visibility": "public"
+          },
+          {
+            "constant": false,
+            "id": 63,
+            "name": "domainSeparator",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1708:30:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_bytes32",
+              "typeString": "bytes32"
+            },
+            "typeName": {
+              "id": 62,
+              "name": "bytes32",
+              "nodeType": "ElementaryTypeName",
+              "src": "1708:7:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_bytes32",
+                "typeString": "bytes32"
+              }
+            },
+            "value": null,
+            "visibility": "public"
+          },
+          {
+            "canonicalName": "AllowanceModule.Delegate",
+            "id": 70,
+            "members": [
+              {
+                "constant": false,
+                "id": 65,
+                "name": "delegate",
+                "nodeType": "VariableDeclaration",
+                "scope": 70,
+                "src": "1771:16:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_address",
+                  "typeString": "address"
+                },
+                "typeName": {
+                  "id": 64,
+                  "name": "address",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1771:7:0",
+                  "stateMutability": "nonpayable",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 67,
+                "name": "prev",
+                "nodeType": "VariableDeclaration",
+                "scope": 70,
+                "src": "1797:11:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint48",
+                  "typeString": "uint48"
+                },
+                "typeName": {
+                  "id": 66,
+                  "name": "uint48",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1797:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint48",
+                    "typeString": "uint48"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 69,
+                "name": "next",
+                "nodeType": "VariableDeclaration",
+                "scope": 70,
+                "src": "1818:11:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint48",
+                  "typeString": "uint48"
+                },
+                "typeName": {
+                  "id": 68,
+                  "name": "uint48",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1818:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint48",
+                    "typeString": "uint48"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              }
+            ],
+            "name": "Delegate",
+            "nodeType": "StructDefinition",
+            "scope": 1224,
+            "src": "1745:91:0",
+            "visibility": "public"
+          },
+          {
+            "canonicalName": "AllowanceModule.Allowance",
+            "id": 81,
+            "members": [
+              {
+                "constant": false,
+                "id": 72,
+                "name": "amount",
+                "nodeType": "VariableDeclaration",
+                "scope": 81,
+                "src": "1869:13:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint96",
+                  "typeString": "uint96"
+                },
+                "typeName": {
+                  "id": 71,
+                  "name": "uint96",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1869:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 74,
+                "name": "spent",
+                "nodeType": "VariableDeclaration",
+                "scope": 81,
+                "src": "1892:12:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint96",
+                  "typeString": "uint96"
+                },
+                "typeName": {
+                  "id": 73,
+                  "name": "uint96",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1892:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 76,
+                "name": "resetTimeMin",
+                "nodeType": "VariableDeclaration",
+                "scope": 81,
+                "src": "1914:19:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint16",
+                  "typeString": "uint16"
+                },
+                "typeName": {
+                  "id": 75,
+                  "name": "uint16",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1914:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 78,
+                "name": "lastResetMin",
+                "nodeType": "VariableDeclaration",
+                "scope": 81,
+                "src": "1985:19:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint32",
+                  "typeString": "uint32"
+                },
+                "typeName": {
+                  "id": 77,
+                  "name": "uint32",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1985:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint32",
+                    "typeString": "uint32"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 80,
+                "name": "nonce",
+                "nodeType": "VariableDeclaration",
+                "scope": 81,
+                "src": "2014:12:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint16",
+                  "typeString": "uint16"
+                },
+                "typeName": {
+                  "id": 79,
+                  "name": "uint16",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "2014:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              }
+            ],
+            "name": "Allowance",
+            "nodeType": "StructDefinition",
+            "scope": 1224,
+            "src": "1842:191:0",
+            "visibility": "public"
+          },
+          {
+            "anonymous": false,
+            "documentation": null,
+            "id": 87,
+            "name": "AddDelegate",
+            "nodeType": "EventDefinition",
+            "parameters": {
+              "id": 86,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 83,
+                  "indexed": true,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 87,
+                  "src": "2057:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 82,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2057:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 85,
+                  "indexed": false,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 87,
+                  "src": "2079:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 84,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2079:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "2056:40:0"
+            },
+            "src": "2039:58:0"
+          },
+          {
+            "anonymous": false,
+            "documentation": null,
+            "id": 93,
+            "name": "RemoveDelegate",
+            "nodeType": "EventDefinition",
+            "parameters": {
+              "id": 92,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 89,
+                  "indexed": true,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 93,
+                  "src": "2123:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 88,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2123:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 91,
+                  "indexed": false,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 93,
+                  "src": "2145:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 90,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2145:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "2122:40:0"
+            },
+            "src": "2102:61:0"
+          },
+          {
+            "anonymous": false,
+            "documentation": null,
+            "id": 107,
+            "name": "ExecuteAllowanceTransfer",
+            "nodeType": "EventDefinition",
+            "parameters": {
+              "id": 106,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 95,
+                  "indexed": true,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 107,
+                  "src": "2199:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 94,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2199:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 97,
+                  "indexed": false,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 107,
+                  "src": "2221:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 96,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2221:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 99,
+                  "indexed": false,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 107,
+                  "src": "2239:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 98,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2239:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 101,
+                  "indexed": false,
+                  "name": "to",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 107,
+                  "src": "2254:10:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 100,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2254:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 103,
+                  "indexed": false,
+                  "name": "value",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 107,
+                  "src": "2266:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 102,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2266:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 105,
+                  "indexed": false,
+                  "name": "nonce",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 107,
+                  "src": "2280:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  },
+                  "typeName": {
+                    "id": 104,
+                    "name": "uint16",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2280:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "2198:95:0"
+            },
+            "src": "2168:126:0"
+          },
+          {
+            "anonymous": false,
+            "documentation": null,
+            "id": 119,
+            "name": "SetAllowance",
+            "nodeType": "EventDefinition",
+            "parameters": {
+              "id": 118,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 109,
+                  "indexed": true,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 119,
+                  "src": "2318:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 108,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2318:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 111,
+                  "indexed": false,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 119,
+                  "src": "2340:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 110,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2340:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 113,
+                  "indexed": false,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 119,
+                  "src": "2358:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 112,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2358:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 115,
+                  "indexed": false,
+                  "name": "allowanceAmount",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 119,
+                  "src": "2373:22:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 114,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2373:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 117,
+                  "indexed": false,
+                  "name": "resetTime",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 119,
+                  "src": "2397:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  },
+                  "typeName": {
+                    "id": 116,
+                    "name": "uint16",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2397:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "2317:97:0"
+            },
+            "src": "2299:116:0"
+          },
+          {
+            "body": {
+              "id": 132,
+              "nodeType": "Block",
+              "src": "2442:119:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 130,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "id": 122,
+                      "name": "domainSeparator",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 63,
+                      "src": "2482:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bytes32",
+                        "typeString": "bytes32"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "id": 126,
+                              "name": "DOMAIN_SEPARATOR_TYPEHASH",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 31,
+                              "src": "2521:25:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bytes32",
+                                "typeString": "bytes32"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 127,
+                              "name": "this",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 5001,
+                              "src": "2548:4:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_AllowanceModule_$1224",
+                                "typeString": "contract AllowanceModule"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bytes32",
+                                "typeString": "bytes32"
+                              },
+                              {
+                                "typeIdentifier": "t_contract$_AllowanceModule_$1224",
+                                "typeString": "contract AllowanceModule"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 124,
+                              "name": "abi",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4964,
+                              "src": "2510:3:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_magic_abi",
+                                "typeString": "abi"
+                              }
+                            },
+                            "id": 125,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "lValueRequested": false,
+                            "memberName": "encode",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "2510:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_abiencode_pure$__$returns$_t_bytes_memory_ptr_$",
+                              "typeString": "function () pure returns (bytes memory)"
+                            }
+                          },
+                          "id": 128,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "2510:43:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bytes_memory_ptr",
+                            "typeString": "bytes memory"
+                          }
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_bytes_memory_ptr",
+                            "typeString": "bytes memory"
+                          }
+                        ],
+                        "id": 123,
+                        "name": "keccak256",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 4971,
+                        "src": "2500:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                          "typeString": "function (bytes memory) pure returns (bytes32)"
+                        }
+                      },
+                      "id": 129,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "functionCall",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "2500:54:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bytes32",
+                        "typeString": "bytes32"
+                      }
+                    },
+                    "src": "2482:72:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes32",
+                      "typeString": "bytes32"
+                    }
+                  },
+                  "id": 131,
+                  "nodeType": "ExpressionStatement",
+                  "src": "2482:72:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 133,
+            "implemented": true,
+            "kind": "constructor",
+            "modifiers": [],
+            "name": "",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 120,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "2432:2:0"
+            },
+            "returnParameters": {
+              "id": 121,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "2442:0:0"
+            },
+            "scope": 1224,
+            "src": "2421:140:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 267,
+              "nodeType": "Block",
+              "src": "3153:1171:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        "id": 157,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "baseExpression": {
+                              "argumentTypes": null,
+                              "baseExpression": {
+                                "argumentTypes": null,
+                                "id": 147,
+                                "name": "delegates",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 57,
+                                "src": "3171:9:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                                  "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                                }
+                              },
+                              "id": 150,
+                              "indexExpression": {
+                                "argumentTypes": null,
+                                "expression": {
+                                  "argumentTypes": null,
+                                  "id": 148,
+                                  "name": "msg",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 4977,
+                                  "src": "3181:3:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_magic_message",
+                                    "typeString": "msg"
+                                  }
+                                },
+                                "id": 149,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "memberName": "sender",
+                                "nodeType": "MemberAccess",
+                                "referencedDeclaration": null,
+                                "src": "3181:10:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address_payable",
+                                  "typeString": "address payable"
+                                }
+                              },
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "nodeType": "IndexAccess",
+                              "src": "3171:21:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                                "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                              }
+                            },
+                            "id": 154,
+                            "indexExpression": {
+                              "argumentTypes": null,
+                              "arguments": [
+                                {
+                                  "argumentTypes": null,
+                                  "id": 152,
+                                  "name": "delegate",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 135,
+                                  "src": "3200:8:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                }
+                              ],
+                              "expression": {
+                                "argumentTypes": [
+                                  {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                ],
+                                "id": 151,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": true,
+                                "lValueRequested": false,
+                                "nodeType": "ElementaryTypeNameExpression",
+                                "src": "3193:6:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_type$_t_uint48_$",
+                                  "typeString": "type(uint48)"
+                                },
+                                "typeName": "uint48"
+                              },
+                              "id": 153,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "kind": "typeConversion",
+                              "lValueRequested": false,
+                              "names": [],
+                              "nodeType": "FunctionCall",
+                              "src": "3193:16:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint48",
+                                "typeString": "uint48"
+                              }
+                            },
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "nodeType": "IndexAccess",
+                            "src": "3171:39:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                              "typeString": "struct AllowanceModule.Delegate storage ref"
+                            }
+                          },
+                          "id": 155,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "delegate",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 65,
+                          "src": "3171:48:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "==",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "id": 156,
+                          "name": "delegate",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 135,
+                          "src": "3223:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "src": "3171:60:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "hexValue": "64656c6567617465735b6d73672e73656e6465725d5b75696e7434382864656c6567617465295d2e64656c6567617465203d3d2064656c6567617465",
+                        "id": 158,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "string",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "3233:62:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_stringliteral_58537fa1960fbebccc117b6218b0af08a9f148039299593ea287e665dd534bb1",
+                          "typeString": "literal_string \"delegates[msg.sender][uint48(delegate)].delegate == delegate\""
+                        },
+                        "value": "delegates[msg.sender][uint48(delegate)].delegate == delegate"
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        {
+                          "typeIdentifier": "t_stringliteral_58537fa1960fbebccc117b6218b0af08a9f148039299593ea287e665dd534bb1",
+                          "typeString": "literal_string \"delegates[msg.sender][uint48(delegate)].delegate == delegate\""
+                        }
+                      ],
+                      "id": 146,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        4980,
+                        4981
+                      ],
+                      "referencedDeclaration": 4981,
+                      "src": "3163:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                        "typeString": "function (bool,string memory) pure"
+                      }
+                    },
+                    "id": 159,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "3163:133:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 160,
+                  "nodeType": "ExpressionStatement",
+                  "src": "3163:133:0"
+                },
+                {
+                  "assignments": [
+                    162
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 162,
+                      "name": "allowance",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 267,
+                      "src": "3306:26:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                        "typeString": "struct AllowanceModule.Allowance"
+                      },
+                      "typeName": {
+                        "contractScope": null,
+                        "id": 161,
+                        "name": "Allowance",
+                        "nodeType": "UserDefinedTypeName",
+                        "referencedDeclaration": 81,
+                        "src": "3306:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                          "typeString": "struct AllowanceModule.Allowance"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 169,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 164,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "3348:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 165,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "3348:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 166,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 135,
+                        "src": "3360:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 167,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 137,
+                        "src": "3370:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 163,
+                      "name": "getAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 336,
+                      "src": "3335:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$returns$_t_struct$_Allowance_$81_memory_ptr_$",
+                        "typeString": "function (address,address,address) view returns (struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 168,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "3335:41:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                      "typeString": "struct AllowanceModule.Allowance memory"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "3306:70:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    },
+                    "id": 173,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 170,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 162,
+                        "src": "3390:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 171,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "nonce",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 80,
+                      "src": "3390:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "==",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 172,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "3409:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "3390:20:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 191,
+                  "nodeType": "IfStatement",
+                  "src": "3386:210:0",
+                  "trueBody": {
+                    "id": 190,
+                    "nodeType": "Block",
+                    "src": "3412:184:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 178,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 174,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 162,
+                              "src": "3512:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 176,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "nonce",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 80,
+                            "src": "3512:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "hexValue": "31",
+                            "id": 177,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "3530:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_1_by_1",
+                              "typeString": "int_const 1"
+                            },
+                            "value": "1"
+                          },
+                          "src": "3512:19:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint16",
+                            "typeString": "uint16"
+                          }
+                        },
+                        "id": 179,
+                        "nodeType": "ExpressionStatement",
+                        "src": "3512:19:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "id": 187,
+                              "name": "token",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 137,
+                              "src": "3579:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "baseExpression": {
+                                "argumentTypes": null,
+                                "baseExpression": {
+                                  "argumentTypes": null,
+                                  "id": 180,
+                                  "name": "tokens",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 51,
+                                  "src": "3545:6:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$_$",
+                                    "typeString": "mapping(address => mapping(address => address[] storage ref))"
+                                  }
+                                },
+                                "id": 184,
+                                "indexExpression": {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "id": 181,
+                                    "name": "msg",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 4977,
+                                    "src": "3552:3:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_magic_message",
+                                      "typeString": "msg"
+                                    }
+                                  },
+                                  "id": 182,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "memberName": "sender",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": null,
+                                  "src": "3552:10:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_address_payable",
+                                    "typeString": "address payable"
+                                  }
+                                },
+                                "isConstant": false,
+                                "isLValue": true,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "nodeType": "IndexAccess",
+                                "src": "3545:18:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$",
+                                  "typeString": "mapping(address => address[] storage ref)"
+                                }
+                              },
+                              "id": 185,
+                              "indexExpression": {
+                                "argumentTypes": null,
+                                "id": 183,
+                                "name": "delegate",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 135,
+                                "src": "3564:8:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "nodeType": "IndexAccess",
+                              "src": "3545:28:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_array$_t_address_$dyn_storage",
+                                "typeString": "address[] storage ref"
+                              }
+                            },
+                            "id": 186,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "push",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "3545:33:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_arraypush_nonpayable$_t_address_$returns$_t_uint256_$",
+                              "typeString": "function (address) returns (uint256)"
+                            }
+                          },
+                          "id": 188,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "3545:40:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "id": 189,
+                        "nodeType": "ExpressionStatement",
+                        "src": "3545:40:0"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "assignments": [
+                    193
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 193,
+                      "name": "currentMin",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 267,
+                      "src": "3722:17:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint32",
+                        "typeString": "uint32"
+                      },
+                      "typeName": {
+                        "id": 192,
+                        "name": "uint32",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "3722:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint32",
+                          "typeString": "uint32"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 199,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        },
+                        "id": 197,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "id": 195,
+                          "name": "now",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4979,
+                          "src": "3749:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "/",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "3630",
+                          "id": 196,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "3755:2:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_60_by_1",
+                            "typeString": "int_const 60"
+                          },
+                          "value": "60"
+                        },
+                        "src": "3749:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      ],
+                      "id": 194,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "lValueRequested": false,
+                      "nodeType": "ElementaryTypeNameExpression",
+                      "src": "3742:6:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_type$_t_uint32_$",
+                        "typeString": "type(uint32)"
+                      },
+                      "typeName": "uint32"
+                    },
+                    "id": 198,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "typeConversion",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "3742:16:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint32",
+                      "typeString": "uint32"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "3722:36:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint32",
+                      "typeString": "uint32"
+                    },
+                    "id": 202,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 200,
+                      "name": "resetBaseMin",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 143,
+                      "src": "3772:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint32",
+                        "typeString": "uint32"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": ">",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 201,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "3787:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "3772:16:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": {
+                    "condition": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_uint32",
+                        "typeString": "uint32"
+                      },
+                      "id": 228,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 225,
+                          "name": "allowance",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 162,
+                          "src": "3986:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "id": 226,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "lastResetMin",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 78,
+                        "src": "3986:22:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint32",
+                          "typeString": "uint32"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": "==",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "hexValue": "30",
+                        "id": 227,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "number",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "4012:1:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_rational_0_by_1",
+                          "typeString": "int_const 0"
+                        },
+                        "value": "0"
+                      },
+                      "src": "3986:27:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "falseBody": null,
+                    "id": 236,
+                    "nodeType": "IfStatement",
+                    "src": "3982:93:0",
+                    "trueBody": {
+                      "id": 235,
+                      "nodeType": "Block",
+                      "src": "4015:60:0",
+                      "statements": [
+                        {
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 233,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "leftHandSide": {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 229,
+                                "name": "allowance",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 162,
+                                "src": "4029:9:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                  "typeString": "struct AllowanceModule.Allowance memory"
+                                }
+                              },
+                              "id": 231,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": true,
+                              "memberName": "lastResetMin",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 78,
+                              "src": "4029:22:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              }
+                            },
+                            "nodeType": "Assignment",
+                            "operator": "=",
+                            "rightHandSide": {
+                              "argumentTypes": null,
+                              "id": 232,
+                              "name": "currentMin",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 193,
+                              "src": "4054:10:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              }
+                            },
+                            "src": "4029:35:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          },
+                          "id": 234,
+                          "nodeType": "ExpressionStatement",
+                          "src": "4029:35:0"
+                        }
+                      ]
+                    }
+                  },
+                  "id": 237,
+                  "nodeType": "IfStatement",
+                  "src": "3768:307:0",
+                  "trueBody": {
+                    "id": 224,
+                    "nodeType": "Block",
+                    "src": "3790:186:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "commonType": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              },
+                              "id": 206,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "leftExpression": {
+                                "argumentTypes": null,
+                                "id": 204,
+                                "name": "resetBaseMin",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 143,
+                                "src": "3812:12:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_uint32",
+                                  "typeString": "uint32"
+                                }
+                              },
+                              "nodeType": "BinaryOperation",
+                              "operator": "<=",
+                              "rightExpression": {
+                                "argumentTypes": null,
+                                "id": 205,
+                                "name": "currentMin",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 193,
+                                "src": "3828:10:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_uint32",
+                                  "typeString": "uint32"
+                                }
+                              },
+                              "src": "3812:26:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "7265736574426173654d696e203c3d2063757272656e744d696e",
+                              "id": 207,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "string",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "3840:28:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_stringliteral_1ede17760f99a36e22c97a9975aa792b767bce45958763871f51d908d7d840ba",
+                                "typeString": "literal_string \"resetBaseMin <= currentMin\""
+                              },
+                              "value": "resetBaseMin <= currentMin"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              },
+                              {
+                                "typeIdentifier": "t_stringliteral_1ede17760f99a36e22c97a9975aa792b767bce45958763871f51d908d7d840ba",
+                                "typeString": "literal_string \"resetBaseMin <= currentMin\""
+                              }
+                            ],
+                            "id": 203,
+                            "name": "require",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [
+                              4980,
+                              4981
+                            ],
+                            "referencedDeclaration": 4981,
+                            "src": "3804:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                              "typeString": "function (bool,string memory) pure"
+                            }
+                          },
+                          "id": 208,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "3804:65:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 209,
+                        "nodeType": "ExpressionStatement",
+                        "src": "3804:65:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 222,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 210,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 162,
+                              "src": "3883:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 212,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "lastResetMin",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 78,
+                            "src": "3883:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "commonType": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            },
+                            "id": 221,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "leftExpression": {
+                              "argumentTypes": null,
+                              "id": 213,
+                              "name": "currentMin",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 193,
+                              "src": "3908:10:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              }
+                            },
+                            "nodeType": "BinaryOperation",
+                            "operator": "-",
+                            "rightExpression": {
+                              "argumentTypes": null,
+                              "components": [
+                                {
+                                  "argumentTypes": null,
+                                  "commonType": {
+                                    "typeIdentifier": "t_uint32",
+                                    "typeString": "uint32"
+                                  },
+                                  "id": 219,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "leftExpression": {
+                                    "argumentTypes": null,
+                                    "components": [
+                                      {
+                                        "argumentTypes": null,
+                                        "commonType": {
+                                          "typeIdentifier": "t_uint32",
+                                          "typeString": "uint32"
+                                        },
+                                        "id": 216,
+                                        "isConstant": false,
+                                        "isLValue": false,
+                                        "isPure": false,
+                                        "lValueRequested": false,
+                                        "leftExpression": {
+                                          "argumentTypes": null,
+                                          "id": 214,
+                                          "name": "currentMin",
+                                          "nodeType": "Identifier",
+                                          "overloadedDeclarations": [],
+                                          "referencedDeclaration": 193,
+                                          "src": "3923:10:0",
+                                          "typeDescriptions": {
+                                            "typeIdentifier": "t_uint32",
+                                            "typeString": "uint32"
+                                          }
+                                        },
+                                        "nodeType": "BinaryOperation",
+                                        "operator": "-",
+                                        "rightExpression": {
+                                          "argumentTypes": null,
+                                          "id": 215,
+                                          "name": "resetBaseMin",
+                                          "nodeType": "Identifier",
+                                          "overloadedDeclarations": [],
+                                          "referencedDeclaration": 143,
+                                          "src": "3936:12:0",
+                                          "typeDescriptions": {
+                                            "typeIdentifier": "t_uint32",
+                                            "typeString": "uint32"
+                                          }
+                                        },
+                                        "src": "3923:25:0",
+                                        "typeDescriptions": {
+                                          "typeIdentifier": "t_uint32",
+                                          "typeString": "uint32"
+                                        }
+                                      }
+                                    ],
+                                    "id": 217,
+                                    "isConstant": false,
+                                    "isInlineArray": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "nodeType": "TupleExpression",
+                                    "src": "3922:27:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_uint32",
+                                      "typeString": "uint32"
+                                    }
+                                  },
+                                  "nodeType": "BinaryOperation",
+                                  "operator": "%",
+                                  "rightExpression": {
+                                    "argumentTypes": null,
+                                    "id": 218,
+                                    "name": "resetTimeMin",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 141,
+                                    "src": "3952:12:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_uint16",
+                                      "typeString": "uint16"
+                                    }
+                                  },
+                                  "src": "3922:42:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint32",
+                                    "typeString": "uint32"
+                                  }
+                                }
+                              ],
+                              "id": 220,
+                              "isConstant": false,
+                              "isInlineArray": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "nodeType": "TupleExpression",
+                              "src": "3921:44:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              }
+                            },
+                            "src": "3908:57:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          },
+                          "src": "3883:82:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint32",
+                            "typeString": "uint32"
+                          }
+                        },
+                        "id": 223,
+                        "nodeType": "ExpressionStatement",
+                        "src": "3883:82:0"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 242,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 238,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 162,
+                        "src": "4084:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 240,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "resetTimeMin",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 76,
+                      "src": "4084:22:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 241,
+                      "name": "resetTimeMin",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 141,
+                      "src": "4109:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      }
+                    },
+                    "src": "4084:37:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "id": 243,
+                  "nodeType": "ExpressionStatement",
+                  "src": "4084:37:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 248,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 244,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 162,
+                        "src": "4131:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 246,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "amount",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 72,
+                      "src": "4131:16:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 247,
+                      "name": "allowanceAmount",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 139,
+                      "src": "4150:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "src": "4131:34:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "id": 249,
+                  "nodeType": "ExpressionStatement",
+                  "src": "4131:34:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 251,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "4191:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 252,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "4191:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 253,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 135,
+                        "src": "4203:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 254,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 137,
+                        "src": "4213:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 255,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 162,
+                        "src": "4220:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      ],
+                      "id": 250,
+                      "name": "updateAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 358,
+                      "src": "4175:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_struct$_Allowance_$81_memory_ptr_$returns$__$",
+                        "typeString": "function (address,address,address,struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 256,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "4175:55:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 257,
+                  "nodeType": "ExpressionStatement",
+                  "src": "4175:55:0"
+                },
+                {
+                  "eventCall": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 259,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "4258:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 260,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "4258:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 261,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 135,
+                        "src": "4270:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 262,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 137,
+                        "src": "4280:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 263,
+                        "name": "allowanceAmount",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 139,
+                        "src": "4287:15:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 264,
+                        "name": "resetTimeMin",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 141,
+                        "src": "4304:12:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        },
+                        {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      ],
+                      "id": 258,
+                      "name": "SetAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 119,
+                      "src": "4245:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint96_$_t_uint16_$returns$__$",
+                        "typeString": "function (address,address,address,uint96,uint16)"
+                      }
+                    },
+                    "id": 265,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "4245:72:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 266,
+                  "nodeType": "EmitStatement",
+                  "src": "4240:77:0"
+                }
+              ]
+            },
+            "documentation": "@dev Allows to update the allowance for a specified token. This can only be done via a Safe transaction.\n @param delegate Delegate whose allowance should be updated.\n @param token Token contract address.\n @param allowanceAmount allowance in smallest token unit.\n @param resetTimeMin Time after which the allowance should reset\n @param resetBaseMin Time based on which the reset time should be increased",
+            "id": 268,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "setAllowance",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 144,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 135,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 268,
+                  "src": "3035:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 134,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "3035:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 137,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 268,
+                  "src": "3053:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 136,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "3053:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 139,
+                  "name": "allowanceAmount",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 268,
+                  "src": "3068:22:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 138,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "3068:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 141,
+                  "name": "resetTimeMin",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 268,
+                  "src": "3092:19:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  },
+                  "typeName": {
+                    "id": 140,
+                    "name": "uint16",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "3092:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 143,
+                  "name": "resetBaseMin",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 268,
+                  "src": "3113:19:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint32",
+                    "typeString": "uint32"
+                  },
+                  "typeName": {
+                    "id": 142,
+                    "name": "uint32",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "3113:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint32",
+                      "typeString": "uint32"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "3034:99:0"
+            },
+            "returnParameters": {
+              "id": 145,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "3153:0:0"
+            },
+            "scope": 1224,
+            "src": "3013:1311:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 335,
+              "nodeType": "Block",
+              "src": "4449:462:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 287,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "id": 279,
+                      "name": "allowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 277,
+                      "src": "4459:9:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                        "typeString": "struct AllowanceModule.Allowance memory"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 280,
+                            "name": "allowances",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 44,
+                            "src": "4471:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$_$",
+                              "typeString": "mapping(address => mapping(address => mapping(address => struct AllowanceModule.Allowance storage ref)))"
+                            }
+                          },
+                          "id": 282,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "id": 281,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 270,
+                            "src": "4482:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "4471:16:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$",
+                            "typeString": "mapping(address => mapping(address => struct AllowanceModule.Allowance storage ref))"
+                          }
+                        },
+                        "id": 284,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "id": 283,
+                          "name": "delegate",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 272,
+                          "src": "4488:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "4471:26:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$",
+                          "typeString": "mapping(address => struct AllowanceModule.Allowance storage ref)"
+                        }
+                      },
+                      "id": 286,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "id": 285,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 274,
+                        "src": "4498:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "IndexAccess",
+                      "src": "4471:33:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_storage",
+                        "typeString": "struct AllowanceModule.Allowance storage ref"
+                      }
+                    },
+                    "src": "4459:45:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                      "typeString": "struct AllowanceModule.Allowance memory"
+                    }
+                  },
+                  "id": 288,
+                  "nodeType": "ExpressionStatement",
+                  "src": "4459:45:0"
+                },
+                {
+                  "assignments": [
+                    290
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 290,
+                      "name": "currentMin",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 335,
+                      "src": "4576:17:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint32",
+                        "typeString": "uint32"
+                      },
+                      "typeName": {
+                        "id": 289,
+                        "name": "uint32",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "4576:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint32",
+                          "typeString": "uint32"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 296,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        },
+                        "id": 294,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "id": 292,
+                          "name": "now",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4979,
+                          "src": "4603:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "/",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "3630",
+                          "id": 293,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "4609:2:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_60_by_1",
+                            "typeString": "int_const 60"
+                          },
+                          "value": "60"
+                        },
+                        "src": "4603:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      ],
+                      "id": 291,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "lValueRequested": false,
+                      "nodeType": "ElementaryTypeNameExpression",
+                      "src": "4596:6:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_type$_t_uint32_$",
+                        "typeString": "type(uint32)"
+                      },
+                      "typeName": "uint32"
+                    },
+                    "id": 295,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "typeConversion",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "4596:16:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint32",
+                      "typeString": "uint32"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "4576:36:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    },
+                    "id": 308,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      },
+                      "id": 300,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 297,
+                          "name": "allowance",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 277,
+                          "src": "4626:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "id": 298,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "resetTimeMin",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 76,
+                        "src": "4626:22:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": ">",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "hexValue": "30",
+                        "id": 299,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "number",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "4651:1:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_rational_0_by_1",
+                          "typeString": "int_const 0"
+                        },
+                        "value": "0"
+                      },
+                      "src": "4626:26:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "&&",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_uint32",
+                        "typeString": "uint32"
+                      },
+                      "id": 307,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 301,
+                          "name": "allowance",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 277,
+                          "src": "4656:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "id": 302,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "lastResetMin",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 78,
+                        "src": "4656:22:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint32",
+                          "typeString": "uint32"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": "<=",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint32",
+                          "typeString": "uint32"
+                        },
+                        "id": 306,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "id": 303,
+                          "name": "currentMin",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 290,
+                          "src": "4682:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint32",
+                            "typeString": "uint32"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "-",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 304,
+                            "name": "allowance",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 277,
+                            "src": "4695:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                              "typeString": "struct AllowanceModule.Allowance memory"
+                            }
+                          },
+                          "id": 305,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "resetTimeMin",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 76,
+                          "src": "4695:22:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint16",
+                            "typeString": "uint16"
+                          }
+                        },
+                        "src": "4682:35:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint32",
+                          "typeString": "uint32"
+                        }
+                      },
+                      "src": "4656:61:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "src": "4626:91:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 332,
+                  "nodeType": "IfStatement",
+                  "src": "4622:257:0",
+                  "trueBody": {
+                    "id": 331,
+                    "nodeType": "Block",
+                    "src": "4719:160:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 313,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 309,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 277,
+                              "src": "4733:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 311,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "spent",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 74,
+                            "src": "4733:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 312,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "4751:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          },
+                          "src": "4733:19:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          }
+                        },
+                        "id": 314,
+                        "nodeType": "ExpressionStatement",
+                        "src": "4733:19:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 329,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 315,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 277,
+                              "src": "4766:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 317,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "lastResetMin",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 78,
+                            "src": "4766:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "commonType": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            },
+                            "id": 328,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "leftExpression": {
+                              "argumentTypes": null,
+                              "id": 318,
+                              "name": "currentMin",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 290,
+                              "src": "4791:10:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              }
+                            },
+                            "nodeType": "BinaryOperation",
+                            "operator": "-",
+                            "rightExpression": {
+                              "argumentTypes": null,
+                              "components": [
+                                {
+                                  "argumentTypes": null,
+                                  "commonType": {
+                                    "typeIdentifier": "t_uint32",
+                                    "typeString": "uint32"
+                                  },
+                                  "id": 326,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "leftExpression": {
+                                    "argumentTypes": null,
+                                    "components": [
+                                      {
+                                        "argumentTypes": null,
+                                        "commonType": {
+                                          "typeIdentifier": "t_uint32",
+                                          "typeString": "uint32"
+                                        },
+                                        "id": 322,
+                                        "isConstant": false,
+                                        "isLValue": false,
+                                        "isPure": false,
+                                        "lValueRequested": false,
+                                        "leftExpression": {
+                                          "argumentTypes": null,
+                                          "id": 319,
+                                          "name": "currentMin",
+                                          "nodeType": "Identifier",
+                                          "overloadedDeclarations": [],
+                                          "referencedDeclaration": 290,
+                                          "src": "4806:10:0",
+                                          "typeDescriptions": {
+                                            "typeIdentifier": "t_uint32",
+                                            "typeString": "uint32"
+                                          }
+                                        },
+                                        "nodeType": "BinaryOperation",
+                                        "operator": "-",
+                                        "rightExpression": {
+                                          "argumentTypes": null,
+                                          "expression": {
+                                            "argumentTypes": null,
+                                            "id": 320,
+                                            "name": "allowance",
+                                            "nodeType": "Identifier",
+                                            "overloadedDeclarations": [],
+                                            "referencedDeclaration": 277,
+                                            "src": "4819:9:0",
+                                            "typeDescriptions": {
+                                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                              "typeString": "struct AllowanceModule.Allowance memory"
+                                            }
+                                          },
+                                          "id": 321,
+                                          "isConstant": false,
+                                          "isLValue": true,
+                                          "isPure": false,
+                                          "lValueRequested": false,
+                                          "memberName": "lastResetMin",
+                                          "nodeType": "MemberAccess",
+                                          "referencedDeclaration": 78,
+                                          "src": "4819:22:0",
+                                          "typeDescriptions": {
+                                            "typeIdentifier": "t_uint32",
+                                            "typeString": "uint32"
+                                          }
+                                        },
+                                        "src": "4806:35:0",
+                                        "typeDescriptions": {
+                                          "typeIdentifier": "t_uint32",
+                                          "typeString": "uint32"
+                                        }
+                                      }
+                                    ],
+                                    "id": 323,
+                                    "isConstant": false,
+                                    "isInlineArray": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "nodeType": "TupleExpression",
+                                    "src": "4805:37:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_uint32",
+                                      "typeString": "uint32"
+                                    }
+                                  },
+                                  "nodeType": "BinaryOperation",
+                                  "operator": "%",
+                                  "rightExpression": {
+                                    "argumentTypes": null,
+                                    "expression": {
+                                      "argumentTypes": null,
+                                      "id": 324,
+                                      "name": "allowance",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 277,
+                                      "src": "4845:9:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                        "typeString": "struct AllowanceModule.Allowance memory"
+                                      }
+                                    },
+                                    "id": 325,
+                                    "isConstant": false,
+                                    "isLValue": true,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "memberName": "resetTimeMin",
+                                    "nodeType": "MemberAccess",
+                                    "referencedDeclaration": 76,
+                                    "src": "4845:22:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_uint16",
+                                      "typeString": "uint16"
+                                    }
+                                  },
+                                  "src": "4805:62:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint32",
+                                    "typeString": "uint32"
+                                  }
+                                }
+                              ],
+                              "id": 327,
+                              "isConstant": false,
+                              "isInlineArray": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "nodeType": "TupleExpression",
+                              "src": "4804:64:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              }
+                            },
+                            "src": "4791:77:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          },
+                          "src": "4766:102:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint32",
+                            "typeString": "uint32"
+                          }
+                        },
+                        "id": 330,
+                        "nodeType": "ExpressionStatement",
+                        "src": "4766:102:0"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 333,
+                    "name": "allowance",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": 277,
+                    "src": "4895:9:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                      "typeString": "struct AllowanceModule.Allowance memory"
+                    }
+                  },
+                  "functionReturnParameters": 278,
+                  "id": 334,
+                  "nodeType": "Return",
+                  "src": "4888:16:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 336,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "getAllowance",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 275,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 270,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 336,
+                  "src": "4352:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 269,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "4352:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 272,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 336,
+                  "src": "4366:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 271,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "4366:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 274,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 336,
+                  "src": "4384:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 273,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "4384:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "4351:47:0"
+            },
+            "returnParameters": {
+              "id": 278,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 277,
+                  "name": "allowance",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 336,
+                  "src": "4421:26:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                    "typeString": "struct AllowanceModule.Allowance"
+                  },
+                  "typeName": {
+                    "contractScope": null,
+                    "id": 276,
+                    "name": "Allowance",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 81,
+                    "src": "4421:9:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                      "typeString": "struct AllowanceModule.Allowance"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "4420:28:0"
+            },
+            "scope": 1224,
+            "src": "4330:581:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "private"
+          },
+          {
+            "body": {
+              "id": 357,
+              "nodeType": "Block",
+              "src": "5025:62:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 355,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 347,
+                            "name": "allowances",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 44,
+                            "src": "5035:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$_$",
+                              "typeString": "mapping(address => mapping(address => mapping(address => struct AllowanceModule.Allowance storage ref)))"
+                            }
+                          },
+                          "id": 351,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "id": 348,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 338,
+                            "src": "5046:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "5035:16:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$",
+                            "typeString": "mapping(address => mapping(address => struct AllowanceModule.Allowance storage ref))"
+                          }
+                        },
+                        "id": 352,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "id": 349,
+                          "name": "delegate",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 340,
+                          "src": "5052:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "5035:26:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$",
+                          "typeString": "mapping(address => struct AllowanceModule.Allowance storage ref)"
+                        }
+                      },
+                      "id": 353,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "id": 350,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 342,
+                        "src": "5062:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "nodeType": "IndexAccess",
+                      "src": "5035:33:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_storage",
+                        "typeString": "struct AllowanceModule.Allowance storage ref"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 354,
+                      "name": "allowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 344,
+                      "src": "5071:9:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                        "typeString": "struct AllowanceModule.Allowance memory"
+                      }
+                    },
+                    "src": "5035:45:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_storage",
+                      "typeString": "struct AllowanceModule.Allowance storage ref"
+                    }
+                  },
+                  "id": 356,
+                  "nodeType": "ExpressionStatement",
+                  "src": "5035:45:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 358,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "updateAllowance",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 345,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 338,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 358,
+                  "src": "4942:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 337,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "4942:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 340,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 358,
+                  "src": "4956:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 339,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "4956:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 342,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 358,
+                  "src": "4974:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 341,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "4974:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 344,
+                  "name": "allowance",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 358,
+                  "src": "4989:26:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                    "typeString": "struct AllowanceModule.Allowance"
+                  },
+                  "typeName": {
+                    "contractScope": null,
+                    "id": 343,
+                    "name": "Allowance",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 81,
+                    "src": "4989:9:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                      "typeString": "struct AllowanceModule.Allowance"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "4941:75:0"
+            },
+            "returnParameters": {
+              "id": 346,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "5025:0:0"
+            },
+            "scope": 1224,
+            "src": "4917:170:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "private"
+          },
+          {
+            "body": {
+              "id": 388,
+              "nodeType": "Block",
+              "src": "5157:181:0",
+              "statements": [
+                {
+                  "assignments": [
+                    366
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 366,
+                      "name": "allowance",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 388,
+                      "src": "5167:26:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                        "typeString": "struct AllowanceModule.Allowance"
+                      },
+                      "typeName": {
+                        "contractScope": null,
+                        "id": 365,
+                        "name": "Allowance",
+                        "nodeType": "UserDefinedTypeName",
+                        "referencedDeclaration": 81,
+                        "src": "5167:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                          "typeString": "struct AllowanceModule.Allowance"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 373,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 368,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "5209:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 369,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "5209:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 370,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 360,
+                        "src": "5221:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 371,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 362,
+                        "src": "5231:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 367,
+                      "name": "getAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 336,
+                      "src": "5196:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$returns$_t_struct$_Allowance_$81_memory_ptr_$",
+                        "typeString": "function (address,address,address) view returns (struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 372,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "5196:41:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                      "typeString": "struct AllowanceModule.Allowance memory"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "5167:70:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 378,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 374,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 366,
+                        "src": "5247:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 376,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "spent",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 74,
+                      "src": "5247:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 377,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "5265:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "5247:19:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "id": 379,
+                  "nodeType": "ExpressionStatement",
+                  "src": "5247:19:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 381,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "5292:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 382,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "5292:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 383,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 360,
+                        "src": "5304:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 384,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 362,
+                        "src": "5314:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 385,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 366,
+                        "src": "5321:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      ],
+                      "id": 380,
+                      "name": "updateAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 358,
+                      "src": "5276:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_struct$_Allowance_$81_memory_ptr_$returns$__$",
+                        "typeString": "function (address,address,address,struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 386,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "5276:55:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 387,
+                  "nodeType": "ExpressionStatement",
+                  "src": "5276:55:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 389,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "resetAllowance",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 363,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 360,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 389,
+                  "src": "5117:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 359,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5117:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 362,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 389,
+                  "src": "5135:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 361,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5135:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "5116:33:0"
+            },
+            "returnParameters": {
+              "id": 364,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "5157:0:0"
+            },
+            "scope": 1224,
+            "src": "5093:245:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 577,
+              "nodeType": "Block",
+              "src": "5602:1988:0",
+              "statements": [
+                {
+                  "assignments": [
+                    409
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 409,
+                      "name": "allowance",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 577,
+                      "src": "5641:26:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                        "typeString": "struct AllowanceModule.Allowance"
+                      },
+                      "typeName": {
+                        "contractScope": null,
+                        "id": 408,
+                        "name": "Allowance",
+                        "nodeType": "UserDefinedTypeName",
+                        "referencedDeclaration": 81,
+                        "src": "5641:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                          "typeString": "struct AllowanceModule.Allowance"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 417,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "id": 412,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 391,
+                            "src": "5691:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          ],
+                          "id": 411,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "5683:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_address_$",
+                            "typeString": "type(address)"
+                          },
+                          "typeName": "address"
+                        },
+                        "id": 413,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "5683:13:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 414,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 403,
+                        "src": "5698:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 415,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 393,
+                        "src": "5708:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 410,
+                      "name": "getAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 336,
+                      "src": "5670:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$returns$_t_struct$_Allowance_$81_memory_ptr_$",
+                        "typeString": "function (address,address,address) view returns (struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 416,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "5670:44:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                      "typeString": "struct AllowanceModule.Allowance memory"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "5641:73:0"
+                },
+                {
+                  "assignments": [
+                    419
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 419,
+                      "name": "transferHashData",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 577,
+                      "src": "5724:29:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bytes_memory_ptr",
+                        "typeString": "bytes"
+                      },
+                      "typeName": {
+                        "id": 418,
+                        "name": "bytes",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "5724:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_storage_ptr",
+                          "typeString": "bytes"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 432,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "id": 422,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 391,
+                            "src": "5789:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          ],
+                          "id": 421,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "5781:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_address_$",
+                            "typeString": "type(address)"
+                          },
+                          "typeName": "address"
+                        },
+                        "id": 423,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "5781:13:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 424,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 393,
+                        "src": "5796:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 425,
+                        "name": "to",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 395,
+                        "src": "5803:2:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 426,
+                        "name": "amount",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 397,
+                        "src": "5807:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 427,
+                        "name": "paymentToken",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 399,
+                        "src": "5815:12:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 428,
+                        "name": "payment",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 401,
+                        "src": "5829:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 429,
+                          "name": "allowance",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 409,
+                          "src": "5838:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "id": 430,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "nonce",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 80,
+                        "src": "5838:15:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        },
+                        {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      ],
+                      "id": 420,
+                      "name": "generateTransferHashData",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 626,
+                      "src": "5756:24:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_uint96_$_t_address_$_t_uint96_$_t_uint16_$returns$_t_bytes_memory_ptr_$",
+                        "typeString": "function (address,address,address,uint96,address,uint96,uint16) view returns (bytes memory)"
+                      }
+                    },
+                    "id": 431,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "5756:98:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_memory_ptr",
+                      "typeString": "bytes memory"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "5724:130:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 440,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 433,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 409,
+                        "src": "5897:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 435,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "nonce",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 80,
+                      "src": "5897:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      },
+                      "id": 439,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 436,
+                          "name": "allowance",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 409,
+                          "src": "5915:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "id": 437,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "nonce",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 80,
+                        "src": "5915:15:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": "+",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "hexValue": "31",
+                        "id": 438,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "number",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "5933:1:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_rational_1_by_1",
+                          "typeString": "int_const 1"
+                        },
+                        "value": "1"
+                      },
+                      "src": "5915:19:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      }
+                    },
+                    "src": "5897:37:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "id": 441,
+                  "nodeType": "ExpressionStatement",
+                  "src": "5897:37:0"
+                },
+                {
+                  "assignments": [
+                    443
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 443,
+                      "name": "newSpent",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 577,
+                      "src": "5944:15:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      },
+                      "typeName": {
+                        "id": 442,
+                        "name": "uint96",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "5944:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 448,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    },
+                    "id": 447,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 444,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 409,
+                        "src": "5962:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 445,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "spent",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 74,
+                      "src": "5962:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "+",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "id": 446,
+                      "name": "amount",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 397,
+                      "src": "5980:6:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "src": "5962:24:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "5944:42:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 458,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          },
+                          "id": 453,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "id": 450,
+                            "name": "newSpent",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 443,
+                            "src": "6051:8:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": ">",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 451,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 409,
+                              "src": "6062:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 452,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "spent",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 74,
+                            "src": "6062:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "src": "6051:26:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "&&",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          },
+                          "id": 457,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "id": 454,
+                            "name": "newSpent",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 443,
+                            "src": "6081:8:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "<=",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 455,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 409,
+                              "src": "6093:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 456,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "amount",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 72,
+                            "src": "6093:16:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "src": "6081:28:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "src": "6051:58:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "hexValue": "6e65775370656e74203e20616c6c6f77616e63652e7370656e74202626206e65775370656e74203c3d20616c6c6f77616e63652e616d6f756e74",
+                        "id": 459,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "string",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "6111:60:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_stringliteral_a7359a8519961096cf8fb65715f77dbc4de2755aabf21e3445e245a34ee622da",
+                          "typeString": "literal_string \"newSpent > allowance.spent && newSpent <= allowance.amount\""
+                        },
+                        "value": "newSpent > allowance.spent && newSpent <= allowance.amount"
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        {
+                          "typeIdentifier": "t_stringliteral_a7359a8519961096cf8fb65715f77dbc4de2755aabf21e3445e245a34ee622da",
+                          "typeString": "literal_string \"newSpent > allowance.spent && newSpent <= allowance.amount\""
+                        }
+                      ],
+                      "id": 449,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        4980,
+                        4981
+                      ],
+                      "referencedDeclaration": 4981,
+                      "src": "6043:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                        "typeString": "function (bool,string memory) pure"
+                      }
+                    },
+                    "id": 460,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "6043:129:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 461,
+                  "nodeType": "ExpressionStatement",
+                  "src": "6043:129:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 466,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 462,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 409,
+                        "src": "6182:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 464,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "spent",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 74,
+                      "src": "6182:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 465,
+                      "name": "newSpent",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 443,
+                      "src": "6200:8:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "src": "6182:26:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "id": 467,
+                  "nodeType": "ExpressionStatement",
+                  "src": "6182:26:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    },
+                    "id": 470,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 468,
+                      "name": "payment",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 401,
+                      "src": "6222:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": ">",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 469,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "6232:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "6222:11:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 526,
+                  "nodeType": "IfStatement",
+                  "src": "6218:748:0",
+                  "trueBody": {
+                    "id": 525,
+                    "nodeType": "Block",
+                    "src": "6235:731:0",
+                    "statements": [
+                      {
+                        "assignments": [
+                          472
+                        ],
+                        "declarations": [
+                          {
+                            "constant": false,
+                            "id": 472,
+                            "name": "paymentAllowance",
+                            "nodeType": "VariableDeclaration",
+                            "scope": 525,
+                            "src": "6325:33:0",
+                            "stateVariable": false,
+                            "storageLocation": "memory",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                              "typeString": "struct AllowanceModule.Allowance"
+                            },
+                            "typeName": {
+                              "contractScope": null,
+                              "id": 471,
+                              "name": "Allowance",
+                              "nodeType": "UserDefinedTypeName",
+                              "referencedDeclaration": 81,
+                              "src": "6325:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                                "typeString": "struct AllowanceModule.Allowance"
+                              }
+                            },
+                            "value": null,
+                            "visibility": "internal"
+                          }
+                        ],
+                        "id": 485,
+                        "initialValue": {
+                          "argumentTypes": null,
+                          "condition": {
+                            "argumentTypes": null,
+                            "commonType": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            "id": 475,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "leftExpression": {
+                              "argumentTypes": null,
+                              "id": 473,
+                              "name": "paymentToken",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 399,
+                              "src": "6361:12:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            "nodeType": "BinaryOperation",
+                            "operator": "==",
+                            "rightExpression": {
+                              "argumentTypes": null,
+                              "id": 474,
+                              "name": "token",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 393,
+                              "src": "6377:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            "src": "6361:21:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_bool",
+                              "typeString": "bool"
+                            }
+                          },
+                          "falseExpression": {
+                            "argumentTypes": null,
+                            "arguments": [
+                              {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 479,
+                                    "name": "safe",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 391,
+                                    "src": "6418:4:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                      "typeString": "contract GnosisSafe"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                      "typeString": "contract GnosisSafe"
+                                    }
+                                  ],
+                                  "id": 478,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "lValueRequested": false,
+                                  "nodeType": "ElementaryTypeNameExpression",
+                                  "src": "6410:7:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_type$_t_address_$",
+                                    "typeString": "type(address)"
+                                  },
+                                  "typeName": "address"
+                                },
+                                "id": 480,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "typeConversion",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "6410:13:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              {
+                                "argumentTypes": null,
+                                "id": 481,
+                                "name": "delegate",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 403,
+                                "src": "6425:8:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              {
+                                "argumentTypes": null,
+                                "id": 482,
+                                "name": "paymentToken",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 399,
+                                "src": "6435:12:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": [
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                },
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                },
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              ],
+                              "id": 477,
+                              "name": "getAllowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 336,
+                              "src": "6397:12:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$returns$_t_struct$_Allowance_$81_memory_ptr_$",
+                                "typeString": "function (address,address,address) view returns (struct AllowanceModule.Allowance memory)"
+                              }
+                            },
+                            "id": 483,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "kind": "functionCall",
+                            "lValueRequested": false,
+                            "names": [],
+                            "nodeType": "FunctionCall",
+                            "src": "6397:51:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                              "typeString": "struct AllowanceModule.Allowance memory"
+                            }
+                          },
+                          "id": 484,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "Conditional",
+                          "src": "6361:87:0",
+                          "trueExpression": {
+                            "argumentTypes": null,
+                            "id": 476,
+                            "name": "allowance",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 409,
+                            "src": "6385:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                              "typeString": "struct AllowanceModule.Allowance memory"
+                            }
+                          },
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "nodeType": "VariableDeclarationStatement",
+                        "src": "6325:123:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 491,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "id": 486,
+                            "name": "newSpent",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 443,
+                            "src": "6462:8:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "commonType": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            },
+                            "id": 490,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "leftExpression": {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 487,
+                                "name": "paymentAllowance",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 472,
+                                "src": "6473:16:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                  "typeString": "struct AllowanceModule.Allowance memory"
+                                }
+                              },
+                              "id": 488,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "spent",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 74,
+                              "src": "6473:22:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint96",
+                                "typeString": "uint96"
+                              }
+                            },
+                            "nodeType": "BinaryOperation",
+                            "operator": "+",
+                            "rightExpression": {
+                              "argumentTypes": null,
+                              "id": 489,
+                              "name": "payment",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 401,
+                              "src": "6498:7:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint96",
+                                "typeString": "uint96"
+                              }
+                            },
+                            "src": "6473:32:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "src": "6462:43:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          }
+                        },
+                        "id": 492,
+                        "nodeType": "ExpressionStatement",
+                        "src": "6462:43:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "commonType": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              },
+                              "id": 502,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "leftExpression": {
+                                "argumentTypes": null,
+                                "commonType": {
+                                  "typeIdentifier": "t_uint96",
+                                  "typeString": "uint96"
+                                },
+                                "id": 497,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "leftExpression": {
+                                  "argumentTypes": null,
+                                  "id": 494,
+                                  "name": "newSpent",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 443,
+                                  "src": "6578:8:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint96",
+                                    "typeString": "uint96"
+                                  }
+                                },
+                                "nodeType": "BinaryOperation",
+                                "operator": ">",
+                                "rightExpression": {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "id": 495,
+                                    "name": "paymentAllowance",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 472,
+                                    "src": "6589:16:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                      "typeString": "struct AllowanceModule.Allowance memory"
+                                    }
+                                  },
+                                  "id": 496,
+                                  "isConstant": false,
+                                  "isLValue": true,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "memberName": "spent",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": 74,
+                                  "src": "6589:22:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint96",
+                                    "typeString": "uint96"
+                                  }
+                                },
+                                "src": "6578:33:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_bool",
+                                  "typeString": "bool"
+                                }
+                              },
+                              "nodeType": "BinaryOperation",
+                              "operator": "&&",
+                              "rightExpression": {
+                                "argumentTypes": null,
+                                "commonType": {
+                                  "typeIdentifier": "t_uint96",
+                                  "typeString": "uint96"
+                                },
+                                "id": 501,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "leftExpression": {
+                                  "argumentTypes": null,
+                                  "id": 498,
+                                  "name": "newSpent",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 443,
+                                  "src": "6615:8:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint96",
+                                    "typeString": "uint96"
+                                  }
+                                },
+                                "nodeType": "BinaryOperation",
+                                "operator": "<=",
+                                "rightExpression": {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "id": 499,
+                                    "name": "paymentAllowance",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 472,
+                                    "src": "6627:16:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                      "typeString": "struct AllowanceModule.Allowance memory"
+                                    }
+                                  },
+                                  "id": 500,
+                                  "isConstant": false,
+                                  "isLValue": true,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "memberName": "amount",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": 72,
+                                  "src": "6627:23:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint96",
+                                    "typeString": "uint96"
+                                  }
+                                },
+                                "src": "6615:35:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_bool",
+                                  "typeString": "bool"
+                                }
+                              },
+                              "src": "6578:72:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "6e65775370656e74203e207061796d656e74416c6c6f77616e63652e7370656e74202626206e65775370656e74203c3d207061796d656e74416c6c6f77616e63652e616d6f756e74",
+                              "id": 503,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "string",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "6652:74:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_stringliteral_b549d52c5706645679000944ae1bcaec935d0b8c387f4240a09789be7dc8c0d4",
+                                "typeString": "literal_string \"newSpent > paymentAllowance.spent && newSpent <= paymentAllowance.amount\""
+                              },
+                              "value": "newSpent > paymentAllowance.spent && newSpent <= paymentAllowance.amount"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              },
+                              {
+                                "typeIdentifier": "t_stringliteral_b549d52c5706645679000944ae1bcaec935d0b8c387f4240a09789be7dc8c0d4",
+                                "typeString": "literal_string \"newSpent > paymentAllowance.spent && newSpent <= paymentAllowance.amount\""
+                              }
+                            ],
+                            "id": 493,
+                            "name": "require",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [
+                              4980,
+                              4981
+                            ],
+                            "referencedDeclaration": 4981,
+                            "src": "6570:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                              "typeString": "function (bool,string memory) pure"
+                            }
+                          },
+                          "id": 504,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "6570:157:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 505,
+                        "nodeType": "ExpressionStatement",
+                        "src": "6570:157:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 510,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 506,
+                              "name": "paymentAllowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 472,
+                              "src": "6741:16:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 508,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "spent",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 74,
+                            "src": "6741:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "id": 509,
+                            "name": "newSpent",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 443,
+                            "src": "6766:8:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "src": "6741:33:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          }
+                        },
+                        "id": 511,
+                        "nodeType": "ExpressionStatement",
+                        "src": "6741:33:0"
+                      },
+                      {
+                        "condition": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 514,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "id": 512,
+                            "name": "paymentToken",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 399,
+                            "src": "6860:12:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "!=",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "id": 513,
+                            "name": "token",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 393,
+                            "src": "6876:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "src": "6860:21:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "falseBody": null,
+                        "id": 524,
+                        "nodeType": "IfStatement",
+                        "src": "6856:99:0",
+                        "trueBody": {
+                          "expression": {
+                            "argumentTypes": null,
+                            "arguments": [
+                              {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 517,
+                                    "name": "safe",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 391,
+                                    "src": "6907:4:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                      "typeString": "contract GnosisSafe"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                      "typeString": "contract GnosisSafe"
+                                    }
+                                  ],
+                                  "id": 516,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "lValueRequested": false,
+                                  "nodeType": "ElementaryTypeNameExpression",
+                                  "src": "6899:7:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_type$_t_address_$",
+                                    "typeString": "type(address)"
+                                  },
+                                  "typeName": "address"
+                                },
+                                "id": 518,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "typeConversion",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "6899:13:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              {
+                                "argumentTypes": null,
+                                "id": 519,
+                                "name": "delegate",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 403,
+                                "src": "6914:8:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              {
+                                "argumentTypes": null,
+                                "id": 520,
+                                "name": "paymentToken",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 399,
+                                "src": "6924:12:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              {
+                                "argumentTypes": null,
+                                "id": 521,
+                                "name": "paymentAllowance",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 472,
+                                "src": "6938:16:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                  "typeString": "struct AllowanceModule.Allowance memory"
+                                }
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": [
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                },
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                },
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                },
+                                {
+                                  "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                  "typeString": "struct AllowanceModule.Allowance memory"
+                                }
+                              ],
+                              "id": 515,
+                              "name": "updateAllowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 358,
+                              "src": "6883:15:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_struct$_Allowance_$81_memory_ptr_$returns$__$",
+                                "typeString": "function (address,address,address,struct AllowanceModule.Allowance memory)"
+                              }
+                            },
+                            "id": 522,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "kind": "functionCall",
+                            "lValueRequested": false,
+                            "names": [],
+                            "nodeType": "FunctionCall",
+                            "src": "6883:72:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_tuple$__$",
+                              "typeString": "tuple()"
+                            }
+                          },
+                          "id": 523,
+                          "nodeType": "ExpressionStatement",
+                          "src": "6883:72:0"
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "id": 529,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 391,
+                            "src": "6999:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          ],
+                          "id": 528,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "6991:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_address_$",
+                            "typeString": "type(address)"
+                          },
+                          "typeName": "address"
+                        },
+                        "id": 530,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "6991:13:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 531,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 403,
+                        "src": "7006:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 532,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 393,
+                        "src": "7016:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 533,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 409,
+                        "src": "7023:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      ],
+                      "id": 527,
+                      "name": "updateAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 358,
+                      "src": "6975:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_struct$_Allowance_$81_memory_ptr_$returns$__$",
+                        "typeString": "function (address,address,address,struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 534,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "6975:58:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 535,
+                  "nodeType": "ExpressionStatement",
+                  "src": "6975:58:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "id": 537,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 403,
+                        "src": "7172:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 538,
+                        "name": "signature",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 405,
+                        "src": "7182:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 539,
+                        "name": "transferHashData",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 419,
+                        "src": "7193:16:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 540,
+                        "name": "safe",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 391,
+                        "src": "7211:4:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                          "typeString": "contract GnosisSafe"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        },
+                        {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        },
+                        {
+                          "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                          "typeString": "contract GnosisSafe"
+                        }
+                      ],
+                      "id": 536,
+                      "name": "checkSignature",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 697,
+                      "src": "7157:14:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_bytes_memory_ptr_$_t_bytes_memory_ptr_$_t_contract$_GnosisSafe_$18_$returns$__$",
+                        "typeString": "function (address,bytes memory,bytes memory,contract GnosisSafe)"
+                      }
+                    },
+                    "id": 541,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7157:59:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 542,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7157:59:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    },
+                    "id": 545,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 543,
+                      "name": "payment",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 401,
+                      "src": "7231:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": ">",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 544,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "7241:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "7231:11:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 555,
+                  "nodeType": "IfStatement",
+                  "src": "7227:184:0",
+                  "trueBody": {
+                    "id": 554,
+                    "nodeType": "Block",
+                    "src": "7244:167:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "id": 547,
+                              "name": "safe",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 391,
+                              "src": "7361:4:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                "typeString": "contract GnosisSafe"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 548,
+                              "name": "paymentToken",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 399,
+                              "src": "7367:12:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 549,
+                                "name": "tx",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4989,
+                                "src": "7381:2:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_magic_transaction",
+                                  "typeString": "tx"
+                                }
+                              },
+                              "id": 550,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "origin",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": null,
+                              "src": "7381:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 551,
+                              "name": "payment",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 401,
+                              "src": "7392:7:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint96",
+                                "typeString": "uint96"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                "typeString": "contract GnosisSafe"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              },
+                              {
+                                "typeIdentifier": "t_uint96",
+                                "typeString": "uint96"
+                              }
+                            ],
+                            "id": 546,
+                            "name": "transfer",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 873,
+                            "src": "7352:8:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_internal_nonpayable$_t_contract$_GnosisSafe_$18_$_t_address_$_t_address_payable_$_t_uint96_$returns$__$",
+                              "typeString": "function (contract GnosisSafe,address,address payable,uint96)"
+                            }
+                          },
+                          "id": 552,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7352:48:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 553,
+                        "nodeType": "ExpressionStatement",
+                        "src": "7352:48:0"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "id": 557,
+                        "name": "safe",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 391,
+                        "src": "7455:4:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                          "typeString": "contract GnosisSafe"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 558,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 393,
+                        "src": "7461:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 559,
+                        "name": "to",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 395,
+                        "src": "7468:2:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 560,
+                        "name": "amount",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 397,
+                        "src": "7472:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                          "typeString": "contract GnosisSafe"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      ],
+                      "id": 556,
+                      "name": "transfer",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 873,
+                      "src": "7446:8:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_contract$_GnosisSafe_$18_$_t_address_$_t_address_payable_$_t_uint96_$returns$__$",
+                        "typeString": "function (contract GnosisSafe,address,address payable,uint96)"
+                      }
+                    },
+                    "id": 561,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7446:33:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 562,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7446:33:0"
+                },
+                {
+                  "eventCall": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "id": 565,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 391,
+                            "src": "7527:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          ],
+                          "id": 564,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "7519:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_address_$",
+                            "typeString": "type(address)"
+                          },
+                          "typeName": "address"
+                        },
+                        "id": 566,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "7519:13:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 567,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 403,
+                        "src": "7534:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 568,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 393,
+                        "src": "7544:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 569,
+                        "name": "to",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 395,
+                        "src": "7551:2:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 570,
+                        "name": "amount",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 397,
+                        "src": "7555:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        },
+                        "id": 574,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 571,
+                            "name": "allowance",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 409,
+                            "src": "7563:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                              "typeString": "struct AllowanceModule.Allowance memory"
+                            }
+                          },
+                          "id": 572,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "nonce",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 80,
+                          "src": "7563:15:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint16",
+                            "typeString": "uint16"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "-",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "31",
+                          "id": 573,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "7581:1:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_1_by_1",
+                            "typeString": "int_const 1"
+                          },
+                          "value": "1"
+                        },
+                        "src": "7563:19:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        },
+                        {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      ],
+                      "id": 563,
+                      "name": "ExecuteAllowanceTransfer",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 107,
+                      "src": "7494:24:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_address_$_t_uint96_$_t_uint16_$returns$__$",
+                        "typeString": "function (address,address,address,address,uint96,uint16)"
+                      }
+                    },
+                    "id": 575,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7494:89:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 576,
+                  "nodeType": "EmitStatement",
+                  "src": "7489:94:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 578,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "executeAllowanceTransfer",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 406,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 391,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5387:15:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                    "typeString": "contract GnosisSafe"
+                  },
+                  "typeName": {
+                    "contractScope": null,
+                    "id": 390,
+                    "name": "GnosisSafe",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 18,
+                    "src": "5387:10:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                      "typeString": "contract GnosisSafe"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 393,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5412:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 392,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5412:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 395,
+                  "name": "to",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5435:18:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address_payable",
+                    "typeString": "address payable"
+                  },
+                  "typeName": {
+                    "id": 394,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5435:15:0",
+                    "stateMutability": "payable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address_payable",
+                      "typeString": "address payable"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 397,
+                  "name": "amount",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5463:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 396,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5463:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 399,
+                  "name": "paymentToken",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5486:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 398,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5486:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 401,
+                  "name": "payment",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5516:14:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 400,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5516:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 403,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5540:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 402,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5540:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 405,
+                  "name": "signature",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5566:22:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_memory_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 404,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5566:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "5377:217:0"
+            },
+            "returnParameters": {
+              "id": 407,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "5602:0:0"
+            },
+            "scope": 1224,
+            "src": "5344:2246:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 625,
+              "nodeType": "Block",
+              "src": "7836:255:0",
+              "statements": [
+                {
+                  "assignments": [
+                    598
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 598,
+                      "name": "transferHash",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 625,
+                      "src": "7846:20:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bytes32",
+                        "typeString": "bytes32"
+                      },
+                      "typeName": {
+                        "id": 597,
+                        "name": "bytes32",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "7846:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 612,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "id": 602,
+                            "name": "ALLOWANCE_TRANSFER_TYPEHASH",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 36,
+                            "src": "7903:27:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_bytes32",
+                              "typeString": "bytes32"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 603,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 580,
+                            "src": "7932:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 604,
+                            "name": "token",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 582,
+                            "src": "7938:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 605,
+                            "name": "to",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 584,
+                            "src": "7945:2:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 606,
+                            "name": "amount",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 586,
+                            "src": "7949:6:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 607,
+                            "name": "paymentToken",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 588,
+                            "src": "7957:12:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 608,
+                            "name": "payment",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 590,
+                            "src": "7971:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 609,
+                            "name": "nonce",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 592,
+                            "src": "7980:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_bytes32",
+                              "typeString": "bytes32"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            },
+                            {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 600,
+                            "name": "abi",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 4964,
+                            "src": "7892:3:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_magic_abi",
+                              "typeString": "abi"
+                            }
+                          },
+                          "id": 601,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "memberName": "encode",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": null,
+                          "src": "7892:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_function_abiencode_pure$__$returns$_t_bytes_memory_ptr_$",
+                            "typeString": "function () pure returns (bytes memory)"
+                          }
+                        },
+                        "id": 610,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "functionCall",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "7892:94:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      ],
+                      "id": 599,
+                      "name": "keccak256",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 4971,
+                      "src": "7869:9:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                        "typeString": "function (bytes memory) pure returns (bytes32)"
+                      }
+                    },
+                    "id": 611,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7869:127:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes32",
+                      "typeString": "bytes32"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "7846:150:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "hexValue": "30783139",
+                            "id": 616,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "8035:4:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_25_by_1",
+                              "typeString": "int_const 25"
+                            },
+                            "value": "0x19"
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_rational_25_by_1",
+                              "typeString": "int_const 25"
+                            }
+                          ],
+                          "id": 615,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "8030:4:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_bytes1_$",
+                            "typeString": "type(bytes1)"
+                          },
+                          "typeName": "byte"
+                        },
+                        "id": 617,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "8030:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes1",
+                          "typeString": "bytes1"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "hexValue": "30783031",
+                            "id": 619,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "8047:4:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_1_by_1",
+                              "typeString": "int_const 1"
+                            },
+                            "value": "0x01"
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_rational_1_by_1",
+                              "typeString": "int_const 1"
+                            }
+                          ],
+                          "id": 618,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "8042:4:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_bytes1_$",
+                            "typeString": "type(bytes1)"
+                          },
+                          "typeName": "byte"
+                        },
+                        "id": 620,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "8042:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes1",
+                          "typeString": "bytes1"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 621,
+                        "name": "domainSeparator",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 63,
+                        "src": "8054:15:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 622,
+                        "name": "transferHash",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 598,
+                        "src": "8071:12:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bytes1",
+                          "typeString": "bytes1"
+                        },
+                        {
+                          "typeIdentifier": "t_bytes1",
+                          "typeString": "bytes1"
+                        },
+                        {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        },
+                        {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 613,
+                        "name": "abi",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 4964,
+                        "src": "8013:3:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_magic_abi",
+                          "typeString": "abi"
+                        }
+                      },
+                      "id": 614,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "lValueRequested": false,
+                      "memberName": "encodePacked",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "8013:16:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$",
+                        "typeString": "function () pure returns (bytes memory)"
+                      }
+                    },
+                    "id": 623,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "8013:71:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_memory_ptr",
+                      "typeString": "bytes memory"
+                    }
+                  },
+                  "functionReturnParameters": 596,
+                  "id": 624,
+                  "nodeType": "Return",
+                  "src": "8006:78:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 626,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "generateTransferHashData",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 593,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 580,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7639:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 579,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7639:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 582,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7661:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 581,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7661:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 584,
+                  "name": "to",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7684:10:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 583,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7684:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 586,
+                  "name": "amount",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7704:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 585,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7704:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 588,
+                  "name": "paymentToken",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7727:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 587,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7727:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 590,
+                  "name": "payment",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7757:14:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 589,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7757:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 592,
+                  "name": "nonce",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7781:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  },
+                  "typeName": {
+                    "id": 591,
+                    "name": "uint16",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7781:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "7629:170:0"
+            },
+            "returnParameters": {
+              "id": 596,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 595,
+                  "name": "",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7822:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_memory_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 594,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7822:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "7821:14:0"
+            },
+            "scope": 1224,
+            "src": "7596:495:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "private"
+          },
+          {
+            "body": {
+              "id": 657,
+              "nodeType": "Block",
+              "src": "8327:136:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "id": 647,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 628,
+                            "src": "8392:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 648,
+                            "name": "token",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 630,
+                            "src": "8398:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 649,
+                            "name": "to",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 632,
+                            "src": "8405:2:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 650,
+                            "name": "amount",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 634,
+                            "src": "8409:6:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 651,
+                            "name": "paymentToken",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 636,
+                            "src": "8417:12:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 652,
+                            "name": "payment",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 638,
+                            "src": "8431:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 653,
+                            "name": "nonce",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 640,
+                            "src": "8440:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            },
+                            {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          ],
+                          "id": 646,
+                          "name": "generateTransferHashData",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 626,
+                          "src": "8354:24:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_uint96_$_t_address_$_t_uint96_$_t_uint16_$returns$_t_bytes_memory_ptr_$",
+                            "typeString": "function (address,address,address,uint96,address,uint96,uint16) view returns (bytes memory)"
+                          }
+                        },
+                        "id": 654,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "functionCall",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "8354:101:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      ],
+                      "id": 645,
+                      "name": "keccak256",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 4971,
+                      "src": "8344:9:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                        "typeString": "function (bytes memory) pure returns (bytes32)"
+                      }
+                    },
+                    "id": 655,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "8344:112:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes32",
+                      "typeString": "bytes32"
+                    }
+                  },
+                  "functionReturnParameters": 644,
+                  "id": 656,
+                  "nodeType": "Return",
+                  "src": "8337:119:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 658,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "generateTransferHash",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 641,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 628,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8136:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 627,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8136:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 630,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8158:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 629,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8158:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 632,
+                  "name": "to",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8181:10:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 631,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8181:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 634,
+                  "name": "amount",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8201:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 633,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8201:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 636,
+                  "name": "paymentToken",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8224:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 635,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8224:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 638,
+                  "name": "payment",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8254:14:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 637,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8254:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 640,
+                  "name": "nonce",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8278:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  },
+                  "typeName": {
+                    "id": 639,
+                    "name": "uint16",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8278:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "8126:170:0"
+            },
+            "returnParameters": {
+              "id": 644,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 643,
+                  "name": "",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8318:7:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes32",
+                    "typeString": "bytes32"
+                  },
+                  "typeName": {
+                    "id": 642,
+                    "name": "bytes32",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8318:7:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes32",
+                      "typeString": "bytes32"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "8317:9:0"
+            },
+            "scope": 1224,
+            "src": "8097:366:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 696,
+              "nodeType": "Block",
+              "src": "8599:314:0",
+              "statements": [
+                {
+                  "assignments": [
+                    670
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 670,
+                      "name": "signer",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 696,
+                      "src": "8609:14:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      },
+                      "typeName": {
+                        "id": 669,
+                        "name": "address",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "8609:7:0",
+                        "stateMutability": "nonpayable",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 675,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "id": 672,
+                        "name": "signature",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 662,
+                        "src": "8643:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 673,
+                        "name": "transferHashData",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 664,
+                        "src": "8654:16:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        },
+                        {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      ],
+                      "id": 671,
+                      "name": "recoverSignature",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 818,
+                      "src": "8626:16:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_bytes_memory_ptr_$_t_bytes_memory_ptr_$returns$_t_address_$",
+                        "typeString": "function (bytes memory,bytes memory) view returns (address)"
+                      }
+                    },
+                    "id": 674,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "8626:45:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "8609:62:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 692,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 679,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "id": 677,
+                            "name": "expectedDelegate",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 660,
+                            "src": "8702:16:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "==",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "id": 678,
+                            "name": "signer",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 670,
+                            "src": "8722:6:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "src": "8702:26:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "&&",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 691,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "baseExpression": {
+                                "argumentTypes": null,
+                                "baseExpression": {
+                                  "argumentTypes": null,
+                                  "id": 680,
+                                  "name": "delegates",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 57,
+                                  "src": "8732:9:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                                    "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                                  }
+                                },
+                                "id": 684,
+                                "indexExpression": {
+                                  "argumentTypes": null,
+                                  "arguments": [
+                                    {
+                                      "argumentTypes": null,
+                                      "id": 682,
+                                      "name": "safe",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 666,
+                                      "src": "8750:4:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                        "typeString": "contract GnosisSafe"
+                                      }
+                                    }
+                                  ],
+                                  "expression": {
+                                    "argumentTypes": [
+                                      {
+                                        "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                        "typeString": "contract GnosisSafe"
+                                      }
+                                    ],
+                                    "id": 681,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": true,
+                                    "lValueRequested": false,
+                                    "nodeType": "ElementaryTypeNameExpression",
+                                    "src": "8742:7:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_type$_t_address_$",
+                                      "typeString": "type(address)"
+                                    },
+                                    "typeName": "address"
+                                  },
+                                  "id": 683,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": false,
+                                  "kind": "typeConversion",
+                                  "lValueRequested": false,
+                                  "names": [],
+                                  "nodeType": "FunctionCall",
+                                  "src": "8742:13:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                },
+                                "isConstant": false,
+                                "isLValue": true,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "nodeType": "IndexAccess",
+                                "src": "8732:24:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                                  "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                                }
+                              },
+                              "id": 688,
+                              "indexExpression": {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 686,
+                                    "name": "signer",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 670,
+                                    "src": "8764:6:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_address",
+                                      "typeString": "address"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_address",
+                                      "typeString": "address"
+                                    }
+                                  ],
+                                  "id": 685,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "lValueRequested": false,
+                                  "nodeType": "ElementaryTypeNameExpression",
+                                  "src": "8757:6:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_type$_t_uint48_$",
+                                    "typeString": "type(uint48)"
+                                  },
+                                  "typeName": "uint48"
+                                },
+                                "id": 687,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "typeConversion",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "8757:14:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_uint48",
+                                  "typeString": "uint48"
+                                }
+                              },
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "nodeType": "IndexAccess",
+                              "src": "8732:40:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                                "typeString": "struct AllowanceModule.Delegate storage ref"
+                              }
+                            },
+                            "id": 689,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "delegate",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 65,
+                            "src": "8732:49:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "==",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "id": 690,
+                            "name": "signer",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 670,
+                            "src": "8785:6:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "src": "8732:59:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "src": "8702:89:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "hexValue": "657870656374656444656c6567617465203d3d207369676e65722026262064656c6567617465735b616464726573732873616665295d5b75696e743438287369676e6572295d2e64656c6567617465203d3d207369676e6572",
+                        "id": 693,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "string",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "8805:91:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_stringliteral_967a409fd152609403ac7b3349d7ced54d05d2ee8664844edf017668d343240b",
+                          "typeString": "literal_string \"expectedDelegate == signer && delegates[address(safe)][uint48(signer)].delegate == signer\""
+                        },
+                        "value": "expectedDelegate == signer && delegates[address(safe)][uint48(signer)].delegate == signer"
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        {
+                          "typeIdentifier": "t_stringliteral_967a409fd152609403ac7b3349d7ced54d05d2ee8664844edf017668d343240b",
+                          "typeString": "literal_string \"expectedDelegate == signer && delegates[address(safe)][uint48(signer)].delegate == signer\""
+                        }
+                      ],
+                      "id": 676,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        4980,
+                        4981
+                      ],
+                      "referencedDeclaration": 4981,
+                      "src": "8681:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                        "typeString": "function (bool,string memory) pure"
+                      }
+                    },
+                    "id": 694,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "8681:225:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 695,
+                  "nodeType": "ExpressionStatement",
+                  "src": "8681:225:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 697,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "checkSignature",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 667,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 660,
+                  "name": "expectedDelegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 697,
+                  "src": "8493:24:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 659,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8493:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 662,
+                  "name": "signature",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 697,
+                  "src": "8519:22:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_memory_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 661,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8519:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 664,
+                  "name": "transferHashData",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 697,
+                  "src": "8543:29:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_memory_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 663,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8543:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 666,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 697,
+                  "src": "8574:15:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                    "typeString": "contract GnosisSafe"
+                  },
+                  "typeName": {
+                    "contractScope": null,
+                    "id": 665,
+                    "name": "GnosisSafe",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 18,
+                    "src": "8574:10:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                      "typeString": "contract GnosisSafe"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "8492:98:0"
+            },
+            "returnParameters": {
+              "id": 668,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "8599:0:0"
+            },
+            "scope": 1224,
+            "src": "8469:444:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "private"
+          },
+          {
+            "body": {
+              "id": 817,
+              "nodeType": "Block",
+              "src": "9037:1801:0",
+              "statements": [
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    },
+                    "id": 709,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 706,
+                        "name": "signature",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 699,
+                        "src": "9118:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      },
+                      "id": 707,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "length",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "9118:16:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "==",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 708,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "9138:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "9118:21:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 713,
+                  "nodeType": "IfStatement",
+                  "src": "9114:44:0",
+                  "trueBody": {
+                    "expression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 710,
+                        "name": "msg",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 4977,
+                        "src": "9148:3:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_magic_message",
+                          "typeString": "msg"
+                        }
+                      },
+                      "id": 711,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "sender",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "9148:10:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address_payable",
+                        "typeString": "address payable"
+                      }
+                    },
+                    "functionReturnParameters": 705,
+                    "id": 712,
+                    "nodeType": "Return",
+                    "src": "9141:17:0"
+                  }
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        },
+                        "id": 718,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 715,
+                            "name": "signature",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 699,
+                            "src": "9243:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_bytes_memory_ptr",
+                              "typeString": "bytes memory"
+                            }
+                          },
+                          "id": 716,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "length",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": null,
+                          "src": "9243:16:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": ">=",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "3635",
+                          "id": 717,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "9263:2:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_65_by_1",
+                            "typeString": "int_const 65"
+                          },
+                          "value": "65"
+                        },
+                        "src": "9243:22:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "hexValue": "7369676e6174757265732e6c656e677468203e3d203635",
+                        "id": 719,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "string",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "9267:25:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_stringliteral_72679ed14e52badd3e78d9f29492b52cfb58b223fd9e00d5dca80ba1c385a7f7",
+                          "typeString": "literal_string \"signatures.length >= 65\""
+                        },
+                        "value": "signatures.length >= 65"
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        {
+                          "typeIdentifier": "t_stringliteral_72679ed14e52badd3e78d9f29492b52cfb58b223fd9e00d5dca80ba1c385a7f7",
+                          "typeString": "literal_string \"signatures.length >= 65\""
+                        }
+                      ],
+                      "id": 714,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        4980,
+                        4981
+                      ],
+                      "referencedDeclaration": 4981,
+                      "src": "9235:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                        "typeString": "function (bool,string memory) pure"
+                      }
+                    },
+                    "id": 720,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "9235:58:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 721,
+                  "nodeType": "ExpressionStatement",
+                  "src": "9235:58:0"
+                },
+                {
+                  "assignments": [
+                    723
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 723,
+                      "name": "v",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 817,
+                      "src": "9303:7:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint8",
+                        "typeString": "uint8"
+                      },
+                      "typeName": {
+                        "id": 722,
+                        "name": "uint8",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "9303:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint8",
+                          "typeString": "uint8"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 724,
+                  "initialValue": null,
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "9303:7:0"
+                },
+                {
+                  "assignments": [
+                    726
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 726,
+                      "name": "r",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 817,
+                      "src": "9320:9:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bytes32",
+                        "typeString": "bytes32"
+                      },
+                      "typeName": {
+                        "id": 725,
+                        "name": "bytes32",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "9320:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 727,
+                  "initialValue": null,
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "9320:9:0"
+                },
+                {
+                  "assignments": [
+                    729
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 729,
+                      "name": "s",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 817,
+                      "src": "9339:9:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bytes32",
+                        "typeString": "bytes32"
+                      },
+                      "typeName": {
+                        "id": 728,
+                        "name": "bytes32",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "9339:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 730,
+                  "initialValue": null,
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "9339:9:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 739,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "components": [
+                        {
+                          "argumentTypes": null,
+                          "id": 731,
+                          "name": "v",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 723,
+                          "src": "9359:1:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint8",
+                            "typeString": "uint8"
+                          }
+                        },
+                        {
+                          "argumentTypes": null,
+                          "id": 732,
+                          "name": "r",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 726,
+                          "src": "9362:1:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bytes32",
+                            "typeString": "bytes32"
+                          }
+                        },
+                        {
+                          "argumentTypes": null,
+                          "id": 733,
+                          "name": "s",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 729,
+                          "src": "9365:1:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bytes32",
+                            "typeString": "bytes32"
+                          }
+                        }
+                      ],
+                      "id": 734,
+                      "isConstant": false,
+                      "isInlineArray": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "nodeType": "TupleExpression",
+                      "src": "9358:9:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_tuple$_t_uint8_$_t_bytes32_$_t_bytes32_$",
+                        "typeString": "tuple(uint8,bytes32,bytes32)"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "id": 736,
+                          "name": "signature",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 699,
+                          "src": "9385:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bytes_memory_ptr",
+                            "typeString": "bytes memory"
+                          }
+                        },
+                        {
+                          "argumentTypes": null,
+                          "hexValue": "30",
+                          "id": 737,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "9396:1:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          "value": "0"
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_bytes_memory_ptr",
+                            "typeString": "bytes memory"
+                          },
+                          {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          }
+                        ],
+                        "id": 735,
+                        "name": "signatureSplit",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 3369,
+                        "src": "9370:14:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$_t_uint256_$returns$_t_uint8_$_t_bytes32_$_t_bytes32_$",
+                          "typeString": "function (bytes memory,uint256) pure returns (uint8,bytes32,bytes32)"
+                        }
+                      },
+                      "id": 738,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "functionCall",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "9370:28:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_tuple$_t_uint8_$_t_bytes32_$_t_bytes32_$",
+                        "typeString": "tuple(uint8,bytes32,bytes32)"
+                      }
+                    },
+                    "src": "9358:40:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 740,
+                  "nodeType": "ExpressionStatement",
+                  "src": "9358:40:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint8",
+                      "typeString": "uint8"
+                    },
+                    "id": 743,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 741,
+                      "name": "v",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 723,
+                      "src": "9465:1:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint8",
+                        "typeString": "uint8"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "==",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 742,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "9470:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "9465:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": {
+                    "condition": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_uint8",
+                        "typeString": "uint8"
+                      },
+                      "id": 772,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "id": 770,
+                        "name": "v",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 723,
+                        "src": "10193:1:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint8",
+                          "typeString": "uint8"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": "==",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "hexValue": "31",
+                        "id": 771,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "number",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "10198:1:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_rational_1_by_1",
+                          "typeString": "int_const 1"
+                        },
+                        "value": "1"
+                      },
+                      "src": "10193:6:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "falseBody": {
+                      "condition": {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint8",
+                          "typeString": "uint8"
+                        },
+                        "id": 781,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "id": 779,
+                          "name": "v",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 723,
+                          "src": "10372:1:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint8",
+                            "typeString": "uint8"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": ">",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "3330",
+                          "id": 780,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "10376:2:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_30_by_1",
+                            "typeString": "int_const 30"
+                          },
+                          "value": "30"
+                        },
+                        "src": "10372:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      },
+                      "falseBody": {
+                        "id": 813,
+                        "nodeType": "Block",
+                        "src": "10683:149:0",
+                        "statements": [
+                          {
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 811,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "leftHandSide": {
+                                "argumentTypes": null,
+                                "id": 802,
+                                "name": "owner",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 704,
+                                "src": "10766:5:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              "nodeType": "Assignment",
+                              "operator": "=",
+                              "rightHandSide": {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "arguments": [
+                                      {
+                                        "argumentTypes": null,
+                                        "id": 805,
+                                        "name": "transferHashData",
+                                        "nodeType": "Identifier",
+                                        "overloadedDeclarations": [],
+                                        "referencedDeclaration": 701,
+                                        "src": "10794:16:0",
+                                        "typeDescriptions": {
+                                          "typeIdentifier": "t_bytes_memory_ptr",
+                                          "typeString": "bytes memory"
+                                        }
+                                      }
+                                    ],
+                                    "expression": {
+                                      "argumentTypes": [
+                                        {
+                                          "typeIdentifier": "t_bytes_memory_ptr",
+                                          "typeString": "bytes memory"
+                                        }
+                                      ],
+                                      "id": 804,
+                                      "name": "keccak256",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 4971,
+                                      "src": "10784:9:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                                        "typeString": "function (bytes memory) pure returns (bytes32)"
+                                      }
+                                    },
+                                    "id": 806,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "kind": "functionCall",
+                                    "lValueRequested": false,
+                                    "names": [],
+                                    "nodeType": "FunctionCall",
+                                    "src": "10784:27:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 807,
+                                    "name": "v",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 723,
+                                    "src": "10813:1:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_uint8",
+                                      "typeString": "uint8"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 808,
+                                    "name": "r",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 726,
+                                    "src": "10816:1:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 809,
+                                    "name": "s",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 729,
+                                    "src": "10819:1:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_uint8",
+                                      "typeString": "uint8"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  ],
+                                  "id": 803,
+                                  "name": "ecrecover",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 4969,
+                                  "src": "10774:9:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_function_ecrecover_pure$_t_bytes32_$_t_uint8_$_t_bytes32_$_t_bytes32_$returns$_t_address_$",
+                                    "typeString": "function (bytes32,uint8,bytes32,bytes32) pure returns (address)"
+                                  }
+                                },
+                                "id": 810,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "functionCall",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "10774:47:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              "src": "10766:55:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            "id": 812,
+                            "nodeType": "ExpressionStatement",
+                            "src": "10766:55:0"
+                          }
+                        ]
+                      },
+                      "id": 814,
+                      "nodeType": "IfStatement",
+                      "src": "10368:464:0",
+                      "trueBody": {
+                        "id": 801,
+                        "nodeType": "Block",
+                        "src": "10380:297:0",
+                        "statements": [
+                          {
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 799,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "leftHandSide": {
+                                "argumentTypes": null,
+                                "id": 782,
+                                "name": "owner",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 704,
+                                "src": "10542:5:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              "nodeType": "Assignment",
+                              "operator": "=",
+                              "rightHandSide": {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "arguments": [
+                                      {
+                                        "argumentTypes": null,
+                                        "arguments": [
+                                          {
+                                            "argumentTypes": null,
+                                            "hexValue": "19457468657265756d205369676e6564204d6573736167653a0a3332",
+                                            "id": 787,
+                                            "isConstant": false,
+                                            "isLValue": false,
+                                            "isPure": true,
+                                            "kind": "string",
+                                            "lValueRequested": false,
+                                            "nodeType": "Literal",
+                                            "src": "10587:34:0",
+                                            "subdenomination": null,
+                                            "typeDescriptions": {
+                                              "typeIdentifier": "t_stringliteral_178a2411ab6fbc1ba11064408972259c558d0e82fd48b0aba3ad81d14f065e73",
+                                              "typeString": "literal_string \"\u0019Ethereum Signed Message:\n32\""
+                                            },
+                                            "value": "\u0019Ethereum Signed Message:\n32"
+                                          },
+                                          {
+                                            "argumentTypes": null,
+                                            "arguments": [
+                                              {
+                                                "argumentTypes": null,
+                                                "id": 789,
+                                                "name": "transferHashData",
+                                                "nodeType": "Identifier",
+                                                "overloadedDeclarations": [],
+                                                "referencedDeclaration": 701,
+                                                "src": "10633:16:0",
+                                                "typeDescriptions": {
+                                                  "typeIdentifier": "t_bytes_memory_ptr",
+                                                  "typeString": "bytes memory"
+                                                }
+                                              }
+                                            ],
+                                            "expression": {
+                                              "argumentTypes": [
+                                                {
+                                                  "typeIdentifier": "t_bytes_memory_ptr",
+                                                  "typeString": "bytes memory"
+                                                }
+                                              ],
+                                              "id": 788,
+                                              "name": "keccak256",
+                                              "nodeType": "Identifier",
+                                              "overloadedDeclarations": [],
+                                              "referencedDeclaration": 4971,
+                                              "src": "10623:9:0",
+                                              "typeDescriptions": {
+                                                "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                                                "typeString": "function (bytes memory) pure returns (bytes32)"
+                                              }
+                                            },
+                                            "id": 790,
+                                            "isConstant": false,
+                                            "isLValue": false,
+                                            "isPure": false,
+                                            "kind": "functionCall",
+                                            "lValueRequested": false,
+                                            "names": [],
+                                            "nodeType": "FunctionCall",
+                                            "src": "10623:27:0",
+                                            "typeDescriptions": {
+                                              "typeIdentifier": "t_bytes32",
+                                              "typeString": "bytes32"
+                                            }
+                                          }
+                                        ],
+                                        "expression": {
+                                          "argumentTypes": [
+                                            {
+                                              "typeIdentifier": "t_stringliteral_178a2411ab6fbc1ba11064408972259c558d0e82fd48b0aba3ad81d14f065e73",
+                                              "typeString": "literal_string \"\u0019Ethereum Signed Message:\n32\""
+                                            },
+                                            {
+                                              "typeIdentifier": "t_bytes32",
+                                              "typeString": "bytes32"
+                                            }
+                                          ],
+                                          "expression": {
+                                            "argumentTypes": null,
+                                            "id": 785,
+                                            "name": "abi",
+                                            "nodeType": "Identifier",
+                                            "overloadedDeclarations": [],
+                                            "referencedDeclaration": 4964,
+                                            "src": "10570:3:0",
+                                            "typeDescriptions": {
+                                              "typeIdentifier": "t_magic_abi",
+                                              "typeString": "abi"
+                                            }
+                                          },
+                                          "id": 786,
+                                          "isConstant": false,
+                                          "isLValue": false,
+                                          "isPure": true,
+                                          "lValueRequested": false,
+                                          "memberName": "encodePacked",
+                                          "nodeType": "MemberAccess",
+                                          "referencedDeclaration": null,
+                                          "src": "10570:16:0",
+                                          "typeDescriptions": {
+                                            "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$",
+                                            "typeString": "function () pure returns (bytes memory)"
+                                          }
+                                        },
+                                        "id": 791,
+                                        "isConstant": false,
+                                        "isLValue": false,
+                                        "isPure": false,
+                                        "kind": "functionCall",
+                                        "lValueRequested": false,
+                                        "names": [],
+                                        "nodeType": "FunctionCall",
+                                        "src": "10570:81:0",
+                                        "typeDescriptions": {
+                                          "typeIdentifier": "t_bytes_memory_ptr",
+                                          "typeString": "bytes memory"
+                                        }
+                                      }
+                                    ],
+                                    "expression": {
+                                      "argumentTypes": [
+                                        {
+                                          "typeIdentifier": "t_bytes_memory_ptr",
+                                          "typeString": "bytes memory"
+                                        }
+                                      ],
+                                      "id": 784,
+                                      "name": "keccak256",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 4971,
+                                      "src": "10560:9:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                                        "typeString": "function (bytes memory) pure returns (bytes32)"
+                                      }
+                                    },
+                                    "id": 792,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "kind": "functionCall",
+                                    "lValueRequested": false,
+                                    "names": [],
+                                    "nodeType": "FunctionCall",
+                                    "src": "10560:92:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "commonType": {
+                                      "typeIdentifier": "t_uint8",
+                                      "typeString": "uint8"
+                                    },
+                                    "id": 795,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "leftExpression": {
+                                      "argumentTypes": null,
+                                      "id": 793,
+                                      "name": "v",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 723,
+                                      "src": "10654:1:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_uint8",
+                                        "typeString": "uint8"
+                                      }
+                                    },
+                                    "nodeType": "BinaryOperation",
+                                    "operator": "-",
+                                    "rightExpression": {
+                                      "argumentTypes": null,
+                                      "hexValue": "34",
+                                      "id": 794,
+                                      "isConstant": false,
+                                      "isLValue": false,
+                                      "isPure": true,
+                                      "kind": "number",
+                                      "lValueRequested": false,
+                                      "nodeType": "Literal",
+                                      "src": "10658:1:0",
+                                      "subdenomination": null,
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_rational_4_by_1",
+                                        "typeString": "int_const 4"
+                                      },
+                                      "value": "4"
+                                    },
+                                    "src": "10654:5:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_uint8",
+                                      "typeString": "uint8"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 796,
+                                    "name": "r",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 726,
+                                    "src": "10661:1:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 797,
+                                    "name": "s",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 729,
+                                    "src": "10664:1:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_uint8",
+                                      "typeString": "uint8"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  ],
+                                  "id": 783,
+                                  "name": "ecrecover",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 4969,
+                                  "src": "10550:9:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_function_ecrecover_pure$_t_bytes32_$_t_uint8_$_t_bytes32_$_t_bytes32_$returns$_t_address_$",
+                                    "typeString": "function (bytes32,uint8,bytes32,bytes32) pure returns (address)"
+                                  }
+                                },
+                                "id": 798,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "functionCall",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "10550:116:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              "src": "10542:124:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            "id": 800,
+                            "nodeType": "ExpressionStatement",
+                            "src": "10542:124:0"
+                          }
+                        ]
+                      }
+                    },
+                    "id": 815,
+                    "nodeType": "IfStatement",
+                    "src": "10189:643:0",
+                    "trueBody": {
+                      "id": 778,
+                      "nodeType": "Block",
+                      "src": "10201:161:0",
+                      "statements": [
+                        {
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 776,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "leftHandSide": {
+                              "argumentTypes": null,
+                              "id": 773,
+                              "name": "owner",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 704,
+                              "src": "10333:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            "nodeType": "Assignment",
+                            "operator": "=",
+                            "rightHandSide": {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 774,
+                                "name": "msg",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4977,
+                                "src": "10341:3:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_magic_message",
+                                  "typeString": "msg"
+                                }
+                              },
+                              "id": 775,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "sender",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": null,
+                              "src": "10341:10:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              }
+                            },
+                            "src": "10333:18:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "id": 777,
+                          "nodeType": "ExpressionStatement",
+                          "src": "10333:18:0"
+                        }
+                      ]
+                    }
+                  },
+                  "id": 816,
+                  "nodeType": "IfStatement",
+                  "src": "9461:1371:0",
+                  "trueBody": {
+                    "id": 769,
+                    "nodeType": "Block",
+                    "src": "9473:710:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 750,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "id": 744,
+                            "name": "owner",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 704,
+                            "src": "9582:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "arguments": [
+                              {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 747,
+                                    "name": "r",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 726,
+                                    "src": "9606:1:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  ],
+                                  "id": 746,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "lValueRequested": false,
+                                  "nodeType": "ElementaryTypeNameExpression",
+                                  "src": "9598:7:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_type$_t_uint256_$",
+                                    "typeString": "type(uint256)"
+                                  },
+                                  "typeName": "uint256"
+                                },
+                                "id": 748,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "typeConversion",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "9598:10:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_uint256",
+                                  "typeString": "uint256"
+                                }
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": [
+                                {
+                                  "typeIdentifier": "t_uint256",
+                                  "typeString": "uint256"
+                                }
+                              ],
+                              "id": 745,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "lValueRequested": false,
+                              "nodeType": "ElementaryTypeNameExpression",
+                              "src": "9590:7:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_type$_t_address_$",
+                                "typeString": "type(address)"
+                              },
+                              "typeName": "address"
+                            },
+                            "id": 749,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "kind": "typeConversion",
+                            "lValueRequested": false,
+                            "names": [],
+                            "nodeType": "FunctionCall",
+                            "src": "9590:19:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address_payable",
+                              "typeString": "address payable"
+                            }
+                          },
+                          "src": "9582:27:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "id": 751,
+                        "nodeType": "ExpressionStatement",
+                        "src": "9582:27:0"
+                      },
+                      {
+                        "assignments": [
+                          753
+                        ],
+                        "declarations": [
+                          {
+                            "constant": false,
+                            "id": 753,
+                            "name": "contractSignature",
+                            "nodeType": "VariableDeclaration",
+                            "scope": 769,
+                            "src": "9623:30:0",
+                            "stateVariable": false,
+                            "storageLocation": "memory",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_bytes_memory_ptr",
+                              "typeString": "bytes"
+                            },
+                            "typeName": {
+                              "id": 752,
+                              "name": "bytes",
+                              "nodeType": "ElementaryTypeName",
+                              "src": "9623:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bytes_storage_ptr",
+                                "typeString": "bytes"
+                              }
+                            },
+                            "value": null,
+                            "visibility": "internal"
+                          }
+                        ],
+                        "id": 754,
+                        "initialValue": null,
+                        "nodeType": "VariableDeclarationStatement",
+                        "src": "9623:30:0"
+                      },
+                      {
+                        "externalReferences": [
+                          {
+                            "contractSignature": {
+                              "declaration": 753,
+                              "isOffset": false,
+                              "isSlot": false,
+                              "src": "9897:17:0",
+                              "valueSize": 1
+                            }
+                          },
+                          {
+                            "signature": {
+                              "declaration": 699,
+                              "isOffset": false,
+                              "isSlot": false,
+                              "src": "9926:9:0",
+                              "valueSize": 1
+                            }
+                          },
+                          {
+                            "s": {
+                              "declaration": 729,
+                              "isOffset": false,
+                              "isSlot": false,
+                              "src": "9937:1:0",
+                              "valueSize": 1
+                            }
+                          }
+                        ],
+                        "id": 755,
+                        "nodeType": "InlineAssembly",
+                        "operations": "{\n    contractSignature := add(add(signature, s), 0x20)\n}",
+                        "src": "9735:225:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "commonType": {
+                                "typeIdentifier": "t_bytes4",
+                                "typeString": "bytes4"
+                              },
+                              "id": 765,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "leftExpression": {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 761,
+                                    "name": "transferHashData",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 701,
+                                    "src": "10042:16:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes_memory_ptr",
+                                      "typeString": "bytes memory"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 762,
+                                    "name": "contractSignature",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 753,
+                                    "src": "10060:17:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes_memory_ptr",
+                                      "typeString": "bytes memory"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_bytes_memory_ptr",
+                                      "typeString": "bytes memory"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_bytes_memory_ptr",
+                                      "typeString": "bytes memory"
+                                    }
+                                  ],
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "arguments": [
+                                      {
+                                        "argumentTypes": null,
+                                        "id": 758,
+                                        "name": "owner",
+                                        "nodeType": "Identifier",
+                                        "overloadedDeclarations": [],
+                                        "referencedDeclaration": 704,
+                                        "src": "10018:5:0",
+                                        "typeDescriptions": {
+                                          "typeIdentifier": "t_address",
+                                          "typeString": "address"
+                                        }
+                                      }
+                                    ],
+                                    "expression": {
+                                      "argumentTypes": [
+                                        {
+                                          "typeIdentifier": "t_address",
+                                          "typeString": "address"
+                                        }
+                                      ],
+                                      "id": 757,
+                                      "name": "ISignatureValidator",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 3516,
+                                      "src": "9998:19:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_type$_t_contract$_ISignatureValidator_$3516_$",
+                                        "typeString": "type(contract ISignatureValidator)"
+                                      }
+                                    },
+                                    "id": 759,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "kind": "typeConversion",
+                                    "lValueRequested": false,
+                                    "names": [],
+                                    "nodeType": "FunctionCall",
+                                    "src": "9998:26:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_contract$_ISignatureValidator_$3516",
+                                      "typeString": "contract ISignatureValidator"
+                                    }
+                                  },
+                                  "id": 760,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "memberName": "isValidSignature",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": 3515,
+                                  "src": "9998:43:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_function_external_view$_t_bytes_memory_ptr_$_t_bytes_memory_ptr_$returns$_t_bytes4_$",
+                                    "typeString": "function (bytes memory,bytes memory) view external returns (bytes4)"
+                                  }
+                                },
+                                "id": 763,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "functionCall",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "9998:80:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_bytes4",
+                                  "typeString": "bytes4"
+                                }
+                              },
+                              "nodeType": "BinaryOperation",
+                              "operator": "==",
+                              "rightExpression": {
+                                "argumentTypes": null,
+                                "id": 764,
+                                "name": "EIP1271_MAGIC_VALUE",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 3503,
+                                "src": "10082:19:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_bytes4",
+                                  "typeString": "bytes4"
+                                }
+                              },
+                              "src": "9998:103:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "436f756c64206e6f742076616c6964617465204549502d31323731207369676e6174757265",
+                              "id": 766,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "string",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "10119:39:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_stringliteral_28b765f195c3cd598e06ecb11ef8b4894757ebf4babad4a035bcaf2f5d0e18e5",
+                                "typeString": "literal_string \"Could not validate EIP-1271 signature\""
+                              },
+                              "value": "Could not validate EIP-1271 signature"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              },
+                              {
+                                "typeIdentifier": "t_stringliteral_28b765f195c3cd598e06ecb11ef8b4894757ebf4babad4a035bcaf2f5d0e18e5",
+                                "typeString": "literal_string \"Could not validate EIP-1271 signature\""
+                              }
+                            ],
+                            "id": 756,
+                            "name": "require",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [
+                              4980,
+                              4981
+                            ],
+                            "referencedDeclaration": 4981,
+                            "src": "9973:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                              "typeString": "function (bool,string memory) pure"
+                            }
+                          },
+                          "id": 767,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "9973:199:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 768,
+                        "nodeType": "ExpressionStatement",
+                        "src": "9973:199:0"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 818,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "recoverSignature",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 702,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 699,
+                  "name": "signature",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 818,
+                  "src": "8945:22:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_memory_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 698,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8945:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 701,
+                  "name": "transferHashData",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 818,
+                  "src": "8969:29:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_memory_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 700,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8969:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "8944:55:0"
+            },
+            "returnParameters": {
+              "id": 705,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 704,
+                  "name": "owner",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 818,
+                  "src": "9022:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 703,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "9022:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "9021:15:0"
+            },
+            "scope": 1224,
+            "src": "8919:1919:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "private"
+          },
+          {
+            "body": {
+              "id": 872,
+              "nodeType": "Block",
+              "src": "10937:476:0",
+              "statements": [
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    },
+                    "id": 833,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 829,
+                      "name": "token",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 822,
+                      "src": "10951:5:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "==",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "hexValue": "30",
+                          "id": 831,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "10968:1:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          "value": "0"
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          }
+                        ],
+                        "id": 830,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "10960:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_address_$",
+                          "typeString": "type(address)"
+                        },
+                        "typeName": "address"
+                      },
+                      "id": 832,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "typeConversion",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "10960:10:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address_payable",
+                        "typeString": "address payable"
+                      }
+                    },
+                    "src": "10951:19:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": {
+                    "id": 870,
+                    "nodeType": "Block",
+                    "src": "11172:235:0",
+                    "statements": [
+                      {
+                        "assignments": [
+                          849
+                        ],
+                        "declarations": [
+                          {
+                            "constant": false,
+                            "id": 849,
+                            "name": "data",
+                            "nodeType": "VariableDeclaration",
+                            "scope": 870,
+                            "src": "11186:17:0",
+                            "stateVariable": false,
+                            "storageLocation": "memory",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_bytes_memory_ptr",
+                              "typeString": "bytes"
+                            },
+                            "typeName": {
+                              "id": 848,
+                              "name": "bytes",
+                              "nodeType": "ElementaryTypeName",
+                              "src": "11186:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bytes_storage_ptr",
+                                "typeString": "bytes"
+                              }
+                            },
+                            "value": null,
+                            "visibility": "internal"
+                          }
+                        ],
+                        "id": 856,
+                        "initialValue": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "7472616e7366657228616464726573732c75696e7432353629",
+                              "id": 852,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "string",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "11230:27:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_stringliteral_a9059cbb2ab09eb219583f4a59a5d0623ade346d962bcd4e46b11da047c9049b",
+                                "typeString": "literal_string \"transfer(address,uint256)\""
+                              },
+                              "value": "transfer(address,uint256)"
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 853,
+                              "name": "to",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 824,
+                              "src": "11259:2:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 854,
+                              "name": "amount",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 826,
+                              "src": "11263:6:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint96",
+                                "typeString": "uint96"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_stringliteral_a9059cbb2ab09eb219583f4a59a5d0623ade346d962bcd4e46b11da047c9049b",
+                                "typeString": "literal_string \"transfer(address,uint256)\""
+                              },
+                              {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              },
+                              {
+                                "typeIdentifier": "t_uint96",
+                                "typeString": "uint96"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 850,
+                              "name": "abi",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4964,
+                              "src": "11206:3:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_magic_abi",
+                                "typeString": "abi"
+                              }
+                            },
+                            "id": 851,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "lValueRequested": false,
+                            "memberName": "encodeWithSignature",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "11206:23:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$",
+                              "typeString": "function (string memory) pure returns (bytes memory)"
+                            }
+                          },
+                          "id": 855,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "11206:64:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bytes_memory_ptr",
+                            "typeString": "bytes memory"
+                          }
+                        },
+                        "nodeType": "VariableDeclarationStatement",
+                        "src": "11186:84:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "arguments": [
+                                {
+                                  "argumentTypes": null,
+                                  "id": 860,
+                                  "name": "token",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 822,
+                                  "src": "11323:5:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                },
+                                {
+                                  "argumentTypes": null,
+                                  "hexValue": "30",
+                                  "id": 861,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "kind": "number",
+                                  "lValueRequested": false,
+                                  "nodeType": "Literal",
+                                  "src": "11330:1:0",
+                                  "subdenomination": null,
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_rational_0_by_1",
+                                    "typeString": "int_const 0"
+                                  },
+                                  "value": "0"
+                                },
+                                {
+                                  "argumentTypes": null,
+                                  "id": 862,
+                                  "name": "data",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 849,
+                                  "src": "11333:4:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_bytes_memory_ptr",
+                                    "typeString": "bytes memory"
+                                  }
+                                },
+                                {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "expression": {
+                                      "argumentTypes": null,
+                                      "id": 863,
+                                      "name": "Enum",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 3235,
+                                      "src": "11339:4:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_type$_t_contract$_Enum_$3235_$",
+                                        "typeString": "type(contract Enum)"
+                                      }
+                                    },
+                                    "id": 864,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "memberName": "Operation",
+                                    "nodeType": "MemberAccess",
+                                    "referencedDeclaration": 3234,
+                                    "src": "11339:14:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_type$_t_enum$_Operation_$3234_$",
+                                      "typeString": "type(enum Enum.Operation)"
+                                    }
+                                  },
+                                  "id": 865,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "lValueRequested": false,
+                                  "memberName": "Call",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": null,
+                                  "src": "11339:19:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_enum$_Operation_$3234",
+                                    "typeString": "enum Enum.Operation"
+                                  }
+                                }
+                              ],
+                              "expression": {
+                                "argumentTypes": [
+                                  {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  },
+                                  {
+                                    "typeIdentifier": "t_rational_0_by_1",
+                                    "typeString": "int_const 0"
+                                  },
+                                  {
+                                    "typeIdentifier": "t_bytes_memory_ptr",
+                                    "typeString": "bytes memory"
+                                  },
+                                  {
+                                    "typeIdentifier": "t_enum$_Operation_$3234",
+                                    "typeString": "enum Enum.Operation"
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": null,
+                                  "id": 858,
+                                  "name": "safe",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 820,
+                                  "src": "11292:4:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                    "typeString": "contract GnosisSafe"
+                                  }
+                                },
+                                "id": 859,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "memberName": "execTransactionFromModule",
+                                "nodeType": "MemberAccess",
+                                "referencedDeclaration": 17,
+                                "src": "11292:30:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$_t_bytes_memory_ptr_$_t_enum$_Operation_$3234_$returns$_t_bool_$",
+                                  "typeString": "function (address,uint256,bytes memory,enum Enum.Operation) external returns (bool)"
+                                }
+                              },
+                              "id": 866,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "kind": "functionCall",
+                              "lValueRequested": false,
+                              "names": [],
+                              "nodeType": "FunctionCall",
+                              "src": "11292:67:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "436f756c64206e6f74206578656375746520746f6b656e207472616e73666572",
+                              "id": 867,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "string",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "11361:34:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_stringliteral_00c0b742664159361be6aebbe2af44c4ae7eb95e13260265d1e1cf75d2593709",
+                                "typeString": "literal_string \"Could not execute token transfer\""
+                              },
+                              "value": "Could not execute token transfer"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              },
+                              {
+                                "typeIdentifier": "t_stringliteral_00c0b742664159361be6aebbe2af44c4ae7eb95e13260265d1e1cf75d2593709",
+                                "typeString": "literal_string \"Could not execute token transfer\""
+                              }
+                            ],
+                            "id": 857,
+                            "name": "require",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [
+                              4980,
+                              4981
+                            ],
+                            "referencedDeclaration": 4981,
+                            "src": "11284:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                              "typeString": "function (bool,string memory) pure"
+                            }
+                          },
+                          "id": 868,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "11284:112:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 869,
+                        "nodeType": "ExpressionStatement",
+                        "src": "11284:112:0"
+                      }
+                    ]
+                  },
+                  "id": 871,
+                  "nodeType": "IfStatement",
+                  "src": "10947:460:0",
+                  "trueBody": {
+                    "id": 847,
+                    "nodeType": "Block",
+                    "src": "10972:194:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "arguments": [
+                                {
+                                  "argumentTypes": null,
+                                  "id": 837,
+                                  "name": "to",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 824,
+                                  "src": "11082:2:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_address_payable",
+                                    "typeString": "address payable"
+                                  }
+                                },
+                                {
+                                  "argumentTypes": null,
+                                  "id": 838,
+                                  "name": "amount",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 826,
+                                  "src": "11086:6:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint96",
+                                    "typeString": "uint96"
+                                  }
+                                },
+                                {
+                                  "argumentTypes": null,
+                                  "hexValue": "",
+                                  "id": 839,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "kind": "string",
+                                  "lValueRequested": false,
+                                  "nodeType": "Literal",
+                                  "src": "11094:2:0",
+                                  "subdenomination": null,
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+                                    "typeString": "literal_string \"\""
+                                  },
+                                  "value": ""
+                                },
+                                {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "expression": {
+                                      "argumentTypes": null,
+                                      "id": 840,
+                                      "name": "Enum",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 3235,
+                                      "src": "11098:4:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_type$_t_contract$_Enum_$3235_$",
+                                        "typeString": "type(contract Enum)"
+                                      }
+                                    },
+                                    "id": 841,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "memberName": "Operation",
+                                    "nodeType": "MemberAccess",
+                                    "referencedDeclaration": 3234,
+                                    "src": "11098:14:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_type$_t_enum$_Operation_$3234_$",
+                                      "typeString": "type(enum Enum.Operation)"
+                                    }
+                                  },
+                                  "id": 842,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "lValueRequested": false,
+                                  "memberName": "Call",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": null,
+                                  "src": "11098:19:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_enum$_Operation_$3234",
+                                    "typeString": "enum Enum.Operation"
+                                  }
+                                }
+                              ],
+                              "expression": {
+                                "argumentTypes": [
+                                  {
+                                    "typeIdentifier": "t_address_payable",
+                                    "typeString": "address payable"
+                                  },
+                                  {
+                                    "typeIdentifier": "t_uint96",
+                                    "typeString": "uint96"
+                                  },
+                                  {
+                                    "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+                                    "typeString": "literal_string \"\""
+                                  },
+                                  {
+                                    "typeIdentifier": "t_enum$_Operation_$3234",
+                                    "typeString": "enum Enum.Operation"
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": null,
+                                  "id": 835,
+                                  "name": "safe",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 820,
+                                  "src": "11051:4:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                    "typeString": "contract GnosisSafe"
+                                  }
+                                },
+                                "id": 836,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "memberName": "execTransactionFromModule",
+                                "nodeType": "MemberAccess",
+                                "referencedDeclaration": 17,
+                                "src": "11051:30:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$_t_bytes_memory_ptr_$_t_enum$_Operation_$3234_$returns$_t_bool_$",
+                                  "typeString": "function (address,uint256,bytes memory,enum Enum.Operation) external returns (bool)"
+                                }
+                              },
+                              "id": 843,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "kind": "functionCall",
+                              "lValueRequested": false,
+                              "names": [],
+                              "nodeType": "FunctionCall",
+                              "src": "11051:67:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "436f756c64206e6f742065786563757465206574686572207472616e73666572",
+                              "id": 844,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "string",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "11120:34:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_stringliteral_2fae53cac084168982e43888b6e5eff084959ab65d511777b56b4cbb265d2586",
+                                "typeString": "literal_string \"Could not execute ether transfer\""
+                              },
+                              "value": "Could not execute ether transfer"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              },
+                              {
+                                "typeIdentifier": "t_stringliteral_2fae53cac084168982e43888b6e5eff084959ab65d511777b56b4cbb265d2586",
+                                "typeString": "literal_string \"Could not execute ether transfer\""
+                              }
+                            ],
+                            "id": 834,
+                            "name": "require",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [
+                              4980,
+                              4981
+                            ],
+                            "referencedDeclaration": 4981,
+                            "src": "11043:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                              "typeString": "function (bool,string memory) pure"
+                            }
+                          },
+                          "id": 845,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "11043:112:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 846,
+                        "nodeType": "ExpressionStatement",
+                        "src": "11043:112:0"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 873,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "transfer",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 827,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 820,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 873,
+                  "src": "10862:15:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                    "typeString": "contract GnosisSafe"
+                  },
+                  "typeName": {
+                    "contractScope": null,
+                    "id": 819,
+                    "name": "GnosisSafe",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 18,
+                    "src": "10862:10:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                      "typeString": "contract GnosisSafe"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 822,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 873,
+                  "src": "10879:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 821,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "10879:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 824,
+                  "name": "to",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 873,
+                  "src": "10894:18:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address_payable",
+                    "typeString": "address payable"
+                  },
+                  "typeName": {
+                    "id": 823,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "10894:15:0",
+                    "stateMutability": "payable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address_payable",
+                      "typeString": "address payable"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 826,
+                  "name": "amount",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 873,
+                  "src": "10914:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 825,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "10914:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "10861:67:0"
+            },
+            "returnParameters": {
+              "id": 828,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "10937:0:0"
+            },
+            "scope": 1224,
+            "src": "10844:569:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "private"
+          },
+          {
+            "body": {
+              "id": 889,
+              "nodeType": "Block",
+              "src": "11509:46:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "baseExpression": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "id": 883,
+                        "name": "tokens",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 51,
+                        "src": "11526:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$_$",
+                          "typeString": "mapping(address => mapping(address => address[] storage ref))"
+                        }
+                      },
+                      "id": 885,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "id": 884,
+                        "name": "safe",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 875,
+                        "src": "11533:4:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "IndexAccess",
+                      "src": "11526:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$",
+                        "typeString": "mapping(address => address[] storage ref)"
+                      }
+                    },
+                    "id": 887,
+                    "indexExpression": {
+                      "argumentTypes": null,
+                      "id": 886,
+                      "name": "delegate",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 877,
+                      "src": "11539:8:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "isConstant": false,
+                    "isLValue": true,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "IndexAccess",
+                    "src": "11526:22:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_address_$dyn_storage",
+                      "typeString": "address[] storage ref"
+                    }
+                  },
+                  "functionReturnParameters": 882,
+                  "id": 888,
+                  "nodeType": "Return",
+                  "src": "11519:29:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 890,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "getTokens",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 878,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 875,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 890,
+                  "src": "11438:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 874,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "11438:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 877,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 890,
+                  "src": "11452:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 876,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "11452:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "11437:32:0"
+            },
+            "returnParameters": {
+              "id": 882,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 881,
+                  "name": "",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 890,
+                  "src": "11491:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
+                    "typeString": "address[]"
+                  },
+                  "typeName": {
+                    "baseType": {
+                      "id": 879,
+                      "name": "address",
+                      "nodeType": "ElementaryTypeName",
+                      "src": "11491:7:0",
+                      "stateMutability": "nonpayable",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "id": 880,
+                    "length": null,
+                    "nodeType": "ArrayTypeName",
+                    "src": "11491:9:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                      "typeString": "address[]"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "11490:18:0"
+            },
+            "scope": 1224,
+            "src": "11419:136:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 933,
+              "nodeType": "Block",
+              "src": "11675:313:0",
+              "statements": [
+                {
+                  "assignments": [
+                    904
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 904,
+                      "name": "allowance",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 933,
+                      "src": "11685:26:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                        "typeString": "struct AllowanceModule.Allowance"
+                      },
+                      "typeName": {
+                        "contractScope": null,
+                        "id": 903,
+                        "name": "Allowance",
+                        "nodeType": "UserDefinedTypeName",
+                        "referencedDeclaration": 81,
+                        "src": "11685:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                          "typeString": "struct AllowanceModule.Allowance"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 910,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "id": 906,
+                        "name": "safe",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 892,
+                        "src": "11727:4:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 907,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 894,
+                        "src": "11733:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 908,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 896,
+                        "src": "11743:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 905,
+                      "name": "getAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 336,
+                      "src": "11714:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$returns$_t_struct$_Allowance_$81_memory_ptr_$",
+                        "typeString": "function (address,address,address) view returns (struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 909,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "11714:35:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                      "typeString": "struct AllowanceModule.Allowance memory"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "11685:64:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "components": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 912,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 904,
+                              "src": "11788:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 913,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "amount",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 72,
+                            "src": "11788:16:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          ],
+                          "id": 911,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "11780:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_uint256_$",
+                            "typeString": "type(uint256)"
+                          },
+                          "typeName": "uint256"
+                        },
+                        "id": 914,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "11780:25:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 916,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 904,
+                              "src": "11827:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 917,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "spent",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 74,
+                            "src": "11827:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          ],
+                          "id": 915,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "11819:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_uint256_$",
+                            "typeString": "type(uint256)"
+                          },
+                          "typeName": "uint256"
+                        },
+                        "id": 918,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "11819:24:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 920,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 904,
+                              "src": "11865:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 921,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "resetTimeMin",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 76,
+                            "src": "11865:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          ],
+                          "id": 919,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "11857:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_uint256_$",
+                            "typeString": "type(uint256)"
+                          },
+                          "typeName": "uint256"
+                        },
+                        "id": 922,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "11857:31:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 924,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 904,
+                              "src": "11910:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 925,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "lastResetMin",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 78,
+                            "src": "11910:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          ],
+                          "id": 923,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "11902:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_uint256_$",
+                            "typeString": "type(uint256)"
+                          },
+                          "typeName": "uint256"
+                        },
+                        "id": 926,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "11902:31:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 928,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 904,
+                              "src": "11955:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 929,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "nonce",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 80,
+                            "src": "11955:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          ],
+                          "id": 927,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "11947:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_uint256_$",
+                            "typeString": "type(uint256)"
+                          },
+                          "typeName": "uint256"
+                        },
+                        "id": 930,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "11947:24:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      }
+                    ],
+                    "id": 931,
+                    "isConstant": false,
+                    "isInlineArray": true,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "11766:215:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_uint256_$5_memory_ptr",
+                      "typeString": "uint256[5] memory"
+                    }
+                  },
+                  "functionReturnParameters": 902,
+                  "id": 932,
+                  "nodeType": "Return",
+                  "src": "11759:222:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 934,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "getTokenAllowance",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 897,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 892,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 934,
+                  "src": "11588:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 891,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "11588:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 894,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 934,
+                  "src": "11602:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 893,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "11602:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 896,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 934,
+                  "src": "11620:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 895,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "11620:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "11587:47:0"
+            },
+            "returnParameters": {
+              "id": 902,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 901,
+                  "name": "",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 934,
+                  "src": "11656:17:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_array$_t_uint256_$5_memory_ptr",
+                    "typeString": "uint256[5]"
+                  },
+                  "typeName": {
+                    "baseType": {
+                      "id": 898,
+                      "name": "uint256",
+                      "nodeType": "ElementaryTypeName",
+                      "src": "11656:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "id": 900,
+                    "length": {
+                      "argumentTypes": null,
+                      "hexValue": "35",
+                      "id": 899,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "11664:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_5_by_1",
+                        "typeString": "int_const 5"
+                      },
+                      "value": "5"
+                    },
+                    "nodeType": "ArrayTypeName",
+                    "src": "11656:10:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_uint256_$5_storage_ptr",
+                      "typeString": "uint256[5]"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "11655:19:0"
+            },
+            "scope": 1224,
+            "src": "11561:427:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 1010,
+              "nodeType": "Block",
+              "src": "12040:517:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        "id": 944,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "id": 940,
+                          "name": "delegate",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 936,
+                          "src": "12058:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "!=",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "30",
+                              "id": 942,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "number",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "12078:1:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_rational_0_by_1",
+                                "typeString": "int_const 0"
+                              },
+                              "value": "0"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_rational_0_by_1",
+                                "typeString": "int_const 0"
+                              }
+                            ],
+                            "id": 941,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "lValueRequested": false,
+                            "nodeType": "ElementaryTypeNameExpression",
+                            "src": "12070:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_type$_t_address_$",
+                              "typeString": "type(address)"
+                            },
+                            "typeName": "address"
+                          },
+                          "id": 943,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "typeConversion",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "12070:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address_payable",
+                            "typeString": "address payable"
+                          }
+                        },
+                        "src": "12058:22:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "hexValue": "496e76616c69642064656c65676174652061646472657373",
+                        "id": 945,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "string",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "12082:26:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_stringliteral_2748b75fa8e9228d9f46d849def917a80513930a212cbb86b833e29bb53a5909",
+                          "typeString": "literal_string \"Invalid delegate address\""
+                        },
+                        "value": "Invalid delegate address"
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        {
+                          "typeIdentifier": "t_stringliteral_2748b75fa8e9228d9f46d849def917a80513930a212cbb86b833e29bb53a5909",
+                          "typeString": "literal_string \"Invalid delegate address\""
+                        }
+                      ],
+                      "id": 939,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        4980,
+                        4981
+                      ],
+                      "referencedDeclaration": 4981,
+                      "src": "12050:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                        "typeString": "function (bool,string memory) pure"
+                      }
+                    },
+                    "id": 946,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "12050:59:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 947,
+                  "nodeType": "ExpressionStatement",
+                  "src": "12050:59:0"
+                },
+                {
+                  "assignments": [
+                    949
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 949,
+                      "name": "index",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1010,
+                      "src": "12119:12:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      },
+                      "typeName": {
+                        "id": 948,
+                        "name": "uint48",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "12119:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint48",
+                          "typeString": "uint48"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 953,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "id": 951,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 936,
+                        "src": "12141:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 950,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "lValueRequested": false,
+                      "nodeType": "ElementaryTypeNameExpression",
+                      "src": "12134:6:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_type$_t_uint48_$",
+                        "typeString": "type(uint48)"
+                      },
+                      "typeName": "uint48"
+                    },
+                    "id": 952,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "typeConversion",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "12134:16:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "12119:31:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    },
+                    "id": 964,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 954,
+                            "name": "delegates",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 57,
+                            "src": "12213:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                              "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                            }
+                          },
+                          "id": 957,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 955,
+                              "name": "msg",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4977,
+                              "src": "12223:3:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_magic_message",
+                                "typeString": "msg"
+                              }
+                            },
+                            "id": 956,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "sender",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "12223:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address_payable",
+                              "typeString": "address payable"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "12213:21:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                            "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                          }
+                        },
+                        "id": 959,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "id": 958,
+                          "name": "index",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 949,
+                          "src": "12235:5:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "12213:28:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                          "typeString": "struct AllowanceModule.Delegate storage ref"
+                        }
+                      },
+                      "id": 960,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "delegate",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 65,
+                      "src": "12213:37:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "!=",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "hexValue": "30",
+                          "id": 962,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "12262:1:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          "value": "0"
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          }
+                        ],
+                        "id": 961,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "12254:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_address_$",
+                          "typeString": "type(address)"
+                        },
+                        "typeName": "address"
+                      },
+                      "id": 963,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "typeConversion",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "12254:10:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address_payable",
+                        "typeString": "address payable"
+                      }
+                    },
+                    "src": "12213:51:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 966,
+                  "nodeType": "IfStatement",
+                  "src": "12210:63:0",
+                  "trueBody": {
+                    "expression": null,
+                    "functionReturnParameters": 938,
+                    "id": 965,
+                    "nodeType": "Return",
+                    "src": "12266:7:0"
+                  }
+                },
+                {
+                  "assignments": [
+                    968
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 968,
+                      "name": "startIndex",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1010,
+                      "src": "12282:17:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      },
+                      "typeName": {
+                        "id": 967,
+                        "name": "uint48",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "12282:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint48",
+                          "typeString": "uint48"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 973,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "baseExpression": {
+                      "argumentTypes": null,
+                      "id": 969,
+                      "name": "delegatesStart",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 61,
+                      "src": "12302:14:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_mapping$_t_address_$_t_uint48_$",
+                        "typeString": "mapping(address => uint48)"
+                      }
+                    },
+                    "id": 972,
+                    "indexExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 970,
+                        "name": "msg",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 4977,
+                        "src": "12317:3:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_magic_message",
+                          "typeString": "msg"
+                        }
+                      },
+                      "id": 971,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "sender",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "12317:10:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address_payable",
+                        "typeString": "address payable"
+                      }
+                    },
+                    "isConstant": false,
+                    "isLValue": true,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "IndexAccess",
+                    "src": "12302:26:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "12282:46:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 985,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "id": 974,
+                          "name": "delegates",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 57,
+                          "src": "12338:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                            "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                          }
+                        },
+                        "id": 978,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 975,
+                            "name": "msg",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 4977,
+                            "src": "12348:3:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_magic_message",
+                              "typeString": "msg"
+                            }
+                          },
+                          "id": 976,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "sender",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": null,
+                          "src": "12348:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address_payable",
+                            "typeString": "address payable"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "12338:21:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                          "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                        }
+                      },
+                      "id": 979,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "id": 977,
+                        "name": "index",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 949,
+                        "src": "12360:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint48",
+                          "typeString": "uint48"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "nodeType": "IndexAccess",
+                      "src": "12338:28:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                        "typeString": "struct AllowanceModule.Delegate storage ref"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "id": 981,
+                          "name": "delegate",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 936,
+                          "src": "12378:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        {
+                          "argumentTypes": null,
+                          "hexValue": "30",
+                          "id": 982,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "12388:1:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          "value": "0"
+                        },
+                        {
+                          "argumentTypes": null,
+                          "id": 983,
+                          "name": "startIndex",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 968,
+                          "src": "12391:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          }
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          }
+                        ],
+                        "id": 980,
+                        "name": "Delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 70,
+                        "src": "12369:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_struct$_Delegate_$70_storage_ptr_$",
+                          "typeString": "type(struct AllowanceModule.Delegate storage pointer)"
+                        }
+                      },
+                      "id": 984,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "structConstructorCall",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "12369:33:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Delegate_$70_memory",
+                        "typeString": "struct AllowanceModule.Delegate memory"
+                      }
+                    },
+                    "src": "12338:64:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                      "typeString": "struct AllowanceModule.Delegate storage ref"
+                    }
+                  },
+                  "id": 986,
+                  "nodeType": "ExpressionStatement",
+                  "src": "12338:64:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 995,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 987,
+                            "name": "delegates",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 57,
+                            "src": "12412:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                              "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                            }
+                          },
+                          "id": 991,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 988,
+                              "name": "msg",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4977,
+                              "src": "12422:3:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_magic_message",
+                                "typeString": "msg"
+                              }
+                            },
+                            "id": 989,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "sender",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "12422:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address_payable",
+                              "typeString": "address payable"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "12412:21:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                            "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                          }
+                        },
+                        "id": 992,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "id": 990,
+                          "name": "startIndex",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 968,
+                          "src": "12434:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "12412:33:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                          "typeString": "struct AllowanceModule.Delegate storage ref"
+                        }
+                      },
+                      "id": 993,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "prev",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 67,
+                      "src": "12412:38:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 994,
+                      "name": "index",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 949,
+                      "src": "12453:5:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "src": "12412:46:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "id": 996,
+                  "nodeType": "ExpressionStatement",
+                  "src": "12412:46:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 1002,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "id": 997,
+                        "name": "delegatesStart",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 61,
+                        "src": "12468:14:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_uint48_$",
+                          "typeString": "mapping(address => uint48)"
+                        }
+                      },
+                      "id": 1000,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 998,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "12483:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 999,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "12483:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "nodeType": "IndexAccess",
+                      "src": "12468:26:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 1001,
+                      "name": "index",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 949,
+                      "src": "12497:5:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "src": "12468:34:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "id": 1003,
+                  "nodeType": "ExpressionStatement",
+                  "src": "12468:34:0"
+                },
+                {
+                  "eventCall": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1005,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "12529:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 1006,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "12529:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 1007,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 936,
+                        "src": "12541:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 1004,
+                      "name": "AddDelegate",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 87,
+                      "src": "12517:11:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
+                        "typeString": "function (address,address)"
+                      }
+                    },
+                    "id": 1008,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "12517:33:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 1009,
+                  "nodeType": "EmitStatement",
+                  "src": "12512:38:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 1011,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "addDelegate",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 937,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 936,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1011,
+                  "src": "12015:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 935,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "12015:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "12014:18:0"
+            },
+            "returnParameters": {
+              "id": 938,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "12040:0:0"
+            },
+            "scope": 1224,
+            "src": "11994:563:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 1136,
+              "nodeType": "Block",
+              "src": "12612:918:0",
+              "statements": [
+                {
+                  "assignments": [
+                    1017
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 1017,
+                      "name": "current",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1136,
+                      "src": "12622:23:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                        "typeString": "struct AllowanceModule.Delegate"
+                      },
+                      "typeName": {
+                        "contractScope": null,
+                        "id": 1016,
+                        "name": "Delegate",
+                        "nodeType": "UserDefinedTypeName",
+                        "referencedDeclaration": 70,
+                        "src": "12622:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_storage_ptr",
+                          "typeString": "struct AllowanceModule.Delegate"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 1026,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "baseExpression": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "id": 1018,
+                        "name": "delegates",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 57,
+                        "src": "12648:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                          "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                        }
+                      },
+                      "id": 1021,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1019,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "12658:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 1020,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "12658:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "IndexAccess",
+                      "src": "12648:21:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                        "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                      }
+                    },
+                    "id": 1025,
+                    "indexExpression": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "id": 1023,
+                          "name": "delegate",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 1013,
+                          "src": "12677:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        ],
+                        "id": 1022,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "12670:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_uint48_$",
+                          "typeString": "type(uint48)"
+                        },
+                        "typeName": "uint48"
+                      },
+                      "id": 1024,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "typeConversion",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "12670:16:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "isConstant": false,
+                    "isLValue": true,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "IndexAccess",
+                    "src": "12648:39:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                      "typeString": "struct AllowanceModule.Delegate storage ref"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "12622:65:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    },
+                    "id": 1032,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 1027,
+                        "name": "current",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1017,
+                        "src": "12750:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                          "typeString": "struct AllowanceModule.Delegate memory"
+                        }
+                      },
+                      "id": 1028,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "delegate",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 65,
+                      "src": "12750:16:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "==",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "hexValue": "30",
+                          "id": 1030,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "12778:1:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          "value": "0"
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          }
+                        ],
+                        "id": 1029,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "12770:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_address_$",
+                          "typeString": "type(address)"
+                        },
+                        "typeName": "address"
+                      },
+                      "id": 1031,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "typeConversion",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "12770:10:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address_payable",
+                        "typeString": "address payable"
+                      }
+                    },
+                    "src": "12750:30:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 1034,
+                  "nodeType": "IfStatement",
+                  "src": "12747:42:0",
+                  "trueBody": {
+                    "expression": null,
+                    "functionReturnParameters": 1015,
+                    "id": 1033,
+                    "nodeType": "Return",
+                    "src": "12782:7:0"
+                  }
+                },
+                {
+                  "assignments": [
+                    1038
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 1038,
+                      "name": "delegateTokens",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1136,
+                      "src": "12798:32:0",
+                      "stateVariable": false,
+                      "storageLocation": "storage",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                        "typeString": "address[]"
+                      },
+                      "typeName": {
+                        "baseType": {
+                          "id": 1036,
+                          "name": "address",
+                          "nodeType": "ElementaryTypeName",
+                          "src": "12798:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "id": 1037,
+                        "length": null,
+                        "nodeType": "ArrayTypeName",
+                        "src": "12798:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                          "typeString": "address[]"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 1045,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "baseExpression": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "id": 1039,
+                        "name": "tokens",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 51,
+                        "src": "12833:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$_$",
+                          "typeString": "mapping(address => mapping(address => address[] storage ref))"
+                        }
+                      },
+                      "id": 1042,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1040,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "12840:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 1041,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "12840:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "IndexAccess",
+                      "src": "12833:18:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$",
+                        "typeString": "mapping(address => address[] storage ref)"
+                      }
+                    },
+                    "id": 1044,
+                    "indexExpression": {
+                      "argumentTypes": null,
+                      "id": 1043,
+                      "name": "delegate",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 1013,
+                      "src": "12852:8:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "isConstant": false,
+                    "isLValue": true,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "IndexAccess",
+                    "src": "12833:28:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_address_$dyn_storage",
+                      "typeString": "address[] storage ref"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "12798:63:0"
+                },
+                {
+                  "body": {
+                    "id": 1104,
+                    "nodeType": "Block",
+                    "src": "12923:420:0",
+                    "statements": [
+                      {
+                        "assignments": [
+                          1058
+                        ],
+                        "declarations": [
+                          {
+                            "constant": false,
+                            "id": 1058,
+                            "name": "token",
+                            "nodeType": "VariableDeclaration",
+                            "scope": 1104,
+                            "src": "12937:13:0",
+                            "stateVariable": false,
+                            "storageLocation": "default",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            "typeName": {
+                              "id": 1057,
+                              "name": "address",
+                              "nodeType": "ElementaryTypeName",
+                              "src": "12937:7:0",
+                              "stateMutability": "nonpayable",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            "value": null,
+                            "visibility": "internal"
+                          }
+                        ],
+                        "id": 1062,
+                        "initialValue": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 1059,
+                            "name": "delegateTokens",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1038,
+                            "src": "12953:14:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                              "typeString": "address[] storage pointer"
+                            }
+                          },
+                          "id": 1061,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "id": 1060,
+                            "name": "i",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1047,
+                            "src": "12968:1:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint256",
+                              "typeString": "uint256"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "12953:17:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "nodeType": "VariableDeclarationStatement",
+                        "src": "12937:33:0"
+                      },
+                      {
+                        "assignments": [
+                          1064
+                        ],
+                        "declarations": [
+                          {
+                            "constant": false,
+                            "id": 1064,
+                            "name": "allowance",
+                            "nodeType": "VariableDeclaration",
+                            "scope": 1104,
+                            "src": "13046:26:0",
+                            "stateVariable": false,
+                            "storageLocation": "memory",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                              "typeString": "struct AllowanceModule.Allowance"
+                            },
+                            "typeName": {
+                              "contractScope": null,
+                              "id": 1063,
+                              "name": "Allowance",
+                              "nodeType": "UserDefinedTypeName",
+                              "referencedDeclaration": 81,
+                              "src": "13046:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                                "typeString": "struct AllowanceModule.Allowance"
+                              }
+                            },
+                            "value": null,
+                            "visibility": "internal"
+                          }
+                        ],
+                        "id": 1071,
+                        "initialValue": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 1066,
+                                "name": "msg",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4977,
+                                "src": "13088:3:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_magic_message",
+                                  "typeString": "msg"
+                                }
+                              },
+                              "id": 1067,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "sender",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": null,
+                              "src": "13088:10:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 1068,
+                              "name": "delegate",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1013,
+                              "src": "13100:8:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 1069,
+                              "name": "token",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1058,
+                              "src": "13110:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "id": 1065,
+                            "name": "getAllowance",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 336,
+                            "src": "13075:12:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$returns$_t_struct$_Allowance_$81_memory_ptr_$",
+                              "typeString": "function (address,address,address) view returns (struct AllowanceModule.Allowance memory)"
+                            }
+                          },
+                          "id": 1070,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "13075:41:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "nodeType": "VariableDeclarationStatement",
+                        "src": "13046:70:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1076,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1072,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1064,
+                              "src": "13130:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 1074,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "amount",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 72,
+                            "src": "13130:16:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 1075,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "13149:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          },
+                          "src": "13130:20:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          }
+                        },
+                        "id": 1077,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13130:20:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1082,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1078,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1064,
+                              "src": "13164:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 1080,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "spent",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 74,
+                            "src": "13164:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 1081,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "13182:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          },
+                          "src": "13164:19:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          }
+                        },
+                        "id": 1083,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13164:19:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1088,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1084,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1064,
+                              "src": "13197:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 1086,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "resetTimeMin",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 76,
+                            "src": "13197:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 1087,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "13222:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          },
+                          "src": "13197:26:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint16",
+                            "typeString": "uint16"
+                          }
+                        },
+                        "id": 1089,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13197:26:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1094,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1090,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1064,
+                              "src": "13237:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 1092,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "lastResetMin",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 78,
+                            "src": "13237:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 1093,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "13262:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          },
+                          "src": "13237:26:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint32",
+                            "typeString": "uint32"
+                          }
+                        },
+                        "id": 1095,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13237:26:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 1097,
+                                "name": "msg",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4977,
+                                "src": "13293:3:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_magic_message",
+                                  "typeString": "msg"
+                                }
+                              },
+                              "id": 1098,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "sender",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": null,
+                              "src": "13293:10:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 1099,
+                              "name": "delegate",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1013,
+                              "src": "13305:8:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 1100,
+                              "name": "token",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1058,
+                              "src": "13315:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 1101,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1064,
+                              "src": "13322:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            ],
+                            "id": 1096,
+                            "name": "updateAllowance",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 358,
+                            "src": "13277:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_struct$_Allowance_$81_memory_ptr_$returns$__$",
+                              "typeString": "function (address,address,address,struct AllowanceModule.Allowance memory)"
+                            }
+                          },
+                          "id": 1102,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "13277:55:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 1103,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13277:55:0"
+                      }
+                    ]
+                  },
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    },
+                    "id": 1053,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 1050,
+                      "name": "i",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 1047,
+                      "src": "12891:1:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "<",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 1051,
+                        "name": "delegateTokens",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1038,
+                        "src": "12895:14:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                          "typeString": "address[] storage pointer"
+                        }
+                      },
+                      "id": 1052,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "length",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "12895:21:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "src": "12891:25:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "id": 1105,
+                  "initializationExpression": {
+                    "assignments": [
+                      1047
+                    ],
+                    "declarations": [
+                      {
+                        "constant": false,
+                        "id": 1047,
+                        "name": "i",
+                        "nodeType": "VariableDeclaration",
+                        "scope": 1105,
+                        "src": "12876:9:0",
+                        "stateVariable": false,
+                        "storageLocation": "default",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        },
+                        "typeName": {
+                          "id": 1046,
+                          "name": "uint256",
+                          "nodeType": "ElementaryTypeName",
+                          "src": "12876:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "value": null,
+                        "visibility": "internal"
+                      }
+                    ],
+                    "id": 1049,
+                    "initialValue": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 1048,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "12888:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "nodeType": "VariableDeclarationStatement",
+                    "src": "12876:13:0"
+                  },
+                  "loopExpression": {
+                    "expression": {
+                      "argumentTypes": null,
+                      "id": 1055,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "UnaryOperation",
+                      "operator": "++",
+                      "prefix": false,
+                      "src": "12918:3:0",
+                      "subExpression": {
+                        "argumentTypes": null,
+                        "id": 1054,
+                        "name": "i",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1047,
+                        "src": "12918:1:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      },
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "id": 1056,
+                    "nodeType": "ExpressionStatement",
+                    "src": "12918:3:0"
+                  },
+                  "nodeType": "ForStatement",
+                  "src": "12871:472:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 1116,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 1106,
+                            "name": "delegates",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 57,
+                            "src": "13352:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                              "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                            }
+                          },
+                          "id": 1111,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1107,
+                              "name": "msg",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4977,
+                              "src": "13362:3:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_magic_message",
+                                "typeString": "msg"
+                              }
+                            },
+                            "id": 1108,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "sender",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "13362:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address_payable",
+                              "typeString": "address payable"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "13352:21:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                            "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                          }
+                        },
+                        "id": 1112,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 1109,
+                            "name": "current",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1017,
+                            "src": "13374:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                              "typeString": "struct AllowanceModule.Delegate memory"
+                            }
+                          },
+                          "id": 1110,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "prev",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 67,
+                          "src": "13374:12:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "13352:35:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                          "typeString": "struct AllowanceModule.Delegate storage ref"
+                        }
+                      },
+                      "id": 1113,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "next",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 69,
+                      "src": "13352:40:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 1114,
+                        "name": "current",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1017,
+                        "src": "13395:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                          "typeString": "struct AllowanceModule.Delegate memory"
+                        }
+                      },
+                      "id": 1115,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "next",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 69,
+                      "src": "13395:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "src": "13352:55:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "id": 1117,
+                  "nodeType": "ExpressionStatement",
+                  "src": "13352:55:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 1128,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 1118,
+                            "name": "delegates",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 57,
+                            "src": "13417:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                              "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                            }
+                          },
+                          "id": 1123,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1119,
+                              "name": "msg",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4977,
+                              "src": "13427:3:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_magic_message",
+                                "typeString": "msg"
+                              }
+                            },
+                            "id": 1120,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "sender",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "13427:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address_payable",
+                              "typeString": "address payable"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "13417:21:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                            "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                          }
+                        },
+                        "id": 1124,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 1121,
+                            "name": "current",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1017,
+                            "src": "13439:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                              "typeString": "struct AllowanceModule.Delegate memory"
+                            }
+                          },
+                          "id": 1122,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "next",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 69,
+                          "src": "13439:12:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "13417:35:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                          "typeString": "struct AllowanceModule.Delegate storage ref"
+                        }
+                      },
+                      "id": 1125,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "prev",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 67,
+                      "src": "13417:40:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 1126,
+                        "name": "current",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1017,
+                        "src": "13460:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                          "typeString": "struct AllowanceModule.Delegate memory"
+                        }
+                      },
+                      "id": 1127,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "prev",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 67,
+                      "src": "13460:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "src": "13417:55:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "id": 1129,
+                  "nodeType": "ExpressionStatement",
+                  "src": "13417:55:0"
+                },
+                {
+                  "eventCall": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1131,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "13502:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 1132,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "13502:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 1133,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1013,
+                        "src": "13514:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 1130,
+                      "name": "RemoveDelegate",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 93,
+                      "src": "13487:14:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
+                        "typeString": "function (address,address)"
+                      }
+                    },
+                    "id": 1134,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "13487:36:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 1135,
+                  "nodeType": "EmitStatement",
+                  "src": "13482:41:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 1137,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "removeDelegate",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 1014,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 1013,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1137,
+                  "src": "12587:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 1012,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "12587:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "12586:18:0"
+            },
+            "returnParameters": {
+              "id": 1015,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "12612:0:0"
+            },
+            "scope": 1224,
+            "src": "12563:967:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 1222,
+              "nodeType": "Block",
+              "src": "13662:633:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 1157,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "id": 1151,
+                      "name": "results",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 1147,
+                      "src": "13672:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
+                        "typeString": "address[] memory"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "id": 1155,
+                          "name": "pageSize",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 1143,
+                          "src": "13696:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint8",
+                            "typeString": "uint8"
+                          }
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_uint8",
+                            "typeString": "uint8"
+                          }
+                        ],
+                        "id": 1154,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "NewExpression",
+                        "src": "13682:13:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_address_$dyn_memory_$",
+                          "typeString": "function (uint256) pure returns (address[] memory)"
+                        },
+                        "typeName": {
+                          "baseType": {
+                            "id": 1152,
+                            "name": "address",
+                            "nodeType": "ElementaryTypeName",
+                            "src": "13686:7:0",
+                            "stateMutability": "nonpayable",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "id": 1153,
+                          "length": null,
+                          "nodeType": "ArrayTypeName",
+                          "src": "13686:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                            "typeString": "address[]"
+                          }
+                        }
+                      },
+                      "id": 1156,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "functionCall",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "13682:23:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_array$_t_address_$dyn_memory",
+                        "typeString": "address[] memory"
+                      }
+                    },
+                    "src": "13672:33:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
+                      "typeString": "address[] memory"
+                    }
+                  },
+                  "id": 1158,
+                  "nodeType": "ExpressionStatement",
+                  "src": "13672:33:0"
+                },
+                {
+                  "assignments": [
+                    1160
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 1160,
+                      "name": "i",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1222,
+                      "src": "13715:7:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint8",
+                        "typeString": "uint8"
+                      },
+                      "typeName": {
+                        "id": 1159,
+                        "name": "uint8",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "13715:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint8",
+                          "typeString": "uint8"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 1162,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "hexValue": "30",
+                    "id": 1161,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": true,
+                    "kind": "number",
+                    "lValueRequested": false,
+                    "nodeType": "Literal",
+                    "src": "13725:1:0",
+                    "subdenomination": null,
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_rational_0_by_1",
+                      "typeString": "int_const 0"
+                    },
+                    "value": "0"
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "13715:11:0"
+                },
+                {
+                  "assignments": [
+                    1164
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 1164,
+                      "name": "initialIndex",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1222,
+                      "src": "13736:19:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      },
+                      "typeName": {
+                        "id": 1163,
+                        "name": "uint48",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "13736:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint48",
+                          "typeString": "uint48"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 1174,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "condition": {
+                      "argumentTypes": null,
+                      "components": [
+                        {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          },
+                          "id": 1167,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "id": 1165,
+                            "name": "start",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1141,
+                            "src": "13759:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint48",
+                              "typeString": "uint48"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "!=",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 1166,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "13768:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          },
+                          "src": "13759:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        }
+                      ],
+                      "id": 1168,
+                      "isConstant": false,
+                      "isInlineArray": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "TupleExpression",
+                      "src": "13758:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "falseExpression": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "id": 1170,
+                        "name": "delegatesStart",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 61,
+                        "src": "13781:14:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_uint48_$",
+                          "typeString": "mapping(address => uint48)"
+                        }
+                      },
+                      "id": 1172,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "id": 1171,
+                        "name": "safe",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1139,
+                        "src": "13796:4:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "IndexAccess",
+                      "src": "13781:20:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "id": 1173,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "Conditional",
+                    "src": "13758:43:0",
+                    "trueExpression": {
+                      "argumentTypes": null,
+                      "id": 1169,
+                      "name": "start",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 1141,
+                      "src": "13773:5:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "13736:65:0"
+                },
+                {
+                  "assignments": [
+                    1176
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 1176,
+                      "name": "current",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1222,
+                      "src": "13811:23:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                        "typeString": "struct AllowanceModule.Delegate"
+                      },
+                      "typeName": {
+                        "contractScope": null,
+                        "id": 1175,
+                        "name": "Delegate",
+                        "nodeType": "UserDefinedTypeName",
+                        "referencedDeclaration": 70,
+                        "src": "13811:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_storage_ptr",
+                          "typeString": "struct AllowanceModule.Delegate"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 1182,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "baseExpression": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "id": 1177,
+                        "name": "delegates",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 57,
+                        "src": "13837:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                          "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                        }
+                      },
+                      "id": 1179,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "id": 1178,
+                        "name": "safe",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1139,
+                        "src": "13847:4:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "IndexAccess",
+                      "src": "13837:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                        "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                      }
+                    },
+                    "id": 1181,
+                    "indexExpression": {
+                      "argumentTypes": null,
+                      "id": 1180,
+                      "name": "initialIndex",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 1164,
+                      "src": "13853:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "isConstant": false,
+                    "isLValue": true,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "IndexAccess",
+                    "src": "13837:29:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                      "typeString": "struct AllowanceModule.Delegate storage ref"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "13811:55:0"
+                },
+                {
+                  "body": {
+                    "id": 1212,
+                    "nodeType": "Block",
+                    "src": "13930:124:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1198,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "baseExpression": {
+                              "argumentTypes": null,
+                              "id": 1193,
+                              "name": "results",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1147,
+                              "src": "13944:7:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
+                                "typeString": "address[] memory"
+                              }
+                            },
+                            "id": 1195,
+                            "indexExpression": {
+                              "argumentTypes": null,
+                              "id": 1194,
+                              "name": "i",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1160,
+                              "src": "13952:1:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint8",
+                                "typeString": "uint8"
+                              }
+                            },
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "nodeType": "IndexAccess",
+                            "src": "13944:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1196,
+                              "name": "current",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1176,
+                              "src": "13957:7:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                                "typeString": "struct AllowanceModule.Delegate memory"
+                              }
+                            },
+                            "id": 1197,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "delegate",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 65,
+                            "src": "13957:16:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "src": "13944:29:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "id": 1199,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13944:29:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1201,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "UnaryOperation",
+                          "operator": "++",
+                          "prefix": false,
+                          "src": "13987:3:0",
+                          "subExpression": {
+                            "argumentTypes": null,
+                            "id": 1200,
+                            "name": "i",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1160,
+                            "src": "13987:1:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint8",
+                              "typeString": "uint8"
+                            }
+                          },
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint8",
+                            "typeString": "uint8"
+                          }
+                        },
+                        "id": 1202,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13987:3:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1210,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "id": 1203,
+                            "name": "current",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1176,
+                            "src": "14004:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                              "typeString": "struct AllowanceModule.Delegate memory"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "baseExpression": {
+                              "argumentTypes": null,
+                              "baseExpression": {
+                                "argumentTypes": null,
+                                "id": 1204,
+                                "name": "delegates",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 57,
+                                "src": "14014:9:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                                  "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                                }
+                              },
+                              "id": 1206,
+                              "indexExpression": {
+                                "argumentTypes": null,
+                                "id": 1205,
+                                "name": "safe",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 1139,
+                                "src": "14024:4:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "nodeType": "IndexAccess",
+                              "src": "14014:15:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                                "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                              }
+                            },
+                            "id": 1209,
+                            "indexExpression": {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 1207,
+                                "name": "current",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 1176,
+                                "src": "14030:7:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                                  "typeString": "struct AllowanceModule.Delegate memory"
+                                }
+                              },
+                              "id": 1208,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "next",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 69,
+                              "src": "14030:12:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint48",
+                                "typeString": "uint48"
+                              }
+                            },
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "nodeType": "IndexAccess",
+                            "src": "14014:29:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                              "typeString": "struct AllowanceModule.Delegate storage ref"
+                            }
+                          },
+                          "src": "14004:39:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                            "typeString": "struct AllowanceModule.Delegate memory"
+                          }
+                        },
+                        "id": 1211,
+                        "nodeType": "ExpressionStatement",
+                        "src": "14004:39:0"
+                      }
+                    ]
+                  },
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    },
+                    "id": 1192,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      },
+                      "id": 1188,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1183,
+                          "name": "current",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 1176,
+                          "src": "13882:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                            "typeString": "struct AllowanceModule.Delegate memory"
+                          }
+                        },
+                        "id": 1184,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "delegate",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 65,
+                        "src": "13882:16:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": "!=",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 1186,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "13910:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            }
+                          ],
+                          "id": 1185,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "13902:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_address_$",
+                            "typeString": "type(address)"
+                          },
+                          "typeName": "address"
+                        },
+                        "id": 1187,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "13902:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      "src": "13882:30:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "&&",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_uint8",
+                        "typeString": "uint8"
+                      },
+                      "id": 1191,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "id": 1189,
+                        "name": "i",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1160,
+                        "src": "13916:1:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint8",
+                          "typeString": "uint8"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": "<",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "id": 1190,
+                        "name": "pageSize",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1143,
+                        "src": "13920:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint8",
+                          "typeString": "uint8"
+                        }
+                      },
+                      "src": "13916:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "src": "13882:46:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "id": 1213,
+                  "nodeType": "WhileStatement",
+                  "src": "13876:178:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 1219,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "id": 1214,
+                      "name": "next",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 1149,
+                      "src": "14063:4:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 1216,
+                            "name": "current",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1176,
+                            "src": "14077:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                              "typeString": "struct AllowanceModule.Delegate memory"
+                            }
+                          },
+                          "id": 1217,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "delegate",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 65,
+                          "src": "14077:16:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        ],
+                        "id": 1215,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "14070:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_uint48_$",
+                          "typeString": "type(uint48)"
+                        },
+                        "typeName": "uint48"
+                      },
+                      "id": 1218,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "typeConversion",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "14070:24:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "src": "14063:31:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "id": 1220,
+                  "nodeType": "ExpressionStatement",
+                  "src": "14063:31:0"
+                },
+                {
+                  "externalReferences": [
+                    {
+                      "results": {
+                        "declaration": 1147,
+                        "isOffset": false,
+                        "isSlot": false,
+                        "src": "14268:7:0",
+                        "valueSize": 1
+                      }
+                    },
+                    {
+                      "i": {
+                        "declaration": 1160,
+                        "isOffset": false,
+                        "isSlot": false,
+                        "src": "14277:1:0",
+                        "valueSize": 1
+                      }
+                    }
+                  ],
+                  "id": 1221,
+                  "nodeType": "InlineAssembly",
+                  "operations": "{ mstore(results, i) }",
+                  "src": "14238:51:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 1223,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "getDelegates",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 1144,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 1139,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1223,
+                  "src": "13558:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 1138,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "13558:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 1141,
+                  "name": "start",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1223,
+                  "src": "13572:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint48",
+                    "typeString": "uint48"
+                  },
+                  "typeName": {
+                    "id": 1140,
+                    "name": "uint48",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "13572:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 1143,
+                  "name": "pageSize",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1223,
+                  "src": "13586:14:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint8",
+                    "typeString": "uint8"
+                  },
+                  "typeName": {
+                    "id": 1142,
+                    "name": "uint8",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "13586:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint8",
+                      "typeString": "uint8"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "13557:44:0"
+            },
+            "returnParameters": {
+              "id": 1150,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 1147,
+                  "name": "results",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1223,
+                  "src": "13623:24:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
+                    "typeString": "address[]"
+                  },
+                  "typeName": {
+                    "baseType": {
+                      "id": 1145,
+                      "name": "address",
+                      "nodeType": "ElementaryTypeName",
+                      "src": "13623:7:0",
+                      "stateMutability": "nonpayable",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "id": 1146,
+                    "length": null,
+                    "nodeType": "ArrayTypeName",
+                    "src": "13623:9:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                      "typeString": "address[]"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 1149,
+                  "name": "next",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1223,
+                  "src": "13649:11:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint48",
+                    "typeString": "uint48"
+                  },
+                  "typeName": {
+                    "id": 1148,
+                    "name": "uint48",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "13649:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "13622:39:0"
+            },
+            "scope": 1224,
+            "src": "13536:759:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "public"
+          }
+        ],
+        "scope": 1225,
+        "src": "769:13528:0"
+      }
+    ],
+    "src": "0:14297:0"
+  },
+  "legacyAST": {
+    "absolutePath": "/home/fer/repos/protofire/gnosis/safe-modules/allowances/contracts/AlowanceModule.sol",
+    "exportedSymbols": {
+      "AllowanceModule": [
+        1224
+      ],
+      "GnosisSafe": [
+        18
+      ]
+    },
+    "id": 1225,
+    "nodeType": "SourceUnit",
+    "nodes": [
+      {
+        "id": 1,
+        "literals": [
+          "solidity",
+          ">=",
+          "0.5",
+          ".0",
+          "<",
+          "0.7",
+          ".0"
+        ],
+        "nodeType": "PragmaDirective",
+        "src": "0:31:0"
+      },
+      {
+        "absolutePath": "@gnosis.pm/safe-contracts/contracts/common/Enum.sol",
+        "file": "@gnosis.pm/safe-contracts/contracts/common/Enum.sol",
+        "id": 2,
+        "nodeType": "ImportDirective",
+        "scope": 1225,
+        "sourceUnit": 3236,
+        "src": "33:61:0",
+        "symbolAliases": [],
+        "unitAlias": ""
+      },
+      {
+        "absolutePath": "@gnosis.pm/safe-contracts/contracts/common/SignatureDecoder.sol",
+        "file": "@gnosis.pm/safe-contracts/contracts/common/SignatureDecoder.sol",
+        "id": 3,
+        "nodeType": "ImportDirective",
+        "scope": 1225,
+        "sourceUnit": 3371,
+        "src": "95:73:0",
+        "symbolAliases": [],
+        "unitAlias": ""
+      },
+      {
+        "absolutePath": "@gnosis.pm/safe-contracts/contracts/interfaces/ISignatureValidator.sol",
+        "file": "@gnosis.pm/safe-contracts/contracts/interfaces/ISignatureValidator.sol",
+        "id": 4,
+        "nodeType": "ImportDirective",
+        "scope": 1225,
+        "sourceUnit": 3517,
+        "src": "169:80:0",
+        "symbolAliases": [],
+        "unitAlias": ""
+      },
+      {
+        "baseContracts": [],
+        "contractDependencies": [],
+        "contractKind": "interface",
+        "documentation": null,
+        "fullyImplemented": false,
+        "id": 18,
+        "linearizedBaseContracts": [
+          18
+        ],
+        "name": "GnosisSafe",
+        "nodeType": "ContractDefinition",
+        "nodes": [
+          {
+            "body": null,
+            "documentation": "@dev Allows a Module to execute a Safe transaction without any further confirmations.\n @param to Destination address of module transaction.\n @param value Ether value of module transaction.\n @param data Data payload of module transaction.\n @param operation Operation type of module transaction.",
+            "id": 17,
+            "implemented": false,
+            "kind": "function",
+            "modifiers": [],
+            "name": "execTransactionFromModule",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 13,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 6,
+                  "name": "to",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 17,
+                  "src": "643:10:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 5,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "643:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 8,
+                  "name": "value",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 17,
+                  "src": "655:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint256",
+                    "typeString": "uint256"
+                  },
+                  "typeName": {
+                    "id": 7,
+                    "name": "uint256",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "655:7:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 10,
+                  "name": "data",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 17,
+                  "src": "670:19:0",
+                  "stateVariable": false,
+                  "storageLocation": "calldata",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_calldata_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 9,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "670:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 12,
+                  "name": "operation",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 17,
+                  "src": "691:24:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_enum$_Operation_$3234",
+                    "typeString": "enum Enum.Operation"
+                  },
+                  "typeName": {
+                    "contractScope": null,
+                    "id": 11,
+                    "name": "Enum.Operation",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 3234,
+                    "src": "691:14:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_enum$_Operation_$3234",
+                      "typeString": "enum Enum.Operation"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "642:74:0"
+            },
+            "returnParameters": {
+              "id": 16,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 15,
+                  "name": "success",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 17,
+                  "src": "751:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bool",
+                    "typeString": "bool"
+                  },
+                  "typeName": {
+                    "id": 14,
+                    "name": "bool",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "751:4:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "750:14:0"
+            },
+            "scope": 18,
+            "src": "608:157:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "external"
+          }
+        ],
+        "scope": 1225,
+        "src": "251:516:0"
+      },
+      {
+        "baseContracts": [
+          {
+            "arguments": null,
+            "baseName": {
+              "contractScope": null,
+              "id": 19,
+              "name": "SignatureDecoder",
+              "nodeType": "UserDefinedTypeName",
+              "referencedDeclaration": 3370,
+              "src": "797:16:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_contract$_SignatureDecoder_$3370",
+                "typeString": "contract SignatureDecoder"
+              }
+            },
+            "id": 20,
+            "nodeType": "InheritanceSpecifier",
+            "src": "797:16:0"
+          },
+          {
+            "arguments": null,
+            "baseName": {
+              "contractScope": null,
+              "id": 21,
+              "name": "ISignatureValidatorConstants",
+              "nodeType": "UserDefinedTypeName",
+              "referencedDeclaration": 3504,
+              "src": "815:28:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_contract$_ISignatureValidatorConstants_$3504",
+                "typeString": "contract ISignatureValidatorConstants"
+              }
+            },
+            "id": 22,
+            "nodeType": "InheritanceSpecifier",
+            "src": "815:28:0"
+          }
+        ],
+        "contractDependencies": [
+          3370,
+          3504
+        ],
+        "contractKind": "contract",
+        "documentation": null,
+        "fullyImplemented": true,
+        "id": 1224,
+        "linearizedBaseContracts": [
+          1224,
+          3504,
+          3370
+        ],
+        "name": "AllowanceModule",
+        "nodeType": "ContractDefinition",
+        "nodes": [
+          {
+            "constant": true,
+            "id": 25,
+            "name": "NAME",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "851:48:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_string_memory",
+              "typeString": "string"
+            },
+            "typeName": {
+              "id": 23,
+              "name": "string",
+              "nodeType": "ElementaryTypeName",
+              "src": "851:6:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_string_storage_ptr",
+                "typeString": "string"
+              }
+            },
+            "value": {
+              "argumentTypes": null,
+              "hexValue": "416c6c6f77616e6365204d6f64756c65",
+              "id": 24,
+              "isConstant": false,
+              "isLValue": false,
+              "isPure": true,
+              "kind": "string",
+              "lValueRequested": false,
+              "nodeType": "Literal",
+              "src": "881:18:0",
+              "subdenomination": null,
+              "typeDescriptions": {
+                "typeIdentifier": "t_stringliteral_08f58094bad74d8c1150a9739fed54fd2f5fa3e2ab1381a21213c5b33d83bad3",
+                "typeString": "literal_string \"Allowance Module\""
+              },
+              "value": "Allowance Module"
+            },
+            "visibility": "public"
+          },
+          {
+            "constant": true,
+            "id": 28,
+            "name": "VERSION",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "905:40:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_string_memory",
+              "typeString": "string"
+            },
+            "typeName": {
+              "id": 26,
+              "name": "string",
+              "nodeType": "ElementaryTypeName",
+              "src": "905:6:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_string_storage_ptr",
+                "typeString": "string"
+              }
+            },
+            "value": {
+              "argumentTypes": null,
+              "hexValue": "302e312e30",
+              "id": 27,
+              "isConstant": false,
+              "isLValue": false,
+              "isPure": true,
+              "kind": "string",
+              "lValueRequested": false,
+              "nodeType": "Literal",
+              "src": "938:7:0",
+              "subdenomination": null,
+              "typeDescriptions": {
+                "typeIdentifier": "t_stringliteral_aa7cdbe2cce2ec7b606b0e199ddd9b264a6e645e767fb8479a7917dcd1b8693f",
+                "typeString": "literal_string \"0.1.0\""
+              },
+              "value": "0.1.0"
+            },
+            "visibility": "public"
+          },
+          {
+            "constant": true,
+            "id": 31,
+            "name": "DOMAIN_SEPARATOR_TYPEHASH",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1030:118:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_bytes32",
+              "typeString": "bytes32"
+            },
+            "typeName": {
+              "id": 29,
+              "name": "bytes32",
+              "nodeType": "ElementaryTypeName",
+              "src": "1030:7:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_bytes32",
+                "typeString": "bytes32"
+              }
+            },
+            "value": {
+              "argumentTypes": null,
+              "hexValue": "307830333561666638336438363933376433356233326530346630646463366666343639323930656566326631623639326438613831356338393430346434373439",
+              "id": 30,
+              "isConstant": false,
+              "isLValue": false,
+              "isPure": true,
+              "kind": "number",
+              "lValueRequested": false,
+              "nodeType": "Literal",
+              "src": "1082:66:0",
+              "subdenomination": null,
+              "typeDescriptions": {
+                "typeIdentifier": "t_rational_1517718281442037948617199096126532355110765202990829672390711201829802035017_by_1",
+                "typeString": "int_const 1517...(68 digits omitted)...5017"
+              },
+              "value": "0x035aff83d86937d35b32e04f0ddc6ff469290eef2f1b692d8a815c89404d4749"
+            },
+            "visibility": "public"
+          },
+          {
+            "constant": true,
+            "id": 36,
+            "name": "ALLOWANCE_TRANSFER_TYPEHASH",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1186:189:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_bytes32",
+              "typeString": "bytes32"
+            },
+            "typeName": {
+              "id": 32,
+              "name": "bytes32",
+              "nodeType": "ElementaryTypeName",
+              "src": "1186:7:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_bytes32",
+                "typeString": "bytes32"
+              }
+            },
+            "value": {
+              "argumentTypes": null,
+              "arguments": [
+                {
+                  "argumentTypes": null,
+                  "hexValue": "416c6c6f77616e63655472616e73666572286164647265737320736166652c6164647265737320746f6b656e2c75696e74393620616d6f756e742c61646472657373207061796d656e74546f6b656e2c75696e743936207061796d656e742c75696e743136206e6f6e636529",
+                  "id": 34,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": true,
+                  "kind": "string",
+                  "lValueRequested": false,
+                  "nodeType": "Literal",
+                  "src": "1259:110:0",
+                  "subdenomination": null,
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_stringliteral_80b006280932094e7cc965863eb5118dc07e5d272c6670c4a7c87299e04fceeb",
+                    "typeString": "literal_string \"AllowanceTransfer(address safe,address token,uint96 amount,address paymentToken,uint96 payment,uint16 nonce)\""
+                  },
+                  "value": "AllowanceTransfer(address safe,address token,uint96 amount,address paymentToken,uint96 payment,uint16 nonce)"
+                }
+              ],
+              "expression": {
+                "argumentTypes": [
+                  {
+                    "typeIdentifier": "t_stringliteral_80b006280932094e7cc965863eb5118dc07e5d272c6670c4a7c87299e04fceeb",
+                    "typeString": "literal_string \"AllowanceTransfer(address safe,address token,uint96 amount,address paymentToken,uint96 payment,uint16 nonce)\""
+                  }
+                ],
+                "id": 33,
+                "name": "keccak256",
+                "nodeType": "Identifier",
+                "overloadedDeclarations": [],
+                "referencedDeclaration": 4971,
+                "src": "1240:9:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                  "typeString": "function (bytes memory) pure returns (bytes32)"
+                }
+              },
+              "id": 35,
+              "isConstant": false,
+              "isLValue": false,
+              "isPure": true,
+              "kind": "functionCall",
+              "lValueRequested": false,
+              "names": [],
+              "nodeType": "FunctionCall",
+              "src": "1240:135:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_bytes32",
+                "typeString": "bytes32"
+              }
+            },
+            "visibility": "public"
+          },
+          {
+            "constant": false,
+            "id": 44,
+            "name": "allowances",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1419:88:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$_$",
+              "typeString": "mapping(address => mapping(address => mapping(address => struct AllowanceModule.Allowance)))"
+            },
+            "typeName": {
+              "id": 43,
+              "keyType": {
+                "id": 37,
+                "name": "address",
+                "nodeType": "ElementaryTypeName",
+                "src": "1427:7:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_address",
+                  "typeString": "address"
+                }
+              },
+              "nodeType": "Mapping",
+              "src": "1419:70:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$_$",
+                "typeString": "mapping(address => mapping(address => mapping(address => struct AllowanceModule.Allowance)))"
+              },
+              "valueType": {
+                "id": 42,
+                "keyType": {
+                  "id": 38,
+                  "name": "address",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1447:7:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  }
+                },
+                "nodeType": "Mapping",
+                "src": "1438:50:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$",
+                  "typeString": "mapping(address => mapping(address => struct AllowanceModule.Allowance))"
+                },
+                "valueType": {
+                  "id": 41,
+                  "keyType": {
+                    "id": 39,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "1466:7:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "nodeType": "Mapping",
+                  "src": "1458:29:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$",
+                    "typeString": "mapping(address => struct AllowanceModule.Allowance)"
+                  },
+                  "valueType": {
+                    "contractScope": null,
+                    "id": 40,
+                    "name": "Allowance",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 81,
+                    "src": "1477:9:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                      "typeString": "struct AllowanceModule.Allowance"
+                    }
+                  }
+                }
+              }
+            },
+            "value": null,
+            "visibility": "public"
+          },
+          {
+            "constant": false,
+            "id": 51,
+            "name": "tokens",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1513:64:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$_$",
+              "typeString": "mapping(address => mapping(address => address[]))"
+            },
+            "typeName": {
+              "id": 50,
+              "keyType": {
+                "id": 45,
+                "name": "address",
+                "nodeType": "ElementaryTypeName",
+                "src": "1521:7:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_address",
+                  "typeString": "address"
+                }
+              },
+              "nodeType": "Mapping",
+              "src": "1513:50:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$_$",
+                "typeString": "mapping(address => mapping(address => address[]))"
+              },
+              "valueType": {
+                "id": 49,
+                "keyType": {
+                  "id": 46,
+                  "name": "address",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1541:7:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  }
+                },
+                "nodeType": "Mapping",
+                "src": "1532:30:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$",
+                  "typeString": "mapping(address => address[])"
+                },
+                "valueType": {
+                  "baseType": {
+                    "id": 47,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "1552:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "id": 48,
+                  "length": null,
+                  "nodeType": "ArrayTypeName",
+                  "src": "1552:9:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                    "typeString": "address[]"
+                  }
+                }
+              }
+            },
+            "value": null,
+            "visibility": "public"
+          },
+          {
+            "constant": false,
+            "id": 57,
+            "name": "delegates",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1583:65:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+              "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate))"
+            },
+            "typeName": {
+              "id": 56,
+              "keyType": {
+                "id": 52,
+                "name": "address",
+                "nodeType": "ElementaryTypeName",
+                "src": "1591:7:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_address",
+                  "typeString": "address"
+                }
+              },
+              "nodeType": "Mapping",
+              "src": "1583:48:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate))"
+              },
+              "valueType": {
+                "id": 55,
+                "keyType": {
+                  "id": 53,
+                  "name": "uint48",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1611:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint48",
+                    "typeString": "uint48"
+                  }
+                },
+                "nodeType": "Mapping",
+                "src": "1602:28:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                  "typeString": "mapping(uint48 => struct AllowanceModule.Delegate)"
+                },
+                "valueType": {
+                  "contractScope": null,
+                  "id": 54,
+                  "name": "Delegate",
+                  "nodeType": "UserDefinedTypeName",
+                  "referencedDeclaration": 70,
+                  "src": "1621:8:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_struct$_Delegate_$70_storage_ptr",
+                    "typeString": "struct AllowanceModule.Delegate"
+                  }
+                }
+              }
+            },
+            "value": null,
+            "visibility": "public"
+          },
+          {
+            "constant": false,
+            "id": 61,
+            "name": "delegatesStart",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1654:48:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_mapping$_t_address_$_t_uint48_$",
+              "typeString": "mapping(address => uint48)"
+            },
+            "typeName": {
+              "id": 60,
+              "keyType": {
+                "id": 58,
+                "name": "address",
+                "nodeType": "ElementaryTypeName",
+                "src": "1662:7:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_address",
+                  "typeString": "address"
+                }
+              },
+              "nodeType": "Mapping",
+              "src": "1654:26:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_mapping$_t_address_$_t_uint48_$",
+                "typeString": "mapping(address => uint48)"
+              },
+              "valueType": {
+                "id": 59,
+                "name": "uint48",
+                "nodeType": "ElementaryTypeName",
+                "src": "1673:6:0",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint48",
+                  "typeString": "uint48"
+                }
+              }
+            },
+            "value": null,
+            "visibility": "public"
+          },
+          {
+            "constant": false,
+            "id": 63,
+            "name": "domainSeparator",
+            "nodeType": "VariableDeclaration",
+            "scope": 1224,
+            "src": "1708:30:0",
+            "stateVariable": true,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_bytes32",
+              "typeString": "bytes32"
+            },
+            "typeName": {
+              "id": 62,
+              "name": "bytes32",
+              "nodeType": "ElementaryTypeName",
+              "src": "1708:7:0",
+              "typeDescriptions": {
+                "typeIdentifier": "t_bytes32",
+                "typeString": "bytes32"
+              }
+            },
+            "value": null,
+            "visibility": "public"
+          },
+          {
+            "canonicalName": "AllowanceModule.Delegate",
+            "id": 70,
+            "members": [
+              {
+                "constant": false,
+                "id": 65,
+                "name": "delegate",
+                "nodeType": "VariableDeclaration",
+                "scope": 70,
+                "src": "1771:16:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_address",
+                  "typeString": "address"
+                },
+                "typeName": {
+                  "id": 64,
+                  "name": "address",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1771:7:0",
+                  "stateMutability": "nonpayable",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 67,
+                "name": "prev",
+                "nodeType": "VariableDeclaration",
+                "scope": 70,
+                "src": "1797:11:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint48",
+                  "typeString": "uint48"
+                },
+                "typeName": {
+                  "id": 66,
+                  "name": "uint48",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1797:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint48",
+                    "typeString": "uint48"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 69,
+                "name": "next",
+                "nodeType": "VariableDeclaration",
+                "scope": 70,
+                "src": "1818:11:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint48",
+                  "typeString": "uint48"
+                },
+                "typeName": {
+                  "id": 68,
+                  "name": "uint48",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1818:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint48",
+                    "typeString": "uint48"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              }
+            ],
+            "name": "Delegate",
+            "nodeType": "StructDefinition",
+            "scope": 1224,
+            "src": "1745:91:0",
+            "visibility": "public"
+          },
+          {
+            "canonicalName": "AllowanceModule.Allowance",
+            "id": 81,
+            "members": [
+              {
+                "constant": false,
+                "id": 72,
+                "name": "amount",
+                "nodeType": "VariableDeclaration",
+                "scope": 81,
+                "src": "1869:13:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint96",
+                  "typeString": "uint96"
+                },
+                "typeName": {
+                  "id": 71,
+                  "name": "uint96",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1869:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 74,
+                "name": "spent",
+                "nodeType": "VariableDeclaration",
+                "scope": 81,
+                "src": "1892:12:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint96",
+                  "typeString": "uint96"
+                },
+                "typeName": {
+                  "id": 73,
+                  "name": "uint96",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1892:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 76,
+                "name": "resetTimeMin",
+                "nodeType": "VariableDeclaration",
+                "scope": 81,
+                "src": "1914:19:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint16",
+                  "typeString": "uint16"
+                },
+                "typeName": {
+                  "id": 75,
+                  "name": "uint16",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1914:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 78,
+                "name": "lastResetMin",
+                "nodeType": "VariableDeclaration",
+                "scope": 81,
+                "src": "1985:19:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint32",
+                  "typeString": "uint32"
+                },
+                "typeName": {
+                  "id": 77,
+                  "name": "uint32",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "1985:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint32",
+                    "typeString": "uint32"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 80,
+                "name": "nonce",
+                "nodeType": "VariableDeclaration",
+                "scope": 81,
+                "src": "2014:12:0",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {
+                  "typeIdentifier": "t_uint16",
+                  "typeString": "uint16"
+                },
+                "typeName": {
+                  "id": 79,
+                  "name": "uint16",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "2014:6:0",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  }
+                },
+                "value": null,
+                "visibility": "internal"
+              }
+            ],
+            "name": "Allowance",
+            "nodeType": "StructDefinition",
+            "scope": 1224,
+            "src": "1842:191:0",
+            "visibility": "public"
+          },
+          {
+            "anonymous": false,
+            "documentation": null,
+            "id": 87,
+            "name": "AddDelegate",
+            "nodeType": "EventDefinition",
+            "parameters": {
+              "id": 86,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 83,
+                  "indexed": true,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 87,
+                  "src": "2057:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 82,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2057:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 85,
+                  "indexed": false,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 87,
+                  "src": "2079:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 84,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2079:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "2056:40:0"
+            },
+            "src": "2039:58:0"
+          },
+          {
+            "anonymous": false,
+            "documentation": null,
+            "id": 93,
+            "name": "RemoveDelegate",
+            "nodeType": "EventDefinition",
+            "parameters": {
+              "id": 92,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 89,
+                  "indexed": true,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 93,
+                  "src": "2123:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 88,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2123:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 91,
+                  "indexed": false,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 93,
+                  "src": "2145:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 90,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2145:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "2122:40:0"
+            },
+            "src": "2102:61:0"
+          },
+          {
+            "anonymous": false,
+            "documentation": null,
+            "id": 107,
+            "name": "ExecuteAllowanceTransfer",
+            "nodeType": "EventDefinition",
+            "parameters": {
+              "id": 106,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 95,
+                  "indexed": true,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 107,
+                  "src": "2199:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 94,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2199:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 97,
+                  "indexed": false,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 107,
+                  "src": "2221:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 96,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2221:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 99,
+                  "indexed": false,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 107,
+                  "src": "2239:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 98,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2239:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 101,
+                  "indexed": false,
+                  "name": "to",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 107,
+                  "src": "2254:10:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 100,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2254:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 103,
+                  "indexed": false,
+                  "name": "value",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 107,
+                  "src": "2266:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 102,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2266:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 105,
+                  "indexed": false,
+                  "name": "nonce",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 107,
+                  "src": "2280:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  },
+                  "typeName": {
+                    "id": 104,
+                    "name": "uint16",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2280:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "2198:95:0"
+            },
+            "src": "2168:126:0"
+          },
+          {
+            "anonymous": false,
+            "documentation": null,
+            "id": 119,
+            "name": "SetAllowance",
+            "nodeType": "EventDefinition",
+            "parameters": {
+              "id": 118,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 109,
+                  "indexed": true,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 119,
+                  "src": "2318:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 108,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2318:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 111,
+                  "indexed": false,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 119,
+                  "src": "2340:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 110,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2340:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 113,
+                  "indexed": false,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 119,
+                  "src": "2358:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 112,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2358:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 115,
+                  "indexed": false,
+                  "name": "allowanceAmount",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 119,
+                  "src": "2373:22:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 114,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2373:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 117,
+                  "indexed": false,
+                  "name": "resetTime",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 119,
+                  "src": "2397:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  },
+                  "typeName": {
+                    "id": 116,
+                    "name": "uint16",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "2397:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "2317:97:0"
+            },
+            "src": "2299:116:0"
+          },
+          {
+            "body": {
+              "id": 132,
+              "nodeType": "Block",
+              "src": "2442:119:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 130,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "id": 122,
+                      "name": "domainSeparator",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 63,
+                      "src": "2482:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bytes32",
+                        "typeString": "bytes32"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "id": 126,
+                              "name": "DOMAIN_SEPARATOR_TYPEHASH",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 31,
+                              "src": "2521:25:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bytes32",
+                                "typeString": "bytes32"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 127,
+                              "name": "this",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 5001,
+                              "src": "2548:4:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_AllowanceModule_$1224",
+                                "typeString": "contract AllowanceModule"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bytes32",
+                                "typeString": "bytes32"
+                              },
+                              {
+                                "typeIdentifier": "t_contract$_AllowanceModule_$1224",
+                                "typeString": "contract AllowanceModule"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 124,
+                              "name": "abi",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4964,
+                              "src": "2510:3:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_magic_abi",
+                                "typeString": "abi"
+                              }
+                            },
+                            "id": 125,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "lValueRequested": false,
+                            "memberName": "encode",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "2510:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_abiencode_pure$__$returns$_t_bytes_memory_ptr_$",
+                              "typeString": "function () pure returns (bytes memory)"
+                            }
+                          },
+                          "id": 128,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "2510:43:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bytes_memory_ptr",
+                            "typeString": "bytes memory"
+                          }
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_bytes_memory_ptr",
+                            "typeString": "bytes memory"
+                          }
+                        ],
+                        "id": 123,
+                        "name": "keccak256",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 4971,
+                        "src": "2500:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                          "typeString": "function (bytes memory) pure returns (bytes32)"
+                        }
+                      },
+                      "id": 129,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "functionCall",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "2500:54:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bytes32",
+                        "typeString": "bytes32"
+                      }
+                    },
+                    "src": "2482:72:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes32",
+                      "typeString": "bytes32"
+                    }
+                  },
+                  "id": 131,
+                  "nodeType": "ExpressionStatement",
+                  "src": "2482:72:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 133,
+            "implemented": true,
+            "kind": "constructor",
+            "modifiers": [],
+            "name": "",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 120,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "2432:2:0"
+            },
+            "returnParameters": {
+              "id": 121,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "2442:0:0"
+            },
+            "scope": 1224,
+            "src": "2421:140:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 267,
+              "nodeType": "Block",
+              "src": "3153:1171:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        "id": 157,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "baseExpression": {
+                              "argumentTypes": null,
+                              "baseExpression": {
+                                "argumentTypes": null,
+                                "id": 147,
+                                "name": "delegates",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 57,
+                                "src": "3171:9:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                                  "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                                }
+                              },
+                              "id": 150,
+                              "indexExpression": {
+                                "argumentTypes": null,
+                                "expression": {
+                                  "argumentTypes": null,
+                                  "id": 148,
+                                  "name": "msg",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 4977,
+                                  "src": "3181:3:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_magic_message",
+                                    "typeString": "msg"
+                                  }
+                                },
+                                "id": 149,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "memberName": "sender",
+                                "nodeType": "MemberAccess",
+                                "referencedDeclaration": null,
+                                "src": "3181:10:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address_payable",
+                                  "typeString": "address payable"
+                                }
+                              },
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "nodeType": "IndexAccess",
+                              "src": "3171:21:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                                "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                              }
+                            },
+                            "id": 154,
+                            "indexExpression": {
+                              "argumentTypes": null,
+                              "arguments": [
+                                {
+                                  "argumentTypes": null,
+                                  "id": 152,
+                                  "name": "delegate",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 135,
+                                  "src": "3200:8:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                }
+                              ],
+                              "expression": {
+                                "argumentTypes": [
+                                  {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                ],
+                                "id": 151,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": true,
+                                "lValueRequested": false,
+                                "nodeType": "ElementaryTypeNameExpression",
+                                "src": "3193:6:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_type$_t_uint48_$",
+                                  "typeString": "type(uint48)"
+                                },
+                                "typeName": "uint48"
+                              },
+                              "id": 153,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "kind": "typeConversion",
+                              "lValueRequested": false,
+                              "names": [],
+                              "nodeType": "FunctionCall",
+                              "src": "3193:16:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint48",
+                                "typeString": "uint48"
+                              }
+                            },
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "nodeType": "IndexAccess",
+                            "src": "3171:39:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                              "typeString": "struct AllowanceModule.Delegate storage ref"
+                            }
+                          },
+                          "id": 155,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "delegate",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 65,
+                          "src": "3171:48:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "==",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "id": 156,
+                          "name": "delegate",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 135,
+                          "src": "3223:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "src": "3171:60:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "hexValue": "64656c6567617465735b6d73672e73656e6465725d5b75696e7434382864656c6567617465295d2e64656c6567617465203d3d2064656c6567617465",
+                        "id": 158,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "string",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "3233:62:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_stringliteral_58537fa1960fbebccc117b6218b0af08a9f148039299593ea287e665dd534bb1",
+                          "typeString": "literal_string \"delegates[msg.sender][uint48(delegate)].delegate == delegate\""
+                        },
+                        "value": "delegates[msg.sender][uint48(delegate)].delegate == delegate"
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        {
+                          "typeIdentifier": "t_stringliteral_58537fa1960fbebccc117b6218b0af08a9f148039299593ea287e665dd534bb1",
+                          "typeString": "literal_string \"delegates[msg.sender][uint48(delegate)].delegate == delegate\""
+                        }
+                      ],
+                      "id": 146,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        4980,
+                        4981
+                      ],
+                      "referencedDeclaration": 4981,
+                      "src": "3163:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                        "typeString": "function (bool,string memory) pure"
+                      }
+                    },
+                    "id": 159,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "3163:133:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 160,
+                  "nodeType": "ExpressionStatement",
+                  "src": "3163:133:0"
+                },
+                {
+                  "assignments": [
+                    162
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 162,
+                      "name": "allowance",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 267,
+                      "src": "3306:26:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                        "typeString": "struct AllowanceModule.Allowance"
+                      },
+                      "typeName": {
+                        "contractScope": null,
+                        "id": 161,
+                        "name": "Allowance",
+                        "nodeType": "UserDefinedTypeName",
+                        "referencedDeclaration": 81,
+                        "src": "3306:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                          "typeString": "struct AllowanceModule.Allowance"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 169,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 164,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "3348:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 165,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "3348:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 166,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 135,
+                        "src": "3360:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 167,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 137,
+                        "src": "3370:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 163,
+                      "name": "getAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 336,
+                      "src": "3335:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$returns$_t_struct$_Allowance_$81_memory_ptr_$",
+                        "typeString": "function (address,address,address) view returns (struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 168,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "3335:41:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                      "typeString": "struct AllowanceModule.Allowance memory"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "3306:70:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    },
+                    "id": 173,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 170,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 162,
+                        "src": "3390:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 171,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "nonce",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 80,
+                      "src": "3390:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "==",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 172,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "3409:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "3390:20:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 191,
+                  "nodeType": "IfStatement",
+                  "src": "3386:210:0",
+                  "trueBody": {
+                    "id": 190,
+                    "nodeType": "Block",
+                    "src": "3412:184:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 178,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 174,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 162,
+                              "src": "3512:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 176,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "nonce",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 80,
+                            "src": "3512:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "hexValue": "31",
+                            "id": 177,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "3530:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_1_by_1",
+                              "typeString": "int_const 1"
+                            },
+                            "value": "1"
+                          },
+                          "src": "3512:19:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint16",
+                            "typeString": "uint16"
+                          }
+                        },
+                        "id": 179,
+                        "nodeType": "ExpressionStatement",
+                        "src": "3512:19:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "id": 187,
+                              "name": "token",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 137,
+                              "src": "3579:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "baseExpression": {
+                                "argumentTypes": null,
+                                "baseExpression": {
+                                  "argumentTypes": null,
+                                  "id": 180,
+                                  "name": "tokens",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 51,
+                                  "src": "3545:6:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$_$",
+                                    "typeString": "mapping(address => mapping(address => address[] storage ref))"
+                                  }
+                                },
+                                "id": 184,
+                                "indexExpression": {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "id": 181,
+                                    "name": "msg",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 4977,
+                                    "src": "3552:3:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_magic_message",
+                                      "typeString": "msg"
+                                    }
+                                  },
+                                  "id": 182,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "memberName": "sender",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": null,
+                                  "src": "3552:10:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_address_payable",
+                                    "typeString": "address payable"
+                                  }
+                                },
+                                "isConstant": false,
+                                "isLValue": true,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "nodeType": "IndexAccess",
+                                "src": "3545:18:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$",
+                                  "typeString": "mapping(address => address[] storage ref)"
+                                }
+                              },
+                              "id": 185,
+                              "indexExpression": {
+                                "argumentTypes": null,
+                                "id": 183,
+                                "name": "delegate",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 135,
+                                "src": "3564:8:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "nodeType": "IndexAccess",
+                              "src": "3545:28:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_array$_t_address_$dyn_storage",
+                                "typeString": "address[] storage ref"
+                              }
+                            },
+                            "id": 186,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "push",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "3545:33:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_arraypush_nonpayable$_t_address_$returns$_t_uint256_$",
+                              "typeString": "function (address) returns (uint256)"
+                            }
+                          },
+                          "id": 188,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "3545:40:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "id": 189,
+                        "nodeType": "ExpressionStatement",
+                        "src": "3545:40:0"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "assignments": [
+                    193
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 193,
+                      "name": "currentMin",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 267,
+                      "src": "3722:17:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint32",
+                        "typeString": "uint32"
+                      },
+                      "typeName": {
+                        "id": 192,
+                        "name": "uint32",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "3722:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint32",
+                          "typeString": "uint32"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 199,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        },
+                        "id": 197,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "id": 195,
+                          "name": "now",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4979,
+                          "src": "3749:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "/",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "3630",
+                          "id": 196,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "3755:2:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_60_by_1",
+                            "typeString": "int_const 60"
+                          },
+                          "value": "60"
+                        },
+                        "src": "3749:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      ],
+                      "id": 194,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "lValueRequested": false,
+                      "nodeType": "ElementaryTypeNameExpression",
+                      "src": "3742:6:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_type$_t_uint32_$",
+                        "typeString": "type(uint32)"
+                      },
+                      "typeName": "uint32"
+                    },
+                    "id": 198,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "typeConversion",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "3742:16:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint32",
+                      "typeString": "uint32"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "3722:36:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint32",
+                      "typeString": "uint32"
+                    },
+                    "id": 202,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 200,
+                      "name": "resetBaseMin",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 143,
+                      "src": "3772:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint32",
+                        "typeString": "uint32"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": ">",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 201,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "3787:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "3772:16:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": {
+                    "condition": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_uint32",
+                        "typeString": "uint32"
+                      },
+                      "id": 228,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 225,
+                          "name": "allowance",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 162,
+                          "src": "3986:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "id": 226,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "lastResetMin",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 78,
+                        "src": "3986:22:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint32",
+                          "typeString": "uint32"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": "==",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "hexValue": "30",
+                        "id": 227,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "number",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "4012:1:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_rational_0_by_1",
+                          "typeString": "int_const 0"
+                        },
+                        "value": "0"
+                      },
+                      "src": "3986:27:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "falseBody": null,
+                    "id": 236,
+                    "nodeType": "IfStatement",
+                    "src": "3982:93:0",
+                    "trueBody": {
+                      "id": 235,
+                      "nodeType": "Block",
+                      "src": "4015:60:0",
+                      "statements": [
+                        {
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 233,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "leftHandSide": {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 229,
+                                "name": "allowance",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 162,
+                                "src": "4029:9:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                  "typeString": "struct AllowanceModule.Allowance memory"
+                                }
+                              },
+                              "id": 231,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": true,
+                              "memberName": "lastResetMin",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 78,
+                              "src": "4029:22:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              }
+                            },
+                            "nodeType": "Assignment",
+                            "operator": "=",
+                            "rightHandSide": {
+                              "argumentTypes": null,
+                              "id": 232,
+                              "name": "currentMin",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 193,
+                              "src": "4054:10:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              }
+                            },
+                            "src": "4029:35:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          },
+                          "id": 234,
+                          "nodeType": "ExpressionStatement",
+                          "src": "4029:35:0"
+                        }
+                      ]
+                    }
+                  },
+                  "id": 237,
+                  "nodeType": "IfStatement",
+                  "src": "3768:307:0",
+                  "trueBody": {
+                    "id": 224,
+                    "nodeType": "Block",
+                    "src": "3790:186:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "commonType": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              },
+                              "id": 206,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "leftExpression": {
+                                "argumentTypes": null,
+                                "id": 204,
+                                "name": "resetBaseMin",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 143,
+                                "src": "3812:12:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_uint32",
+                                  "typeString": "uint32"
+                                }
+                              },
+                              "nodeType": "BinaryOperation",
+                              "operator": "<=",
+                              "rightExpression": {
+                                "argumentTypes": null,
+                                "id": 205,
+                                "name": "currentMin",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 193,
+                                "src": "3828:10:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_uint32",
+                                  "typeString": "uint32"
+                                }
+                              },
+                              "src": "3812:26:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "7265736574426173654d696e203c3d2063757272656e744d696e",
+                              "id": 207,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "string",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "3840:28:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_stringliteral_1ede17760f99a36e22c97a9975aa792b767bce45958763871f51d908d7d840ba",
+                                "typeString": "literal_string \"resetBaseMin <= currentMin\""
+                              },
+                              "value": "resetBaseMin <= currentMin"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              },
+                              {
+                                "typeIdentifier": "t_stringliteral_1ede17760f99a36e22c97a9975aa792b767bce45958763871f51d908d7d840ba",
+                                "typeString": "literal_string \"resetBaseMin <= currentMin\""
+                              }
+                            ],
+                            "id": 203,
+                            "name": "require",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [
+                              4980,
+                              4981
+                            ],
+                            "referencedDeclaration": 4981,
+                            "src": "3804:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                              "typeString": "function (bool,string memory) pure"
+                            }
+                          },
+                          "id": 208,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "3804:65:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 209,
+                        "nodeType": "ExpressionStatement",
+                        "src": "3804:65:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 222,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 210,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 162,
+                              "src": "3883:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 212,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "lastResetMin",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 78,
+                            "src": "3883:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "commonType": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            },
+                            "id": 221,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "leftExpression": {
+                              "argumentTypes": null,
+                              "id": 213,
+                              "name": "currentMin",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 193,
+                              "src": "3908:10:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              }
+                            },
+                            "nodeType": "BinaryOperation",
+                            "operator": "-",
+                            "rightExpression": {
+                              "argumentTypes": null,
+                              "components": [
+                                {
+                                  "argumentTypes": null,
+                                  "commonType": {
+                                    "typeIdentifier": "t_uint32",
+                                    "typeString": "uint32"
+                                  },
+                                  "id": 219,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "leftExpression": {
+                                    "argumentTypes": null,
+                                    "components": [
+                                      {
+                                        "argumentTypes": null,
+                                        "commonType": {
+                                          "typeIdentifier": "t_uint32",
+                                          "typeString": "uint32"
+                                        },
+                                        "id": 216,
+                                        "isConstant": false,
+                                        "isLValue": false,
+                                        "isPure": false,
+                                        "lValueRequested": false,
+                                        "leftExpression": {
+                                          "argumentTypes": null,
+                                          "id": 214,
+                                          "name": "currentMin",
+                                          "nodeType": "Identifier",
+                                          "overloadedDeclarations": [],
+                                          "referencedDeclaration": 193,
+                                          "src": "3923:10:0",
+                                          "typeDescriptions": {
+                                            "typeIdentifier": "t_uint32",
+                                            "typeString": "uint32"
+                                          }
+                                        },
+                                        "nodeType": "BinaryOperation",
+                                        "operator": "-",
+                                        "rightExpression": {
+                                          "argumentTypes": null,
+                                          "id": 215,
+                                          "name": "resetBaseMin",
+                                          "nodeType": "Identifier",
+                                          "overloadedDeclarations": [],
+                                          "referencedDeclaration": 143,
+                                          "src": "3936:12:0",
+                                          "typeDescriptions": {
+                                            "typeIdentifier": "t_uint32",
+                                            "typeString": "uint32"
+                                          }
+                                        },
+                                        "src": "3923:25:0",
+                                        "typeDescriptions": {
+                                          "typeIdentifier": "t_uint32",
+                                          "typeString": "uint32"
+                                        }
+                                      }
+                                    ],
+                                    "id": 217,
+                                    "isConstant": false,
+                                    "isInlineArray": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "nodeType": "TupleExpression",
+                                    "src": "3922:27:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_uint32",
+                                      "typeString": "uint32"
+                                    }
+                                  },
+                                  "nodeType": "BinaryOperation",
+                                  "operator": "%",
+                                  "rightExpression": {
+                                    "argumentTypes": null,
+                                    "id": 218,
+                                    "name": "resetTimeMin",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 141,
+                                    "src": "3952:12:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_uint16",
+                                      "typeString": "uint16"
+                                    }
+                                  },
+                                  "src": "3922:42:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint32",
+                                    "typeString": "uint32"
+                                  }
+                                }
+                              ],
+                              "id": 220,
+                              "isConstant": false,
+                              "isInlineArray": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "nodeType": "TupleExpression",
+                              "src": "3921:44:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              }
+                            },
+                            "src": "3908:57:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          },
+                          "src": "3883:82:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint32",
+                            "typeString": "uint32"
+                          }
+                        },
+                        "id": 223,
+                        "nodeType": "ExpressionStatement",
+                        "src": "3883:82:0"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 242,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 238,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 162,
+                        "src": "4084:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 240,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "resetTimeMin",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 76,
+                      "src": "4084:22:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 241,
+                      "name": "resetTimeMin",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 141,
+                      "src": "4109:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      }
+                    },
+                    "src": "4084:37:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "id": 243,
+                  "nodeType": "ExpressionStatement",
+                  "src": "4084:37:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 248,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 244,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 162,
+                        "src": "4131:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 246,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "amount",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 72,
+                      "src": "4131:16:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 247,
+                      "name": "allowanceAmount",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 139,
+                      "src": "4150:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "src": "4131:34:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "id": 249,
+                  "nodeType": "ExpressionStatement",
+                  "src": "4131:34:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 251,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "4191:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 252,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "4191:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 253,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 135,
+                        "src": "4203:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 254,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 137,
+                        "src": "4213:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 255,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 162,
+                        "src": "4220:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      ],
+                      "id": 250,
+                      "name": "updateAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 358,
+                      "src": "4175:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_struct$_Allowance_$81_memory_ptr_$returns$__$",
+                        "typeString": "function (address,address,address,struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 256,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "4175:55:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 257,
+                  "nodeType": "ExpressionStatement",
+                  "src": "4175:55:0"
+                },
+                {
+                  "eventCall": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 259,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "4258:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 260,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "4258:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 261,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 135,
+                        "src": "4270:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 262,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 137,
+                        "src": "4280:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 263,
+                        "name": "allowanceAmount",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 139,
+                        "src": "4287:15:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 264,
+                        "name": "resetTimeMin",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 141,
+                        "src": "4304:12:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        },
+                        {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      ],
+                      "id": 258,
+                      "name": "SetAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 119,
+                      "src": "4245:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint96_$_t_uint16_$returns$__$",
+                        "typeString": "function (address,address,address,uint96,uint16)"
+                      }
+                    },
+                    "id": 265,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "4245:72:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 266,
+                  "nodeType": "EmitStatement",
+                  "src": "4240:77:0"
+                }
+              ]
+            },
+            "documentation": "@dev Allows to update the allowance for a specified token. This can only be done via a Safe transaction.\n @param delegate Delegate whose allowance should be updated.\n @param token Token contract address.\n @param allowanceAmount allowance in smallest token unit.\n @param resetTimeMin Time after which the allowance should reset\n @param resetBaseMin Time based on which the reset time should be increased",
+            "id": 268,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "setAllowance",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 144,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 135,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 268,
+                  "src": "3035:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 134,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "3035:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 137,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 268,
+                  "src": "3053:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 136,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "3053:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 139,
+                  "name": "allowanceAmount",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 268,
+                  "src": "3068:22:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 138,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "3068:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 141,
+                  "name": "resetTimeMin",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 268,
+                  "src": "3092:19:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  },
+                  "typeName": {
+                    "id": 140,
+                    "name": "uint16",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "3092:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 143,
+                  "name": "resetBaseMin",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 268,
+                  "src": "3113:19:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint32",
+                    "typeString": "uint32"
+                  },
+                  "typeName": {
+                    "id": 142,
+                    "name": "uint32",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "3113:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint32",
+                      "typeString": "uint32"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "3034:99:0"
+            },
+            "returnParameters": {
+              "id": 145,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "3153:0:0"
+            },
+            "scope": 1224,
+            "src": "3013:1311:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 335,
+              "nodeType": "Block",
+              "src": "4449:462:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 287,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "id": 279,
+                      "name": "allowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 277,
+                      "src": "4459:9:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                        "typeString": "struct AllowanceModule.Allowance memory"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 280,
+                            "name": "allowances",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 44,
+                            "src": "4471:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$_$",
+                              "typeString": "mapping(address => mapping(address => mapping(address => struct AllowanceModule.Allowance storage ref)))"
+                            }
+                          },
+                          "id": 282,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "id": 281,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 270,
+                            "src": "4482:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "4471:16:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$",
+                            "typeString": "mapping(address => mapping(address => struct AllowanceModule.Allowance storage ref))"
+                          }
+                        },
+                        "id": 284,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "id": 283,
+                          "name": "delegate",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 272,
+                          "src": "4488:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "4471:26:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$",
+                          "typeString": "mapping(address => struct AllowanceModule.Allowance storage ref)"
+                        }
+                      },
+                      "id": 286,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "id": 285,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 274,
+                        "src": "4498:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "IndexAccess",
+                      "src": "4471:33:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_storage",
+                        "typeString": "struct AllowanceModule.Allowance storage ref"
+                      }
+                    },
+                    "src": "4459:45:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                      "typeString": "struct AllowanceModule.Allowance memory"
+                    }
+                  },
+                  "id": 288,
+                  "nodeType": "ExpressionStatement",
+                  "src": "4459:45:0"
+                },
+                {
+                  "assignments": [
+                    290
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 290,
+                      "name": "currentMin",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 335,
+                      "src": "4576:17:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint32",
+                        "typeString": "uint32"
+                      },
+                      "typeName": {
+                        "id": 289,
+                        "name": "uint32",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "4576:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint32",
+                          "typeString": "uint32"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 296,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        },
+                        "id": 294,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "id": 292,
+                          "name": "now",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4979,
+                          "src": "4603:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "/",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "3630",
+                          "id": 293,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "4609:2:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_60_by_1",
+                            "typeString": "int_const 60"
+                          },
+                          "value": "60"
+                        },
+                        "src": "4603:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      ],
+                      "id": 291,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "lValueRequested": false,
+                      "nodeType": "ElementaryTypeNameExpression",
+                      "src": "4596:6:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_type$_t_uint32_$",
+                        "typeString": "type(uint32)"
+                      },
+                      "typeName": "uint32"
+                    },
+                    "id": 295,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "typeConversion",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "4596:16:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint32",
+                      "typeString": "uint32"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "4576:36:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    },
+                    "id": 308,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      },
+                      "id": 300,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 297,
+                          "name": "allowance",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 277,
+                          "src": "4626:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "id": 298,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "resetTimeMin",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 76,
+                        "src": "4626:22:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": ">",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "hexValue": "30",
+                        "id": 299,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "number",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "4651:1:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_rational_0_by_1",
+                          "typeString": "int_const 0"
+                        },
+                        "value": "0"
+                      },
+                      "src": "4626:26:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "&&",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_uint32",
+                        "typeString": "uint32"
+                      },
+                      "id": 307,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 301,
+                          "name": "allowance",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 277,
+                          "src": "4656:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "id": 302,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "lastResetMin",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 78,
+                        "src": "4656:22:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint32",
+                          "typeString": "uint32"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": "<=",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint32",
+                          "typeString": "uint32"
+                        },
+                        "id": 306,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "id": 303,
+                          "name": "currentMin",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 290,
+                          "src": "4682:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint32",
+                            "typeString": "uint32"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "-",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 304,
+                            "name": "allowance",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 277,
+                            "src": "4695:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                              "typeString": "struct AllowanceModule.Allowance memory"
+                            }
+                          },
+                          "id": 305,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "resetTimeMin",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 76,
+                          "src": "4695:22:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint16",
+                            "typeString": "uint16"
+                          }
+                        },
+                        "src": "4682:35:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint32",
+                          "typeString": "uint32"
+                        }
+                      },
+                      "src": "4656:61:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "src": "4626:91:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 332,
+                  "nodeType": "IfStatement",
+                  "src": "4622:257:0",
+                  "trueBody": {
+                    "id": 331,
+                    "nodeType": "Block",
+                    "src": "4719:160:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 313,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 309,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 277,
+                              "src": "4733:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 311,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "spent",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 74,
+                            "src": "4733:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 312,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "4751:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          },
+                          "src": "4733:19:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          }
+                        },
+                        "id": 314,
+                        "nodeType": "ExpressionStatement",
+                        "src": "4733:19:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 329,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 315,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 277,
+                              "src": "4766:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 317,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "lastResetMin",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 78,
+                            "src": "4766:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "commonType": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            },
+                            "id": 328,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "leftExpression": {
+                              "argumentTypes": null,
+                              "id": 318,
+                              "name": "currentMin",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 290,
+                              "src": "4791:10:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              }
+                            },
+                            "nodeType": "BinaryOperation",
+                            "operator": "-",
+                            "rightExpression": {
+                              "argumentTypes": null,
+                              "components": [
+                                {
+                                  "argumentTypes": null,
+                                  "commonType": {
+                                    "typeIdentifier": "t_uint32",
+                                    "typeString": "uint32"
+                                  },
+                                  "id": 326,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "leftExpression": {
+                                    "argumentTypes": null,
+                                    "components": [
+                                      {
+                                        "argumentTypes": null,
+                                        "commonType": {
+                                          "typeIdentifier": "t_uint32",
+                                          "typeString": "uint32"
+                                        },
+                                        "id": 322,
+                                        "isConstant": false,
+                                        "isLValue": false,
+                                        "isPure": false,
+                                        "lValueRequested": false,
+                                        "leftExpression": {
+                                          "argumentTypes": null,
+                                          "id": 319,
+                                          "name": "currentMin",
+                                          "nodeType": "Identifier",
+                                          "overloadedDeclarations": [],
+                                          "referencedDeclaration": 290,
+                                          "src": "4806:10:0",
+                                          "typeDescriptions": {
+                                            "typeIdentifier": "t_uint32",
+                                            "typeString": "uint32"
+                                          }
+                                        },
+                                        "nodeType": "BinaryOperation",
+                                        "operator": "-",
+                                        "rightExpression": {
+                                          "argumentTypes": null,
+                                          "expression": {
+                                            "argumentTypes": null,
+                                            "id": 320,
+                                            "name": "allowance",
+                                            "nodeType": "Identifier",
+                                            "overloadedDeclarations": [],
+                                            "referencedDeclaration": 277,
+                                            "src": "4819:9:0",
+                                            "typeDescriptions": {
+                                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                              "typeString": "struct AllowanceModule.Allowance memory"
+                                            }
+                                          },
+                                          "id": 321,
+                                          "isConstant": false,
+                                          "isLValue": true,
+                                          "isPure": false,
+                                          "lValueRequested": false,
+                                          "memberName": "lastResetMin",
+                                          "nodeType": "MemberAccess",
+                                          "referencedDeclaration": 78,
+                                          "src": "4819:22:0",
+                                          "typeDescriptions": {
+                                            "typeIdentifier": "t_uint32",
+                                            "typeString": "uint32"
+                                          }
+                                        },
+                                        "src": "4806:35:0",
+                                        "typeDescriptions": {
+                                          "typeIdentifier": "t_uint32",
+                                          "typeString": "uint32"
+                                        }
+                                      }
+                                    ],
+                                    "id": 323,
+                                    "isConstant": false,
+                                    "isInlineArray": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "nodeType": "TupleExpression",
+                                    "src": "4805:37:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_uint32",
+                                      "typeString": "uint32"
+                                    }
+                                  },
+                                  "nodeType": "BinaryOperation",
+                                  "operator": "%",
+                                  "rightExpression": {
+                                    "argumentTypes": null,
+                                    "expression": {
+                                      "argumentTypes": null,
+                                      "id": 324,
+                                      "name": "allowance",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 277,
+                                      "src": "4845:9:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                        "typeString": "struct AllowanceModule.Allowance memory"
+                                      }
+                                    },
+                                    "id": 325,
+                                    "isConstant": false,
+                                    "isLValue": true,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "memberName": "resetTimeMin",
+                                    "nodeType": "MemberAccess",
+                                    "referencedDeclaration": 76,
+                                    "src": "4845:22:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_uint16",
+                                      "typeString": "uint16"
+                                    }
+                                  },
+                                  "src": "4805:62:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint32",
+                                    "typeString": "uint32"
+                                  }
+                                }
+                              ],
+                              "id": 327,
+                              "isConstant": false,
+                              "isInlineArray": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "nodeType": "TupleExpression",
+                              "src": "4804:64:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint32",
+                                "typeString": "uint32"
+                              }
+                            },
+                            "src": "4791:77:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          },
+                          "src": "4766:102:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint32",
+                            "typeString": "uint32"
+                          }
+                        },
+                        "id": 330,
+                        "nodeType": "ExpressionStatement",
+                        "src": "4766:102:0"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 333,
+                    "name": "allowance",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": 277,
+                    "src": "4895:9:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                      "typeString": "struct AllowanceModule.Allowance memory"
+                    }
+                  },
+                  "functionReturnParameters": 278,
+                  "id": 334,
+                  "nodeType": "Return",
+                  "src": "4888:16:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 336,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "getAllowance",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 275,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 270,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 336,
+                  "src": "4352:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 269,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "4352:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 272,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 336,
+                  "src": "4366:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 271,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "4366:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 274,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 336,
+                  "src": "4384:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 273,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "4384:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "4351:47:0"
+            },
+            "returnParameters": {
+              "id": 278,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 277,
+                  "name": "allowance",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 336,
+                  "src": "4421:26:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                    "typeString": "struct AllowanceModule.Allowance"
+                  },
+                  "typeName": {
+                    "contractScope": null,
+                    "id": 276,
+                    "name": "Allowance",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 81,
+                    "src": "4421:9:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                      "typeString": "struct AllowanceModule.Allowance"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "4420:28:0"
+            },
+            "scope": 1224,
+            "src": "4330:581:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "private"
+          },
+          {
+            "body": {
+              "id": 357,
+              "nodeType": "Block",
+              "src": "5025:62:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 355,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 347,
+                            "name": "allowances",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 44,
+                            "src": "5035:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$_$",
+                              "typeString": "mapping(address => mapping(address => mapping(address => struct AllowanceModule.Allowance storage ref)))"
+                            }
+                          },
+                          "id": 351,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "id": 348,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 338,
+                            "src": "5046:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "5035:16:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$_$",
+                            "typeString": "mapping(address => mapping(address => struct AllowanceModule.Allowance storage ref))"
+                          }
+                        },
+                        "id": 352,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "id": 349,
+                          "name": "delegate",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 340,
+                          "src": "5052:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "5035:26:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Allowance_$81_storage_$",
+                          "typeString": "mapping(address => struct AllowanceModule.Allowance storage ref)"
+                        }
+                      },
+                      "id": 353,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "id": 350,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 342,
+                        "src": "5062:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "nodeType": "IndexAccess",
+                      "src": "5035:33:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_storage",
+                        "typeString": "struct AllowanceModule.Allowance storage ref"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 354,
+                      "name": "allowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 344,
+                      "src": "5071:9:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                        "typeString": "struct AllowanceModule.Allowance memory"
+                      }
+                    },
+                    "src": "5035:45:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_storage",
+                      "typeString": "struct AllowanceModule.Allowance storage ref"
+                    }
+                  },
+                  "id": 356,
+                  "nodeType": "ExpressionStatement",
+                  "src": "5035:45:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 358,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "updateAllowance",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 345,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 338,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 358,
+                  "src": "4942:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 337,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "4942:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 340,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 358,
+                  "src": "4956:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 339,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "4956:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 342,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 358,
+                  "src": "4974:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 341,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "4974:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 344,
+                  "name": "allowance",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 358,
+                  "src": "4989:26:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                    "typeString": "struct AllowanceModule.Allowance"
+                  },
+                  "typeName": {
+                    "contractScope": null,
+                    "id": 343,
+                    "name": "Allowance",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 81,
+                    "src": "4989:9:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                      "typeString": "struct AllowanceModule.Allowance"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "4941:75:0"
+            },
+            "returnParameters": {
+              "id": 346,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "5025:0:0"
+            },
+            "scope": 1224,
+            "src": "4917:170:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "private"
+          },
+          {
+            "body": {
+              "id": 388,
+              "nodeType": "Block",
+              "src": "5157:181:0",
+              "statements": [
+                {
+                  "assignments": [
+                    366
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 366,
+                      "name": "allowance",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 388,
+                      "src": "5167:26:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                        "typeString": "struct AllowanceModule.Allowance"
+                      },
+                      "typeName": {
+                        "contractScope": null,
+                        "id": 365,
+                        "name": "Allowance",
+                        "nodeType": "UserDefinedTypeName",
+                        "referencedDeclaration": 81,
+                        "src": "5167:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                          "typeString": "struct AllowanceModule.Allowance"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 373,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 368,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "5209:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 369,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "5209:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 370,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 360,
+                        "src": "5221:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 371,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 362,
+                        "src": "5231:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 367,
+                      "name": "getAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 336,
+                      "src": "5196:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$returns$_t_struct$_Allowance_$81_memory_ptr_$",
+                        "typeString": "function (address,address,address) view returns (struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 372,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "5196:41:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                      "typeString": "struct AllowanceModule.Allowance memory"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "5167:70:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 378,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 374,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 366,
+                        "src": "5247:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 376,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "spent",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 74,
+                      "src": "5247:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 377,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "5265:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "5247:19:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "id": 379,
+                  "nodeType": "ExpressionStatement",
+                  "src": "5247:19:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 381,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "5292:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 382,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "5292:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 383,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 360,
+                        "src": "5304:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 384,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 362,
+                        "src": "5314:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 385,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 366,
+                        "src": "5321:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      ],
+                      "id": 380,
+                      "name": "updateAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 358,
+                      "src": "5276:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_struct$_Allowance_$81_memory_ptr_$returns$__$",
+                        "typeString": "function (address,address,address,struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 386,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "5276:55:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 387,
+                  "nodeType": "ExpressionStatement",
+                  "src": "5276:55:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 389,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "resetAllowance",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 363,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 360,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 389,
+                  "src": "5117:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 359,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5117:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 362,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 389,
+                  "src": "5135:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 361,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5135:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "5116:33:0"
+            },
+            "returnParameters": {
+              "id": 364,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "5157:0:0"
+            },
+            "scope": 1224,
+            "src": "5093:245:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 577,
+              "nodeType": "Block",
+              "src": "5602:1988:0",
+              "statements": [
+                {
+                  "assignments": [
+                    409
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 409,
+                      "name": "allowance",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 577,
+                      "src": "5641:26:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                        "typeString": "struct AllowanceModule.Allowance"
+                      },
+                      "typeName": {
+                        "contractScope": null,
+                        "id": 408,
+                        "name": "Allowance",
+                        "nodeType": "UserDefinedTypeName",
+                        "referencedDeclaration": 81,
+                        "src": "5641:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                          "typeString": "struct AllowanceModule.Allowance"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 417,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "id": 412,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 391,
+                            "src": "5691:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          ],
+                          "id": 411,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "5683:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_address_$",
+                            "typeString": "type(address)"
+                          },
+                          "typeName": "address"
+                        },
+                        "id": 413,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "5683:13:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 414,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 403,
+                        "src": "5698:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 415,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 393,
+                        "src": "5708:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 410,
+                      "name": "getAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 336,
+                      "src": "5670:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$returns$_t_struct$_Allowance_$81_memory_ptr_$",
+                        "typeString": "function (address,address,address) view returns (struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 416,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "5670:44:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                      "typeString": "struct AllowanceModule.Allowance memory"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "5641:73:0"
+                },
+                {
+                  "assignments": [
+                    419
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 419,
+                      "name": "transferHashData",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 577,
+                      "src": "5724:29:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bytes_memory_ptr",
+                        "typeString": "bytes"
+                      },
+                      "typeName": {
+                        "id": 418,
+                        "name": "bytes",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "5724:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_storage_ptr",
+                          "typeString": "bytes"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 432,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "id": 422,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 391,
+                            "src": "5789:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          ],
+                          "id": 421,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "5781:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_address_$",
+                            "typeString": "type(address)"
+                          },
+                          "typeName": "address"
+                        },
+                        "id": 423,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "5781:13:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 424,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 393,
+                        "src": "5796:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 425,
+                        "name": "to",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 395,
+                        "src": "5803:2:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 426,
+                        "name": "amount",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 397,
+                        "src": "5807:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 427,
+                        "name": "paymentToken",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 399,
+                        "src": "5815:12:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 428,
+                        "name": "payment",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 401,
+                        "src": "5829:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 429,
+                          "name": "allowance",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 409,
+                          "src": "5838:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "id": 430,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "nonce",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 80,
+                        "src": "5838:15:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        },
+                        {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      ],
+                      "id": 420,
+                      "name": "generateTransferHashData",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 626,
+                      "src": "5756:24:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_uint96_$_t_address_$_t_uint96_$_t_uint16_$returns$_t_bytes_memory_ptr_$",
+                        "typeString": "function (address,address,address,uint96,address,uint96,uint16) view returns (bytes memory)"
+                      }
+                    },
+                    "id": 431,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "5756:98:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_memory_ptr",
+                      "typeString": "bytes memory"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "5724:130:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 440,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 433,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 409,
+                        "src": "5897:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 435,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "nonce",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 80,
+                      "src": "5897:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      },
+                      "id": 439,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 436,
+                          "name": "allowance",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 409,
+                          "src": "5915:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "id": 437,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "nonce",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 80,
+                        "src": "5915:15:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": "+",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "hexValue": "31",
+                        "id": 438,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "number",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "5933:1:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_rational_1_by_1",
+                          "typeString": "int_const 1"
+                        },
+                        "value": "1"
+                      },
+                      "src": "5915:19:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint16",
+                        "typeString": "uint16"
+                      }
+                    },
+                    "src": "5897:37:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "id": 441,
+                  "nodeType": "ExpressionStatement",
+                  "src": "5897:37:0"
+                },
+                {
+                  "assignments": [
+                    443
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 443,
+                      "name": "newSpent",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 577,
+                      "src": "5944:15:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      },
+                      "typeName": {
+                        "id": 442,
+                        "name": "uint96",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "5944:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 448,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    },
+                    "id": 447,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 444,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 409,
+                        "src": "5962:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 445,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "spent",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 74,
+                      "src": "5962:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "+",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "id": 446,
+                      "name": "amount",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 397,
+                      "src": "5980:6:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "src": "5962:24:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "5944:42:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 458,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          },
+                          "id": 453,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "id": 450,
+                            "name": "newSpent",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 443,
+                            "src": "6051:8:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": ">",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 451,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 409,
+                              "src": "6062:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 452,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "spent",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 74,
+                            "src": "6062:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "src": "6051:26:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "&&",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          },
+                          "id": 457,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "id": 454,
+                            "name": "newSpent",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 443,
+                            "src": "6081:8:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "<=",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 455,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 409,
+                              "src": "6093:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 456,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "amount",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 72,
+                            "src": "6093:16:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "src": "6081:28:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "src": "6051:58:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "hexValue": "6e65775370656e74203e20616c6c6f77616e63652e7370656e74202626206e65775370656e74203c3d20616c6c6f77616e63652e616d6f756e74",
+                        "id": 459,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "string",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "6111:60:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_stringliteral_a7359a8519961096cf8fb65715f77dbc4de2755aabf21e3445e245a34ee622da",
+                          "typeString": "literal_string \"newSpent > allowance.spent && newSpent <= allowance.amount\""
+                        },
+                        "value": "newSpent > allowance.spent && newSpent <= allowance.amount"
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        {
+                          "typeIdentifier": "t_stringliteral_a7359a8519961096cf8fb65715f77dbc4de2755aabf21e3445e245a34ee622da",
+                          "typeString": "literal_string \"newSpent > allowance.spent && newSpent <= allowance.amount\""
+                        }
+                      ],
+                      "id": 449,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        4980,
+                        4981
+                      ],
+                      "referencedDeclaration": 4981,
+                      "src": "6043:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                        "typeString": "function (bool,string memory) pure"
+                      }
+                    },
+                    "id": 460,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "6043:129:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 461,
+                  "nodeType": "ExpressionStatement",
+                  "src": "6043:129:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 466,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 462,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 409,
+                        "src": "6182:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      },
+                      "id": 464,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "spent",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 74,
+                      "src": "6182:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 465,
+                      "name": "newSpent",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 443,
+                      "src": "6200:8:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "src": "6182:26:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "id": 467,
+                  "nodeType": "ExpressionStatement",
+                  "src": "6182:26:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    },
+                    "id": 470,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 468,
+                      "name": "payment",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 401,
+                      "src": "6222:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": ">",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 469,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "6232:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "6222:11:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 526,
+                  "nodeType": "IfStatement",
+                  "src": "6218:748:0",
+                  "trueBody": {
+                    "id": 525,
+                    "nodeType": "Block",
+                    "src": "6235:731:0",
+                    "statements": [
+                      {
+                        "assignments": [
+                          472
+                        ],
+                        "declarations": [
+                          {
+                            "constant": false,
+                            "id": 472,
+                            "name": "paymentAllowance",
+                            "nodeType": "VariableDeclaration",
+                            "scope": 525,
+                            "src": "6325:33:0",
+                            "stateVariable": false,
+                            "storageLocation": "memory",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                              "typeString": "struct AllowanceModule.Allowance"
+                            },
+                            "typeName": {
+                              "contractScope": null,
+                              "id": 471,
+                              "name": "Allowance",
+                              "nodeType": "UserDefinedTypeName",
+                              "referencedDeclaration": 81,
+                              "src": "6325:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                                "typeString": "struct AllowanceModule.Allowance"
+                              }
+                            },
+                            "value": null,
+                            "visibility": "internal"
+                          }
+                        ],
+                        "id": 485,
+                        "initialValue": {
+                          "argumentTypes": null,
+                          "condition": {
+                            "argumentTypes": null,
+                            "commonType": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            "id": 475,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "leftExpression": {
+                              "argumentTypes": null,
+                              "id": 473,
+                              "name": "paymentToken",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 399,
+                              "src": "6361:12:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            "nodeType": "BinaryOperation",
+                            "operator": "==",
+                            "rightExpression": {
+                              "argumentTypes": null,
+                              "id": 474,
+                              "name": "token",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 393,
+                              "src": "6377:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            "src": "6361:21:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_bool",
+                              "typeString": "bool"
+                            }
+                          },
+                          "falseExpression": {
+                            "argumentTypes": null,
+                            "arguments": [
+                              {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 479,
+                                    "name": "safe",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 391,
+                                    "src": "6418:4:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                      "typeString": "contract GnosisSafe"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                      "typeString": "contract GnosisSafe"
+                                    }
+                                  ],
+                                  "id": 478,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "lValueRequested": false,
+                                  "nodeType": "ElementaryTypeNameExpression",
+                                  "src": "6410:7:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_type$_t_address_$",
+                                    "typeString": "type(address)"
+                                  },
+                                  "typeName": "address"
+                                },
+                                "id": 480,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "typeConversion",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "6410:13:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              {
+                                "argumentTypes": null,
+                                "id": 481,
+                                "name": "delegate",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 403,
+                                "src": "6425:8:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              {
+                                "argumentTypes": null,
+                                "id": 482,
+                                "name": "paymentToken",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 399,
+                                "src": "6435:12:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": [
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                },
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                },
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              ],
+                              "id": 477,
+                              "name": "getAllowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 336,
+                              "src": "6397:12:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$returns$_t_struct$_Allowance_$81_memory_ptr_$",
+                                "typeString": "function (address,address,address) view returns (struct AllowanceModule.Allowance memory)"
+                              }
+                            },
+                            "id": 483,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "kind": "functionCall",
+                            "lValueRequested": false,
+                            "names": [],
+                            "nodeType": "FunctionCall",
+                            "src": "6397:51:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                              "typeString": "struct AllowanceModule.Allowance memory"
+                            }
+                          },
+                          "id": 484,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "Conditional",
+                          "src": "6361:87:0",
+                          "trueExpression": {
+                            "argumentTypes": null,
+                            "id": 476,
+                            "name": "allowance",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 409,
+                            "src": "6385:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                              "typeString": "struct AllowanceModule.Allowance memory"
+                            }
+                          },
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "nodeType": "VariableDeclarationStatement",
+                        "src": "6325:123:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 491,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "id": 486,
+                            "name": "newSpent",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 443,
+                            "src": "6462:8:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "commonType": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            },
+                            "id": 490,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "leftExpression": {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 487,
+                                "name": "paymentAllowance",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 472,
+                                "src": "6473:16:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                  "typeString": "struct AllowanceModule.Allowance memory"
+                                }
+                              },
+                              "id": 488,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "spent",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 74,
+                              "src": "6473:22:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint96",
+                                "typeString": "uint96"
+                              }
+                            },
+                            "nodeType": "BinaryOperation",
+                            "operator": "+",
+                            "rightExpression": {
+                              "argumentTypes": null,
+                              "id": 489,
+                              "name": "payment",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 401,
+                              "src": "6498:7:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint96",
+                                "typeString": "uint96"
+                              }
+                            },
+                            "src": "6473:32:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "src": "6462:43:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          }
+                        },
+                        "id": 492,
+                        "nodeType": "ExpressionStatement",
+                        "src": "6462:43:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "commonType": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              },
+                              "id": 502,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "leftExpression": {
+                                "argumentTypes": null,
+                                "commonType": {
+                                  "typeIdentifier": "t_uint96",
+                                  "typeString": "uint96"
+                                },
+                                "id": 497,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "leftExpression": {
+                                  "argumentTypes": null,
+                                  "id": 494,
+                                  "name": "newSpent",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 443,
+                                  "src": "6578:8:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint96",
+                                    "typeString": "uint96"
+                                  }
+                                },
+                                "nodeType": "BinaryOperation",
+                                "operator": ">",
+                                "rightExpression": {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "id": 495,
+                                    "name": "paymentAllowance",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 472,
+                                    "src": "6589:16:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                      "typeString": "struct AllowanceModule.Allowance memory"
+                                    }
+                                  },
+                                  "id": 496,
+                                  "isConstant": false,
+                                  "isLValue": true,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "memberName": "spent",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": 74,
+                                  "src": "6589:22:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint96",
+                                    "typeString": "uint96"
+                                  }
+                                },
+                                "src": "6578:33:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_bool",
+                                  "typeString": "bool"
+                                }
+                              },
+                              "nodeType": "BinaryOperation",
+                              "operator": "&&",
+                              "rightExpression": {
+                                "argumentTypes": null,
+                                "commonType": {
+                                  "typeIdentifier": "t_uint96",
+                                  "typeString": "uint96"
+                                },
+                                "id": 501,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "leftExpression": {
+                                  "argumentTypes": null,
+                                  "id": 498,
+                                  "name": "newSpent",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 443,
+                                  "src": "6615:8:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint96",
+                                    "typeString": "uint96"
+                                  }
+                                },
+                                "nodeType": "BinaryOperation",
+                                "operator": "<=",
+                                "rightExpression": {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "id": 499,
+                                    "name": "paymentAllowance",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 472,
+                                    "src": "6627:16:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                      "typeString": "struct AllowanceModule.Allowance memory"
+                                    }
+                                  },
+                                  "id": 500,
+                                  "isConstant": false,
+                                  "isLValue": true,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "memberName": "amount",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": 72,
+                                  "src": "6627:23:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint96",
+                                    "typeString": "uint96"
+                                  }
+                                },
+                                "src": "6615:35:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_bool",
+                                  "typeString": "bool"
+                                }
+                              },
+                              "src": "6578:72:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "6e65775370656e74203e207061796d656e74416c6c6f77616e63652e7370656e74202626206e65775370656e74203c3d207061796d656e74416c6c6f77616e63652e616d6f756e74",
+                              "id": 503,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "string",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "6652:74:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_stringliteral_b549d52c5706645679000944ae1bcaec935d0b8c387f4240a09789be7dc8c0d4",
+                                "typeString": "literal_string \"newSpent > paymentAllowance.spent && newSpent <= paymentAllowance.amount\""
+                              },
+                              "value": "newSpent > paymentAllowance.spent && newSpent <= paymentAllowance.amount"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              },
+                              {
+                                "typeIdentifier": "t_stringliteral_b549d52c5706645679000944ae1bcaec935d0b8c387f4240a09789be7dc8c0d4",
+                                "typeString": "literal_string \"newSpent > paymentAllowance.spent && newSpent <= paymentAllowance.amount\""
+                              }
+                            ],
+                            "id": 493,
+                            "name": "require",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [
+                              4980,
+                              4981
+                            ],
+                            "referencedDeclaration": 4981,
+                            "src": "6570:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                              "typeString": "function (bool,string memory) pure"
+                            }
+                          },
+                          "id": 504,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "6570:157:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 505,
+                        "nodeType": "ExpressionStatement",
+                        "src": "6570:157:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 510,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 506,
+                              "name": "paymentAllowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 472,
+                              "src": "6741:16:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 508,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "spent",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 74,
+                            "src": "6741:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "id": 509,
+                            "name": "newSpent",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 443,
+                            "src": "6766:8:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "src": "6741:33:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          }
+                        },
+                        "id": 511,
+                        "nodeType": "ExpressionStatement",
+                        "src": "6741:33:0"
+                      },
+                      {
+                        "condition": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 514,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "id": 512,
+                            "name": "paymentToken",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 399,
+                            "src": "6860:12:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "!=",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "id": 513,
+                            "name": "token",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 393,
+                            "src": "6876:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "src": "6860:21:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "falseBody": null,
+                        "id": 524,
+                        "nodeType": "IfStatement",
+                        "src": "6856:99:0",
+                        "trueBody": {
+                          "expression": {
+                            "argumentTypes": null,
+                            "arguments": [
+                              {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 517,
+                                    "name": "safe",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 391,
+                                    "src": "6907:4:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                      "typeString": "contract GnosisSafe"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                      "typeString": "contract GnosisSafe"
+                                    }
+                                  ],
+                                  "id": 516,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "lValueRequested": false,
+                                  "nodeType": "ElementaryTypeNameExpression",
+                                  "src": "6899:7:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_type$_t_address_$",
+                                    "typeString": "type(address)"
+                                  },
+                                  "typeName": "address"
+                                },
+                                "id": 518,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "typeConversion",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "6899:13:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              {
+                                "argumentTypes": null,
+                                "id": 519,
+                                "name": "delegate",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 403,
+                                "src": "6914:8:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              {
+                                "argumentTypes": null,
+                                "id": 520,
+                                "name": "paymentToken",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 399,
+                                "src": "6924:12:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              {
+                                "argumentTypes": null,
+                                "id": 521,
+                                "name": "paymentAllowance",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 472,
+                                "src": "6938:16:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                  "typeString": "struct AllowanceModule.Allowance memory"
+                                }
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": [
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                },
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                },
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                },
+                                {
+                                  "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                  "typeString": "struct AllowanceModule.Allowance memory"
+                                }
+                              ],
+                              "id": 515,
+                              "name": "updateAllowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 358,
+                              "src": "6883:15:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_struct$_Allowance_$81_memory_ptr_$returns$__$",
+                                "typeString": "function (address,address,address,struct AllowanceModule.Allowance memory)"
+                              }
+                            },
+                            "id": 522,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "kind": "functionCall",
+                            "lValueRequested": false,
+                            "names": [],
+                            "nodeType": "FunctionCall",
+                            "src": "6883:72:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_tuple$__$",
+                              "typeString": "tuple()"
+                            }
+                          },
+                          "id": 523,
+                          "nodeType": "ExpressionStatement",
+                          "src": "6883:72:0"
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "id": 529,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 391,
+                            "src": "6999:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          ],
+                          "id": 528,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "6991:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_address_$",
+                            "typeString": "type(address)"
+                          },
+                          "typeName": "address"
+                        },
+                        "id": 530,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "6991:13:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 531,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 403,
+                        "src": "7006:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 532,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 393,
+                        "src": "7016:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 533,
+                        "name": "allowance",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 409,
+                        "src": "7023:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                          "typeString": "struct AllowanceModule.Allowance memory"
+                        }
+                      ],
+                      "id": 527,
+                      "name": "updateAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 358,
+                      "src": "6975:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_struct$_Allowance_$81_memory_ptr_$returns$__$",
+                        "typeString": "function (address,address,address,struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 534,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "6975:58:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 535,
+                  "nodeType": "ExpressionStatement",
+                  "src": "6975:58:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "id": 537,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 403,
+                        "src": "7172:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 538,
+                        "name": "signature",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 405,
+                        "src": "7182:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 539,
+                        "name": "transferHashData",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 419,
+                        "src": "7193:16:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 540,
+                        "name": "safe",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 391,
+                        "src": "7211:4:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                          "typeString": "contract GnosisSafe"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        },
+                        {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        },
+                        {
+                          "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                          "typeString": "contract GnosisSafe"
+                        }
+                      ],
+                      "id": 536,
+                      "name": "checkSignature",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 697,
+                      "src": "7157:14:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_bytes_memory_ptr_$_t_bytes_memory_ptr_$_t_contract$_GnosisSafe_$18_$returns$__$",
+                        "typeString": "function (address,bytes memory,bytes memory,contract GnosisSafe)"
+                      }
+                    },
+                    "id": 541,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7157:59:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 542,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7157:59:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    },
+                    "id": 545,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 543,
+                      "name": "payment",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 401,
+                      "src": "7231:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint96",
+                        "typeString": "uint96"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": ">",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 544,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "7241:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "7231:11:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 555,
+                  "nodeType": "IfStatement",
+                  "src": "7227:184:0",
+                  "trueBody": {
+                    "id": 554,
+                    "nodeType": "Block",
+                    "src": "7244:167:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "id": 547,
+                              "name": "safe",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 391,
+                              "src": "7361:4:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                "typeString": "contract GnosisSafe"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 548,
+                              "name": "paymentToken",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 399,
+                              "src": "7367:12:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 549,
+                                "name": "tx",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4989,
+                                "src": "7381:2:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_magic_transaction",
+                                  "typeString": "tx"
+                                }
+                              },
+                              "id": 550,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "origin",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": null,
+                              "src": "7381:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 551,
+                              "name": "payment",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 401,
+                              "src": "7392:7:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint96",
+                                "typeString": "uint96"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                "typeString": "contract GnosisSafe"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              },
+                              {
+                                "typeIdentifier": "t_uint96",
+                                "typeString": "uint96"
+                              }
+                            ],
+                            "id": 546,
+                            "name": "transfer",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 873,
+                            "src": "7352:8:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_internal_nonpayable$_t_contract$_GnosisSafe_$18_$_t_address_$_t_address_payable_$_t_uint96_$returns$__$",
+                              "typeString": "function (contract GnosisSafe,address,address payable,uint96)"
+                            }
+                          },
+                          "id": 552,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7352:48:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 553,
+                        "nodeType": "ExpressionStatement",
+                        "src": "7352:48:0"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "id": 557,
+                        "name": "safe",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 391,
+                        "src": "7455:4:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                          "typeString": "contract GnosisSafe"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 558,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 393,
+                        "src": "7461:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 559,
+                        "name": "to",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 395,
+                        "src": "7468:2:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 560,
+                        "name": "amount",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 397,
+                        "src": "7472:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                          "typeString": "contract GnosisSafe"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      ],
+                      "id": 556,
+                      "name": "transfer",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 873,
+                      "src": "7446:8:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_contract$_GnosisSafe_$18_$_t_address_$_t_address_payable_$_t_uint96_$returns$__$",
+                        "typeString": "function (contract GnosisSafe,address,address payable,uint96)"
+                      }
+                    },
+                    "id": 561,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7446:33:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 562,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7446:33:0"
+                },
+                {
+                  "eventCall": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "id": 565,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 391,
+                            "src": "7527:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                              "typeString": "contract GnosisSafe"
+                            }
+                          ],
+                          "id": 564,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "7519:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_address_$",
+                            "typeString": "type(address)"
+                          },
+                          "typeName": "address"
+                        },
+                        "id": 566,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "7519:13:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 567,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 403,
+                        "src": "7534:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 568,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 393,
+                        "src": "7544:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 569,
+                        "name": "to",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 395,
+                        "src": "7551:2:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 570,
+                        "name": "amount",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 397,
+                        "src": "7555:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        },
+                        "id": 574,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 571,
+                            "name": "allowance",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 409,
+                            "src": "7563:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                              "typeString": "struct AllowanceModule.Allowance memory"
+                            }
+                          },
+                          "id": 572,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "nonce",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 80,
+                          "src": "7563:15:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint16",
+                            "typeString": "uint16"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "-",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "31",
+                          "id": 573,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "7581:1:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_1_by_1",
+                            "typeString": "int_const 1"
+                          },
+                          "value": "1"
+                        },
+                        "src": "7563:19:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_uint96",
+                          "typeString": "uint96"
+                        },
+                        {
+                          "typeIdentifier": "t_uint16",
+                          "typeString": "uint16"
+                        }
+                      ],
+                      "id": 563,
+                      "name": "ExecuteAllowanceTransfer",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 107,
+                      "src": "7494:24:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_address_$_t_uint96_$_t_uint16_$returns$__$",
+                        "typeString": "function (address,address,address,address,uint96,uint16)"
+                      }
+                    },
+                    "id": 575,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7494:89:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 576,
+                  "nodeType": "EmitStatement",
+                  "src": "7489:94:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 578,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "executeAllowanceTransfer",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 406,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 391,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5387:15:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                    "typeString": "contract GnosisSafe"
+                  },
+                  "typeName": {
+                    "contractScope": null,
+                    "id": 390,
+                    "name": "GnosisSafe",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 18,
+                    "src": "5387:10:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                      "typeString": "contract GnosisSafe"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 393,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5412:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 392,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5412:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 395,
+                  "name": "to",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5435:18:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address_payable",
+                    "typeString": "address payable"
+                  },
+                  "typeName": {
+                    "id": 394,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5435:15:0",
+                    "stateMutability": "payable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address_payable",
+                      "typeString": "address payable"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 397,
+                  "name": "amount",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5463:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 396,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5463:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 399,
+                  "name": "paymentToken",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5486:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 398,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5486:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 401,
+                  "name": "payment",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5516:14:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 400,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5516:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 403,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5540:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 402,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5540:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 405,
+                  "name": "signature",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 578,
+                  "src": "5566:22:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_memory_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 404,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "5566:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "5377:217:0"
+            },
+            "returnParameters": {
+              "id": 407,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "5602:0:0"
+            },
+            "scope": 1224,
+            "src": "5344:2246:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 625,
+              "nodeType": "Block",
+              "src": "7836:255:0",
+              "statements": [
+                {
+                  "assignments": [
+                    598
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 598,
+                      "name": "transferHash",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 625,
+                      "src": "7846:20:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bytes32",
+                        "typeString": "bytes32"
+                      },
+                      "typeName": {
+                        "id": 597,
+                        "name": "bytes32",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "7846:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 612,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "id": 602,
+                            "name": "ALLOWANCE_TRANSFER_TYPEHASH",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 36,
+                            "src": "7903:27:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_bytes32",
+                              "typeString": "bytes32"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 603,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 580,
+                            "src": "7932:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 604,
+                            "name": "token",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 582,
+                            "src": "7938:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 605,
+                            "name": "to",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 584,
+                            "src": "7945:2:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 606,
+                            "name": "amount",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 586,
+                            "src": "7949:6:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 607,
+                            "name": "paymentToken",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 588,
+                            "src": "7957:12:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 608,
+                            "name": "payment",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 590,
+                            "src": "7971:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 609,
+                            "name": "nonce",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 592,
+                            "src": "7980:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_bytes32",
+                              "typeString": "bytes32"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            },
+                            {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 600,
+                            "name": "abi",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 4964,
+                            "src": "7892:3:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_magic_abi",
+                              "typeString": "abi"
+                            }
+                          },
+                          "id": 601,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "memberName": "encode",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": null,
+                          "src": "7892:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_function_abiencode_pure$__$returns$_t_bytes_memory_ptr_$",
+                            "typeString": "function () pure returns (bytes memory)"
+                          }
+                        },
+                        "id": 610,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "functionCall",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "7892:94:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      ],
+                      "id": 599,
+                      "name": "keccak256",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 4971,
+                      "src": "7869:9:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                        "typeString": "function (bytes memory) pure returns (bytes32)"
+                      }
+                    },
+                    "id": 611,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7869:127:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes32",
+                      "typeString": "bytes32"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "7846:150:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "hexValue": "30783139",
+                            "id": 616,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "8035:4:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_25_by_1",
+                              "typeString": "int_const 25"
+                            },
+                            "value": "0x19"
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_rational_25_by_1",
+                              "typeString": "int_const 25"
+                            }
+                          ],
+                          "id": 615,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "8030:4:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_bytes1_$",
+                            "typeString": "type(bytes1)"
+                          },
+                          "typeName": "byte"
+                        },
+                        "id": 617,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "8030:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes1",
+                          "typeString": "bytes1"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "hexValue": "30783031",
+                            "id": 619,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "8047:4:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_1_by_1",
+                              "typeString": "int_const 1"
+                            },
+                            "value": "0x01"
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_rational_1_by_1",
+                              "typeString": "int_const 1"
+                            }
+                          ],
+                          "id": 618,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "8042:4:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_bytes1_$",
+                            "typeString": "type(bytes1)"
+                          },
+                          "typeName": "byte"
+                        },
+                        "id": 620,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "8042:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes1",
+                          "typeString": "bytes1"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 621,
+                        "name": "domainSeparator",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 63,
+                        "src": "8054:15:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 622,
+                        "name": "transferHash",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 598,
+                        "src": "8071:12:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bytes1",
+                          "typeString": "bytes1"
+                        },
+                        {
+                          "typeIdentifier": "t_bytes1",
+                          "typeString": "bytes1"
+                        },
+                        {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        },
+                        {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 613,
+                        "name": "abi",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 4964,
+                        "src": "8013:3:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_magic_abi",
+                          "typeString": "abi"
+                        }
+                      },
+                      "id": 614,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "lValueRequested": false,
+                      "memberName": "encodePacked",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "8013:16:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$",
+                        "typeString": "function () pure returns (bytes memory)"
+                      }
+                    },
+                    "id": 623,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "8013:71:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_memory_ptr",
+                      "typeString": "bytes memory"
+                    }
+                  },
+                  "functionReturnParameters": 596,
+                  "id": 624,
+                  "nodeType": "Return",
+                  "src": "8006:78:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 626,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "generateTransferHashData",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 593,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 580,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7639:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 579,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7639:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 582,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7661:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 581,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7661:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 584,
+                  "name": "to",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7684:10:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 583,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7684:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 586,
+                  "name": "amount",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7704:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 585,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7704:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 588,
+                  "name": "paymentToken",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7727:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 587,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7727:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 590,
+                  "name": "payment",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7757:14:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 589,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7757:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 592,
+                  "name": "nonce",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7781:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  },
+                  "typeName": {
+                    "id": 591,
+                    "name": "uint16",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7781:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "7629:170:0"
+            },
+            "returnParameters": {
+              "id": 596,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 595,
+                  "name": "",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 626,
+                  "src": "7822:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_memory_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 594,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "7822:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "7821:14:0"
+            },
+            "scope": 1224,
+            "src": "7596:495:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "private"
+          },
+          {
+            "body": {
+              "id": 657,
+              "nodeType": "Block",
+              "src": "8327:136:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "id": 647,
+                            "name": "safe",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 628,
+                            "src": "8392:4:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 648,
+                            "name": "token",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 630,
+                            "src": "8398:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 649,
+                            "name": "to",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 632,
+                            "src": "8405:2:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 650,
+                            "name": "amount",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 634,
+                            "src": "8409:6:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 651,
+                            "name": "paymentToken",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 636,
+                            "src": "8417:12:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 652,
+                            "name": "payment",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 638,
+                            "src": "8431:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          {
+                            "argumentTypes": null,
+                            "id": 653,
+                            "name": "nonce",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 640,
+                            "src": "8440:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            },
+                            {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            },
+                            {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          ],
+                          "id": 646,
+                          "name": "generateTransferHashData",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 626,
+                          "src": "8354:24:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_uint96_$_t_address_$_t_uint96_$_t_uint16_$returns$_t_bytes_memory_ptr_$",
+                            "typeString": "function (address,address,address,uint96,address,uint96,uint16) view returns (bytes memory)"
+                          }
+                        },
+                        "id": 654,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "functionCall",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "8354:101:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      ],
+                      "id": 645,
+                      "name": "keccak256",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 4971,
+                      "src": "8344:9:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                        "typeString": "function (bytes memory) pure returns (bytes32)"
+                      }
+                    },
+                    "id": 655,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "8344:112:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes32",
+                      "typeString": "bytes32"
+                    }
+                  },
+                  "functionReturnParameters": 644,
+                  "id": 656,
+                  "nodeType": "Return",
+                  "src": "8337:119:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 658,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "generateTransferHash",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 641,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 628,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8136:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 627,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8136:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 630,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8158:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 629,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8158:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 632,
+                  "name": "to",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8181:10:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 631,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8181:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 634,
+                  "name": "amount",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8201:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 633,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8201:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 636,
+                  "name": "paymentToken",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8224:20:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 635,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8224:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 638,
+                  "name": "payment",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8254:14:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 637,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8254:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 640,
+                  "name": "nonce",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8278:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint16",
+                    "typeString": "uint16"
+                  },
+                  "typeName": {
+                    "id": 639,
+                    "name": "uint16",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8278:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint16",
+                      "typeString": "uint16"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "8126:170:0"
+            },
+            "returnParameters": {
+              "id": 644,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 643,
+                  "name": "",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 658,
+                  "src": "8318:7:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes32",
+                    "typeString": "bytes32"
+                  },
+                  "typeName": {
+                    "id": 642,
+                    "name": "bytes32",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8318:7:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes32",
+                      "typeString": "bytes32"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "8317:9:0"
+            },
+            "scope": 1224,
+            "src": "8097:366:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 696,
+              "nodeType": "Block",
+              "src": "8599:314:0",
+              "statements": [
+                {
+                  "assignments": [
+                    670
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 670,
+                      "name": "signer",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 696,
+                      "src": "8609:14:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      },
+                      "typeName": {
+                        "id": 669,
+                        "name": "address",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "8609:7:0",
+                        "stateMutability": "nonpayable",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 675,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "id": 672,
+                        "name": "signature",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 662,
+                        "src": "8643:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 673,
+                        "name": "transferHashData",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 664,
+                        "src": "8654:16:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        },
+                        {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      ],
+                      "id": 671,
+                      "name": "recoverSignature",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 818,
+                      "src": "8626:16:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_bytes_memory_ptr_$_t_bytes_memory_ptr_$returns$_t_address_$",
+                        "typeString": "function (bytes memory,bytes memory) view returns (address)"
+                      }
+                    },
+                    "id": 674,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "8626:45:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "8609:62:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 692,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 679,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "id": 677,
+                            "name": "expectedDelegate",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 660,
+                            "src": "8702:16:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "==",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "id": 678,
+                            "name": "signer",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 670,
+                            "src": "8722:6:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "src": "8702:26:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "&&",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 691,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "baseExpression": {
+                                "argumentTypes": null,
+                                "baseExpression": {
+                                  "argumentTypes": null,
+                                  "id": 680,
+                                  "name": "delegates",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 57,
+                                  "src": "8732:9:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                                    "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                                  }
+                                },
+                                "id": 684,
+                                "indexExpression": {
+                                  "argumentTypes": null,
+                                  "arguments": [
+                                    {
+                                      "argumentTypes": null,
+                                      "id": 682,
+                                      "name": "safe",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 666,
+                                      "src": "8750:4:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                        "typeString": "contract GnosisSafe"
+                                      }
+                                    }
+                                  ],
+                                  "expression": {
+                                    "argumentTypes": [
+                                      {
+                                        "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                        "typeString": "contract GnosisSafe"
+                                      }
+                                    ],
+                                    "id": 681,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": true,
+                                    "lValueRequested": false,
+                                    "nodeType": "ElementaryTypeNameExpression",
+                                    "src": "8742:7:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_type$_t_address_$",
+                                      "typeString": "type(address)"
+                                    },
+                                    "typeName": "address"
+                                  },
+                                  "id": 683,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": false,
+                                  "kind": "typeConversion",
+                                  "lValueRequested": false,
+                                  "names": [],
+                                  "nodeType": "FunctionCall",
+                                  "src": "8742:13:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                },
+                                "isConstant": false,
+                                "isLValue": true,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "nodeType": "IndexAccess",
+                                "src": "8732:24:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                                  "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                                }
+                              },
+                              "id": 688,
+                              "indexExpression": {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 686,
+                                    "name": "signer",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 670,
+                                    "src": "8764:6:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_address",
+                                      "typeString": "address"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_address",
+                                      "typeString": "address"
+                                    }
+                                  ],
+                                  "id": 685,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "lValueRequested": false,
+                                  "nodeType": "ElementaryTypeNameExpression",
+                                  "src": "8757:6:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_type$_t_uint48_$",
+                                    "typeString": "type(uint48)"
+                                  },
+                                  "typeName": "uint48"
+                                },
+                                "id": 687,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "typeConversion",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "8757:14:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_uint48",
+                                  "typeString": "uint48"
+                                }
+                              },
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "nodeType": "IndexAccess",
+                              "src": "8732:40:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                                "typeString": "struct AllowanceModule.Delegate storage ref"
+                              }
+                            },
+                            "id": 689,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "delegate",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 65,
+                            "src": "8732:49:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "==",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "id": 690,
+                            "name": "signer",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 670,
+                            "src": "8785:6:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "src": "8732:59:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "src": "8702:89:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "hexValue": "657870656374656444656c6567617465203d3d207369676e65722026262064656c6567617465735b616464726573732873616665295d5b75696e743438287369676e6572295d2e64656c6567617465203d3d207369676e6572",
+                        "id": 693,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "string",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "8805:91:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_stringliteral_967a409fd152609403ac7b3349d7ced54d05d2ee8664844edf017668d343240b",
+                          "typeString": "literal_string \"expectedDelegate == signer && delegates[address(safe)][uint48(signer)].delegate == signer\""
+                        },
+                        "value": "expectedDelegate == signer && delegates[address(safe)][uint48(signer)].delegate == signer"
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        {
+                          "typeIdentifier": "t_stringliteral_967a409fd152609403ac7b3349d7ced54d05d2ee8664844edf017668d343240b",
+                          "typeString": "literal_string \"expectedDelegate == signer && delegates[address(safe)][uint48(signer)].delegate == signer\""
+                        }
+                      ],
+                      "id": 676,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        4980,
+                        4981
+                      ],
+                      "referencedDeclaration": 4981,
+                      "src": "8681:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                        "typeString": "function (bool,string memory) pure"
+                      }
+                    },
+                    "id": 694,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "8681:225:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 695,
+                  "nodeType": "ExpressionStatement",
+                  "src": "8681:225:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 697,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "checkSignature",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 667,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 660,
+                  "name": "expectedDelegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 697,
+                  "src": "8493:24:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 659,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8493:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 662,
+                  "name": "signature",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 697,
+                  "src": "8519:22:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_memory_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 661,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8519:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 664,
+                  "name": "transferHashData",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 697,
+                  "src": "8543:29:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_memory_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 663,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8543:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 666,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 697,
+                  "src": "8574:15:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                    "typeString": "contract GnosisSafe"
+                  },
+                  "typeName": {
+                    "contractScope": null,
+                    "id": 665,
+                    "name": "GnosisSafe",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 18,
+                    "src": "8574:10:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                      "typeString": "contract GnosisSafe"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "8492:98:0"
+            },
+            "returnParameters": {
+              "id": 668,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "8599:0:0"
+            },
+            "scope": 1224,
+            "src": "8469:444:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "private"
+          },
+          {
+            "body": {
+              "id": 817,
+              "nodeType": "Block",
+              "src": "9037:1801:0",
+              "statements": [
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    },
+                    "id": 709,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 706,
+                        "name": "signature",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 699,
+                        "src": "9118:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes_memory_ptr",
+                          "typeString": "bytes memory"
+                        }
+                      },
+                      "id": 707,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "length",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "9118:16:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "==",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 708,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "9138:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "9118:21:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 713,
+                  "nodeType": "IfStatement",
+                  "src": "9114:44:0",
+                  "trueBody": {
+                    "expression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 710,
+                        "name": "msg",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 4977,
+                        "src": "9148:3:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_magic_message",
+                          "typeString": "msg"
+                        }
+                      },
+                      "id": 711,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "sender",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "9148:10:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address_payable",
+                        "typeString": "address payable"
+                      }
+                    },
+                    "functionReturnParameters": 705,
+                    "id": 712,
+                    "nodeType": "Return",
+                    "src": "9141:17:0"
+                  }
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        },
+                        "id": 718,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 715,
+                            "name": "signature",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 699,
+                            "src": "9243:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_bytes_memory_ptr",
+                              "typeString": "bytes memory"
+                            }
+                          },
+                          "id": 716,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "length",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": null,
+                          "src": "9243:16:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": ">=",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "3635",
+                          "id": 717,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "9263:2:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_65_by_1",
+                            "typeString": "int_const 65"
+                          },
+                          "value": "65"
+                        },
+                        "src": "9243:22:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "hexValue": "7369676e6174757265732e6c656e677468203e3d203635",
+                        "id": 719,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "string",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "9267:25:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_stringliteral_72679ed14e52badd3e78d9f29492b52cfb58b223fd9e00d5dca80ba1c385a7f7",
+                          "typeString": "literal_string \"signatures.length >= 65\""
+                        },
+                        "value": "signatures.length >= 65"
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        {
+                          "typeIdentifier": "t_stringliteral_72679ed14e52badd3e78d9f29492b52cfb58b223fd9e00d5dca80ba1c385a7f7",
+                          "typeString": "literal_string \"signatures.length >= 65\""
+                        }
+                      ],
+                      "id": 714,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        4980,
+                        4981
+                      ],
+                      "referencedDeclaration": 4981,
+                      "src": "9235:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                        "typeString": "function (bool,string memory) pure"
+                      }
+                    },
+                    "id": 720,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "9235:58:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 721,
+                  "nodeType": "ExpressionStatement",
+                  "src": "9235:58:0"
+                },
+                {
+                  "assignments": [
+                    723
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 723,
+                      "name": "v",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 817,
+                      "src": "9303:7:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint8",
+                        "typeString": "uint8"
+                      },
+                      "typeName": {
+                        "id": 722,
+                        "name": "uint8",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "9303:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint8",
+                          "typeString": "uint8"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 724,
+                  "initialValue": null,
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "9303:7:0"
+                },
+                {
+                  "assignments": [
+                    726
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 726,
+                      "name": "r",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 817,
+                      "src": "9320:9:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bytes32",
+                        "typeString": "bytes32"
+                      },
+                      "typeName": {
+                        "id": 725,
+                        "name": "bytes32",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "9320:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 727,
+                  "initialValue": null,
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "9320:9:0"
+                },
+                {
+                  "assignments": [
+                    729
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 729,
+                      "name": "s",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 817,
+                      "src": "9339:9:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bytes32",
+                        "typeString": "bytes32"
+                      },
+                      "typeName": {
+                        "id": 728,
+                        "name": "bytes32",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "9339:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bytes32",
+                          "typeString": "bytes32"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 730,
+                  "initialValue": null,
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "9339:9:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 739,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "components": [
+                        {
+                          "argumentTypes": null,
+                          "id": 731,
+                          "name": "v",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 723,
+                          "src": "9359:1:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint8",
+                            "typeString": "uint8"
+                          }
+                        },
+                        {
+                          "argumentTypes": null,
+                          "id": 732,
+                          "name": "r",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 726,
+                          "src": "9362:1:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bytes32",
+                            "typeString": "bytes32"
+                          }
+                        },
+                        {
+                          "argumentTypes": null,
+                          "id": 733,
+                          "name": "s",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 729,
+                          "src": "9365:1:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bytes32",
+                            "typeString": "bytes32"
+                          }
+                        }
+                      ],
+                      "id": 734,
+                      "isConstant": false,
+                      "isInlineArray": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "nodeType": "TupleExpression",
+                      "src": "9358:9:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_tuple$_t_uint8_$_t_bytes32_$_t_bytes32_$",
+                        "typeString": "tuple(uint8,bytes32,bytes32)"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "id": 736,
+                          "name": "signature",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 699,
+                          "src": "9385:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bytes_memory_ptr",
+                            "typeString": "bytes memory"
+                          }
+                        },
+                        {
+                          "argumentTypes": null,
+                          "hexValue": "30",
+                          "id": 737,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "9396:1:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          "value": "0"
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_bytes_memory_ptr",
+                            "typeString": "bytes memory"
+                          },
+                          {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          }
+                        ],
+                        "id": 735,
+                        "name": "signatureSplit",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 3369,
+                        "src": "9370:14:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$_t_uint256_$returns$_t_uint8_$_t_bytes32_$_t_bytes32_$",
+                          "typeString": "function (bytes memory,uint256) pure returns (uint8,bytes32,bytes32)"
+                        }
+                      },
+                      "id": 738,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "functionCall",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "9370:28:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_tuple$_t_uint8_$_t_bytes32_$_t_bytes32_$",
+                        "typeString": "tuple(uint8,bytes32,bytes32)"
+                      }
+                    },
+                    "src": "9358:40:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 740,
+                  "nodeType": "ExpressionStatement",
+                  "src": "9358:40:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint8",
+                      "typeString": "uint8"
+                    },
+                    "id": 743,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 741,
+                      "name": "v",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 723,
+                      "src": "9465:1:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint8",
+                        "typeString": "uint8"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "==",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 742,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "9470:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "src": "9465:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": {
+                    "condition": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_uint8",
+                        "typeString": "uint8"
+                      },
+                      "id": 772,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "id": 770,
+                        "name": "v",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 723,
+                        "src": "10193:1:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint8",
+                          "typeString": "uint8"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": "==",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "hexValue": "31",
+                        "id": 771,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "number",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "10198:1:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_rational_1_by_1",
+                          "typeString": "int_const 1"
+                        },
+                        "value": "1"
+                      },
+                      "src": "10193:6:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "falseBody": {
+                      "condition": {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint8",
+                          "typeString": "uint8"
+                        },
+                        "id": 781,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "id": 779,
+                          "name": "v",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 723,
+                          "src": "10372:1:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint8",
+                            "typeString": "uint8"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": ">",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "3330",
+                          "id": 780,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "10376:2:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_30_by_1",
+                            "typeString": "int_const 30"
+                          },
+                          "value": "30"
+                        },
+                        "src": "10372:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      },
+                      "falseBody": {
+                        "id": 813,
+                        "nodeType": "Block",
+                        "src": "10683:149:0",
+                        "statements": [
+                          {
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 811,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "leftHandSide": {
+                                "argumentTypes": null,
+                                "id": 802,
+                                "name": "owner",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 704,
+                                "src": "10766:5:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              "nodeType": "Assignment",
+                              "operator": "=",
+                              "rightHandSide": {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "arguments": [
+                                      {
+                                        "argumentTypes": null,
+                                        "id": 805,
+                                        "name": "transferHashData",
+                                        "nodeType": "Identifier",
+                                        "overloadedDeclarations": [],
+                                        "referencedDeclaration": 701,
+                                        "src": "10794:16:0",
+                                        "typeDescriptions": {
+                                          "typeIdentifier": "t_bytes_memory_ptr",
+                                          "typeString": "bytes memory"
+                                        }
+                                      }
+                                    ],
+                                    "expression": {
+                                      "argumentTypes": [
+                                        {
+                                          "typeIdentifier": "t_bytes_memory_ptr",
+                                          "typeString": "bytes memory"
+                                        }
+                                      ],
+                                      "id": 804,
+                                      "name": "keccak256",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 4971,
+                                      "src": "10784:9:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                                        "typeString": "function (bytes memory) pure returns (bytes32)"
+                                      }
+                                    },
+                                    "id": 806,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "kind": "functionCall",
+                                    "lValueRequested": false,
+                                    "names": [],
+                                    "nodeType": "FunctionCall",
+                                    "src": "10784:27:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 807,
+                                    "name": "v",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 723,
+                                    "src": "10813:1:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_uint8",
+                                      "typeString": "uint8"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 808,
+                                    "name": "r",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 726,
+                                    "src": "10816:1:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 809,
+                                    "name": "s",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 729,
+                                    "src": "10819:1:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_uint8",
+                                      "typeString": "uint8"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  ],
+                                  "id": 803,
+                                  "name": "ecrecover",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 4969,
+                                  "src": "10774:9:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_function_ecrecover_pure$_t_bytes32_$_t_uint8_$_t_bytes32_$_t_bytes32_$returns$_t_address_$",
+                                    "typeString": "function (bytes32,uint8,bytes32,bytes32) pure returns (address)"
+                                  }
+                                },
+                                "id": 810,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "functionCall",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "10774:47:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              "src": "10766:55:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            "id": 812,
+                            "nodeType": "ExpressionStatement",
+                            "src": "10766:55:0"
+                          }
+                        ]
+                      },
+                      "id": 814,
+                      "nodeType": "IfStatement",
+                      "src": "10368:464:0",
+                      "trueBody": {
+                        "id": 801,
+                        "nodeType": "Block",
+                        "src": "10380:297:0",
+                        "statements": [
+                          {
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 799,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "leftHandSide": {
+                                "argumentTypes": null,
+                                "id": 782,
+                                "name": "owner",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 704,
+                                "src": "10542:5:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              "nodeType": "Assignment",
+                              "operator": "=",
+                              "rightHandSide": {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "arguments": [
+                                      {
+                                        "argumentTypes": null,
+                                        "arguments": [
+                                          {
+                                            "argumentTypes": null,
+                                            "hexValue": "19457468657265756d205369676e6564204d6573736167653a0a3332",
+                                            "id": 787,
+                                            "isConstant": false,
+                                            "isLValue": false,
+                                            "isPure": true,
+                                            "kind": "string",
+                                            "lValueRequested": false,
+                                            "nodeType": "Literal",
+                                            "src": "10587:34:0",
+                                            "subdenomination": null,
+                                            "typeDescriptions": {
+                                              "typeIdentifier": "t_stringliteral_178a2411ab6fbc1ba11064408972259c558d0e82fd48b0aba3ad81d14f065e73",
+                                              "typeString": "literal_string \"\u0019Ethereum Signed Message:\n32\""
+                                            },
+                                            "value": "\u0019Ethereum Signed Message:\n32"
+                                          },
+                                          {
+                                            "argumentTypes": null,
+                                            "arguments": [
+                                              {
+                                                "argumentTypes": null,
+                                                "id": 789,
+                                                "name": "transferHashData",
+                                                "nodeType": "Identifier",
+                                                "overloadedDeclarations": [],
+                                                "referencedDeclaration": 701,
+                                                "src": "10633:16:0",
+                                                "typeDescriptions": {
+                                                  "typeIdentifier": "t_bytes_memory_ptr",
+                                                  "typeString": "bytes memory"
+                                                }
+                                              }
+                                            ],
+                                            "expression": {
+                                              "argumentTypes": [
+                                                {
+                                                  "typeIdentifier": "t_bytes_memory_ptr",
+                                                  "typeString": "bytes memory"
+                                                }
+                                              ],
+                                              "id": 788,
+                                              "name": "keccak256",
+                                              "nodeType": "Identifier",
+                                              "overloadedDeclarations": [],
+                                              "referencedDeclaration": 4971,
+                                              "src": "10623:9:0",
+                                              "typeDescriptions": {
+                                                "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                                                "typeString": "function (bytes memory) pure returns (bytes32)"
+                                              }
+                                            },
+                                            "id": 790,
+                                            "isConstant": false,
+                                            "isLValue": false,
+                                            "isPure": false,
+                                            "kind": "functionCall",
+                                            "lValueRequested": false,
+                                            "names": [],
+                                            "nodeType": "FunctionCall",
+                                            "src": "10623:27:0",
+                                            "typeDescriptions": {
+                                              "typeIdentifier": "t_bytes32",
+                                              "typeString": "bytes32"
+                                            }
+                                          }
+                                        ],
+                                        "expression": {
+                                          "argumentTypes": [
+                                            {
+                                              "typeIdentifier": "t_stringliteral_178a2411ab6fbc1ba11064408972259c558d0e82fd48b0aba3ad81d14f065e73",
+                                              "typeString": "literal_string \"\u0019Ethereum Signed Message:\n32\""
+                                            },
+                                            {
+                                              "typeIdentifier": "t_bytes32",
+                                              "typeString": "bytes32"
+                                            }
+                                          ],
+                                          "expression": {
+                                            "argumentTypes": null,
+                                            "id": 785,
+                                            "name": "abi",
+                                            "nodeType": "Identifier",
+                                            "overloadedDeclarations": [],
+                                            "referencedDeclaration": 4964,
+                                            "src": "10570:3:0",
+                                            "typeDescriptions": {
+                                              "typeIdentifier": "t_magic_abi",
+                                              "typeString": "abi"
+                                            }
+                                          },
+                                          "id": 786,
+                                          "isConstant": false,
+                                          "isLValue": false,
+                                          "isPure": true,
+                                          "lValueRequested": false,
+                                          "memberName": "encodePacked",
+                                          "nodeType": "MemberAccess",
+                                          "referencedDeclaration": null,
+                                          "src": "10570:16:0",
+                                          "typeDescriptions": {
+                                            "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$",
+                                            "typeString": "function () pure returns (bytes memory)"
+                                          }
+                                        },
+                                        "id": 791,
+                                        "isConstant": false,
+                                        "isLValue": false,
+                                        "isPure": false,
+                                        "kind": "functionCall",
+                                        "lValueRequested": false,
+                                        "names": [],
+                                        "nodeType": "FunctionCall",
+                                        "src": "10570:81:0",
+                                        "typeDescriptions": {
+                                          "typeIdentifier": "t_bytes_memory_ptr",
+                                          "typeString": "bytes memory"
+                                        }
+                                      }
+                                    ],
+                                    "expression": {
+                                      "argumentTypes": [
+                                        {
+                                          "typeIdentifier": "t_bytes_memory_ptr",
+                                          "typeString": "bytes memory"
+                                        }
+                                      ],
+                                      "id": 784,
+                                      "name": "keccak256",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 4971,
+                                      "src": "10560:9:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$",
+                                        "typeString": "function (bytes memory) pure returns (bytes32)"
+                                      }
+                                    },
+                                    "id": 792,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "kind": "functionCall",
+                                    "lValueRequested": false,
+                                    "names": [],
+                                    "nodeType": "FunctionCall",
+                                    "src": "10560:92:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "commonType": {
+                                      "typeIdentifier": "t_uint8",
+                                      "typeString": "uint8"
+                                    },
+                                    "id": 795,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "leftExpression": {
+                                      "argumentTypes": null,
+                                      "id": 793,
+                                      "name": "v",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 723,
+                                      "src": "10654:1:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_uint8",
+                                        "typeString": "uint8"
+                                      }
+                                    },
+                                    "nodeType": "BinaryOperation",
+                                    "operator": "-",
+                                    "rightExpression": {
+                                      "argumentTypes": null,
+                                      "hexValue": "34",
+                                      "id": 794,
+                                      "isConstant": false,
+                                      "isLValue": false,
+                                      "isPure": true,
+                                      "kind": "number",
+                                      "lValueRequested": false,
+                                      "nodeType": "Literal",
+                                      "src": "10658:1:0",
+                                      "subdenomination": null,
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_rational_4_by_1",
+                                        "typeString": "int_const 4"
+                                      },
+                                      "value": "4"
+                                    },
+                                    "src": "10654:5:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_uint8",
+                                      "typeString": "uint8"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 796,
+                                    "name": "r",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 726,
+                                    "src": "10661:1:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 797,
+                                    "name": "s",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 729,
+                                    "src": "10664:1:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_uint8",
+                                      "typeString": "uint8"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  ],
+                                  "id": 783,
+                                  "name": "ecrecover",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 4969,
+                                  "src": "10550:9:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_function_ecrecover_pure$_t_bytes32_$_t_uint8_$_t_bytes32_$_t_bytes32_$returns$_t_address_$",
+                                    "typeString": "function (bytes32,uint8,bytes32,bytes32) pure returns (address)"
+                                  }
+                                },
+                                "id": 798,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "functionCall",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "10550:116:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              "src": "10542:124:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            "id": 800,
+                            "nodeType": "ExpressionStatement",
+                            "src": "10542:124:0"
+                          }
+                        ]
+                      }
+                    },
+                    "id": 815,
+                    "nodeType": "IfStatement",
+                    "src": "10189:643:0",
+                    "trueBody": {
+                      "id": 778,
+                      "nodeType": "Block",
+                      "src": "10201:161:0",
+                      "statements": [
+                        {
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 776,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "leftHandSide": {
+                              "argumentTypes": null,
+                              "id": 773,
+                              "name": "owner",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 704,
+                              "src": "10333:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            "nodeType": "Assignment",
+                            "operator": "=",
+                            "rightHandSide": {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 774,
+                                "name": "msg",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4977,
+                                "src": "10341:3:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_magic_message",
+                                  "typeString": "msg"
+                                }
+                              },
+                              "id": 775,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "sender",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": null,
+                              "src": "10341:10:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              }
+                            },
+                            "src": "10333:18:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "id": 777,
+                          "nodeType": "ExpressionStatement",
+                          "src": "10333:18:0"
+                        }
+                      ]
+                    }
+                  },
+                  "id": 816,
+                  "nodeType": "IfStatement",
+                  "src": "9461:1371:0",
+                  "trueBody": {
+                    "id": 769,
+                    "nodeType": "Block",
+                    "src": "9473:710:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 750,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "id": 744,
+                            "name": "owner",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 704,
+                            "src": "9582:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "arguments": [
+                              {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 747,
+                                    "name": "r",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 726,
+                                    "src": "9606:1:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_bytes32",
+                                      "typeString": "bytes32"
+                                    }
+                                  ],
+                                  "id": 746,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "lValueRequested": false,
+                                  "nodeType": "ElementaryTypeNameExpression",
+                                  "src": "9598:7:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_type$_t_uint256_$",
+                                    "typeString": "type(uint256)"
+                                  },
+                                  "typeName": "uint256"
+                                },
+                                "id": 748,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "typeConversion",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "9598:10:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_uint256",
+                                  "typeString": "uint256"
+                                }
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": [
+                                {
+                                  "typeIdentifier": "t_uint256",
+                                  "typeString": "uint256"
+                                }
+                              ],
+                              "id": 745,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "lValueRequested": false,
+                              "nodeType": "ElementaryTypeNameExpression",
+                              "src": "9590:7:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_type$_t_address_$",
+                                "typeString": "type(address)"
+                              },
+                              "typeName": "address"
+                            },
+                            "id": 749,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "kind": "typeConversion",
+                            "lValueRequested": false,
+                            "names": [],
+                            "nodeType": "FunctionCall",
+                            "src": "9590:19:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address_payable",
+                              "typeString": "address payable"
+                            }
+                          },
+                          "src": "9582:27:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "id": 751,
+                        "nodeType": "ExpressionStatement",
+                        "src": "9582:27:0"
+                      },
+                      {
+                        "assignments": [
+                          753
+                        ],
+                        "declarations": [
+                          {
+                            "constant": false,
+                            "id": 753,
+                            "name": "contractSignature",
+                            "nodeType": "VariableDeclaration",
+                            "scope": 769,
+                            "src": "9623:30:0",
+                            "stateVariable": false,
+                            "storageLocation": "memory",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_bytes_memory_ptr",
+                              "typeString": "bytes"
+                            },
+                            "typeName": {
+                              "id": 752,
+                              "name": "bytes",
+                              "nodeType": "ElementaryTypeName",
+                              "src": "9623:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bytes_storage_ptr",
+                                "typeString": "bytes"
+                              }
+                            },
+                            "value": null,
+                            "visibility": "internal"
+                          }
+                        ],
+                        "id": 754,
+                        "initialValue": null,
+                        "nodeType": "VariableDeclarationStatement",
+                        "src": "9623:30:0"
+                      },
+                      {
+                        "externalReferences": [
+                          {
+                            "contractSignature": {
+                              "declaration": 753,
+                              "isOffset": false,
+                              "isSlot": false,
+                              "src": "9897:17:0",
+                              "valueSize": 1
+                            }
+                          },
+                          {
+                            "signature": {
+                              "declaration": 699,
+                              "isOffset": false,
+                              "isSlot": false,
+                              "src": "9926:9:0",
+                              "valueSize": 1
+                            }
+                          },
+                          {
+                            "s": {
+                              "declaration": 729,
+                              "isOffset": false,
+                              "isSlot": false,
+                              "src": "9937:1:0",
+                              "valueSize": 1
+                            }
+                          }
+                        ],
+                        "id": 755,
+                        "nodeType": "InlineAssembly",
+                        "operations": "{\n    contractSignature := add(add(signature, s), 0x20)\n}",
+                        "src": "9735:225:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "commonType": {
+                                "typeIdentifier": "t_bytes4",
+                                "typeString": "bytes4"
+                              },
+                              "id": 765,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "leftExpression": {
+                                "argumentTypes": null,
+                                "arguments": [
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 761,
+                                    "name": "transferHashData",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 701,
+                                    "src": "10042:16:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes_memory_ptr",
+                                      "typeString": "bytes memory"
+                                    }
+                                  },
+                                  {
+                                    "argumentTypes": null,
+                                    "id": 762,
+                                    "name": "contractSignature",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 753,
+                                    "src": "10060:17:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_bytes_memory_ptr",
+                                      "typeString": "bytes memory"
+                                    }
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": [
+                                    {
+                                      "typeIdentifier": "t_bytes_memory_ptr",
+                                      "typeString": "bytes memory"
+                                    },
+                                    {
+                                      "typeIdentifier": "t_bytes_memory_ptr",
+                                      "typeString": "bytes memory"
+                                    }
+                                  ],
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "arguments": [
+                                      {
+                                        "argumentTypes": null,
+                                        "id": 758,
+                                        "name": "owner",
+                                        "nodeType": "Identifier",
+                                        "overloadedDeclarations": [],
+                                        "referencedDeclaration": 704,
+                                        "src": "10018:5:0",
+                                        "typeDescriptions": {
+                                          "typeIdentifier": "t_address",
+                                          "typeString": "address"
+                                        }
+                                      }
+                                    ],
+                                    "expression": {
+                                      "argumentTypes": [
+                                        {
+                                          "typeIdentifier": "t_address",
+                                          "typeString": "address"
+                                        }
+                                      ],
+                                      "id": 757,
+                                      "name": "ISignatureValidator",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 3516,
+                                      "src": "9998:19:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_type$_t_contract$_ISignatureValidator_$3516_$",
+                                        "typeString": "type(contract ISignatureValidator)"
+                                      }
+                                    },
+                                    "id": 759,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "kind": "typeConversion",
+                                    "lValueRequested": false,
+                                    "names": [],
+                                    "nodeType": "FunctionCall",
+                                    "src": "9998:26:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_contract$_ISignatureValidator_$3516",
+                                      "typeString": "contract ISignatureValidator"
+                                    }
+                                  },
+                                  "id": 760,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "memberName": "isValidSignature",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": 3515,
+                                  "src": "9998:43:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_function_external_view$_t_bytes_memory_ptr_$_t_bytes_memory_ptr_$returns$_t_bytes4_$",
+                                    "typeString": "function (bytes memory,bytes memory) view external returns (bytes4)"
+                                  }
+                                },
+                                "id": 763,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "kind": "functionCall",
+                                "lValueRequested": false,
+                                "names": [],
+                                "nodeType": "FunctionCall",
+                                "src": "9998:80:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_bytes4",
+                                  "typeString": "bytes4"
+                                }
+                              },
+                              "nodeType": "BinaryOperation",
+                              "operator": "==",
+                              "rightExpression": {
+                                "argumentTypes": null,
+                                "id": 764,
+                                "name": "EIP1271_MAGIC_VALUE",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 3503,
+                                "src": "10082:19:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_bytes4",
+                                  "typeString": "bytes4"
+                                }
+                              },
+                              "src": "9998:103:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "436f756c64206e6f742076616c6964617465204549502d31323731207369676e6174757265",
+                              "id": 766,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "string",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "10119:39:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_stringliteral_28b765f195c3cd598e06ecb11ef8b4894757ebf4babad4a035bcaf2f5d0e18e5",
+                                "typeString": "literal_string \"Could not validate EIP-1271 signature\""
+                              },
+                              "value": "Could not validate EIP-1271 signature"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              },
+                              {
+                                "typeIdentifier": "t_stringliteral_28b765f195c3cd598e06ecb11ef8b4894757ebf4babad4a035bcaf2f5d0e18e5",
+                                "typeString": "literal_string \"Could not validate EIP-1271 signature\""
+                              }
+                            ],
+                            "id": 756,
+                            "name": "require",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [
+                              4980,
+                              4981
+                            ],
+                            "referencedDeclaration": 4981,
+                            "src": "9973:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                              "typeString": "function (bool,string memory) pure"
+                            }
+                          },
+                          "id": 767,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "9973:199:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 768,
+                        "nodeType": "ExpressionStatement",
+                        "src": "9973:199:0"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 818,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "recoverSignature",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 702,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 699,
+                  "name": "signature",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 818,
+                  "src": "8945:22:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_memory_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 698,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8945:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 701,
+                  "name": "transferHashData",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 818,
+                  "src": "8969:29:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_bytes_memory_ptr",
+                    "typeString": "bytes"
+                  },
+                  "typeName": {
+                    "id": 700,
+                    "name": "bytes",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "8969:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bytes_storage_ptr",
+                      "typeString": "bytes"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "8944:55:0"
+            },
+            "returnParameters": {
+              "id": 705,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 704,
+                  "name": "owner",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 818,
+                  "src": "9022:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 703,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "9022:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "9021:15:0"
+            },
+            "scope": 1224,
+            "src": "8919:1919:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "private"
+          },
+          {
+            "body": {
+              "id": 872,
+              "nodeType": "Block",
+              "src": "10937:476:0",
+              "statements": [
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    },
+                    "id": 833,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 829,
+                      "name": "token",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 822,
+                      "src": "10951:5:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "==",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "hexValue": "30",
+                          "id": 831,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "10968:1:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          "value": "0"
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          }
+                        ],
+                        "id": 830,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "10960:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_address_$",
+                          "typeString": "type(address)"
+                        },
+                        "typeName": "address"
+                      },
+                      "id": 832,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "typeConversion",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "10960:10:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address_payable",
+                        "typeString": "address payable"
+                      }
+                    },
+                    "src": "10951:19:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": {
+                    "id": 870,
+                    "nodeType": "Block",
+                    "src": "11172:235:0",
+                    "statements": [
+                      {
+                        "assignments": [
+                          849
+                        ],
+                        "declarations": [
+                          {
+                            "constant": false,
+                            "id": 849,
+                            "name": "data",
+                            "nodeType": "VariableDeclaration",
+                            "scope": 870,
+                            "src": "11186:17:0",
+                            "stateVariable": false,
+                            "storageLocation": "memory",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_bytes_memory_ptr",
+                              "typeString": "bytes"
+                            },
+                            "typeName": {
+                              "id": 848,
+                              "name": "bytes",
+                              "nodeType": "ElementaryTypeName",
+                              "src": "11186:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bytes_storage_ptr",
+                                "typeString": "bytes"
+                              }
+                            },
+                            "value": null,
+                            "visibility": "internal"
+                          }
+                        ],
+                        "id": 856,
+                        "initialValue": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "7472616e7366657228616464726573732c75696e7432353629",
+                              "id": 852,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "string",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "11230:27:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_stringliteral_a9059cbb2ab09eb219583f4a59a5d0623ade346d962bcd4e46b11da047c9049b",
+                                "typeString": "literal_string \"transfer(address,uint256)\""
+                              },
+                              "value": "transfer(address,uint256)"
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 853,
+                              "name": "to",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 824,
+                              "src": "11259:2:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 854,
+                              "name": "amount",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 826,
+                              "src": "11263:6:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint96",
+                                "typeString": "uint96"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_stringliteral_a9059cbb2ab09eb219583f4a59a5d0623ade346d962bcd4e46b11da047c9049b",
+                                "typeString": "literal_string \"transfer(address,uint256)\""
+                              },
+                              {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              },
+                              {
+                                "typeIdentifier": "t_uint96",
+                                "typeString": "uint96"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 850,
+                              "name": "abi",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4964,
+                              "src": "11206:3:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_magic_abi",
+                                "typeString": "abi"
+                              }
+                            },
+                            "id": 851,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "lValueRequested": false,
+                            "memberName": "encodeWithSignature",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "11206:23:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$",
+                              "typeString": "function (string memory) pure returns (bytes memory)"
+                            }
+                          },
+                          "id": 855,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "11206:64:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bytes_memory_ptr",
+                            "typeString": "bytes memory"
+                          }
+                        },
+                        "nodeType": "VariableDeclarationStatement",
+                        "src": "11186:84:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "arguments": [
+                                {
+                                  "argumentTypes": null,
+                                  "id": 860,
+                                  "name": "token",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 822,
+                                  "src": "11323:5:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                },
+                                {
+                                  "argumentTypes": null,
+                                  "hexValue": "30",
+                                  "id": 861,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "kind": "number",
+                                  "lValueRequested": false,
+                                  "nodeType": "Literal",
+                                  "src": "11330:1:0",
+                                  "subdenomination": null,
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_rational_0_by_1",
+                                    "typeString": "int_const 0"
+                                  },
+                                  "value": "0"
+                                },
+                                {
+                                  "argumentTypes": null,
+                                  "id": 862,
+                                  "name": "data",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 849,
+                                  "src": "11333:4:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_bytes_memory_ptr",
+                                    "typeString": "bytes memory"
+                                  }
+                                },
+                                {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "expression": {
+                                      "argumentTypes": null,
+                                      "id": 863,
+                                      "name": "Enum",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 3235,
+                                      "src": "11339:4:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_type$_t_contract$_Enum_$3235_$",
+                                        "typeString": "type(contract Enum)"
+                                      }
+                                    },
+                                    "id": 864,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "memberName": "Operation",
+                                    "nodeType": "MemberAccess",
+                                    "referencedDeclaration": 3234,
+                                    "src": "11339:14:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_type$_t_enum$_Operation_$3234_$",
+                                      "typeString": "type(enum Enum.Operation)"
+                                    }
+                                  },
+                                  "id": 865,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "lValueRequested": false,
+                                  "memberName": "Call",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": null,
+                                  "src": "11339:19:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_enum$_Operation_$3234",
+                                    "typeString": "enum Enum.Operation"
+                                  }
+                                }
+                              ],
+                              "expression": {
+                                "argumentTypes": [
+                                  {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  },
+                                  {
+                                    "typeIdentifier": "t_rational_0_by_1",
+                                    "typeString": "int_const 0"
+                                  },
+                                  {
+                                    "typeIdentifier": "t_bytes_memory_ptr",
+                                    "typeString": "bytes memory"
+                                  },
+                                  {
+                                    "typeIdentifier": "t_enum$_Operation_$3234",
+                                    "typeString": "enum Enum.Operation"
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": null,
+                                  "id": 858,
+                                  "name": "safe",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 820,
+                                  "src": "11292:4:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                    "typeString": "contract GnosisSafe"
+                                  }
+                                },
+                                "id": 859,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "memberName": "execTransactionFromModule",
+                                "nodeType": "MemberAccess",
+                                "referencedDeclaration": 17,
+                                "src": "11292:30:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$_t_bytes_memory_ptr_$_t_enum$_Operation_$3234_$returns$_t_bool_$",
+                                  "typeString": "function (address,uint256,bytes memory,enum Enum.Operation) external returns (bool)"
+                                }
+                              },
+                              "id": 866,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "kind": "functionCall",
+                              "lValueRequested": false,
+                              "names": [],
+                              "nodeType": "FunctionCall",
+                              "src": "11292:67:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "436f756c64206e6f74206578656375746520746f6b656e207472616e73666572",
+                              "id": 867,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "string",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "11361:34:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_stringliteral_00c0b742664159361be6aebbe2af44c4ae7eb95e13260265d1e1cf75d2593709",
+                                "typeString": "literal_string \"Could not execute token transfer\""
+                              },
+                              "value": "Could not execute token transfer"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              },
+                              {
+                                "typeIdentifier": "t_stringliteral_00c0b742664159361be6aebbe2af44c4ae7eb95e13260265d1e1cf75d2593709",
+                                "typeString": "literal_string \"Could not execute token transfer\""
+                              }
+                            ],
+                            "id": 857,
+                            "name": "require",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [
+                              4980,
+                              4981
+                            ],
+                            "referencedDeclaration": 4981,
+                            "src": "11284:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                              "typeString": "function (bool,string memory) pure"
+                            }
+                          },
+                          "id": 868,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "11284:112:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 869,
+                        "nodeType": "ExpressionStatement",
+                        "src": "11284:112:0"
+                      }
+                    ]
+                  },
+                  "id": 871,
+                  "nodeType": "IfStatement",
+                  "src": "10947:460:0",
+                  "trueBody": {
+                    "id": 847,
+                    "nodeType": "Block",
+                    "src": "10972:194:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "arguments": [
+                                {
+                                  "argumentTypes": null,
+                                  "id": 837,
+                                  "name": "to",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 824,
+                                  "src": "11082:2:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_address_payable",
+                                    "typeString": "address payable"
+                                  }
+                                },
+                                {
+                                  "argumentTypes": null,
+                                  "id": 838,
+                                  "name": "amount",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 826,
+                                  "src": "11086:6:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint96",
+                                    "typeString": "uint96"
+                                  }
+                                },
+                                {
+                                  "argumentTypes": null,
+                                  "hexValue": "",
+                                  "id": 839,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "kind": "string",
+                                  "lValueRequested": false,
+                                  "nodeType": "Literal",
+                                  "src": "11094:2:0",
+                                  "subdenomination": null,
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+                                    "typeString": "literal_string \"\""
+                                  },
+                                  "value": ""
+                                },
+                                {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "expression": {
+                                      "argumentTypes": null,
+                                      "id": 840,
+                                      "name": "Enum",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 3235,
+                                      "src": "11098:4:0",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_type$_t_contract$_Enum_$3235_$",
+                                        "typeString": "type(contract Enum)"
+                                      }
+                                    },
+                                    "id": 841,
+                                    "isConstant": false,
+                                    "isLValue": false,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "memberName": "Operation",
+                                    "nodeType": "MemberAccess",
+                                    "referencedDeclaration": 3234,
+                                    "src": "11098:14:0",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_type$_t_enum$_Operation_$3234_$",
+                                      "typeString": "type(enum Enum.Operation)"
+                                    }
+                                  },
+                                  "id": 842,
+                                  "isConstant": false,
+                                  "isLValue": false,
+                                  "isPure": true,
+                                  "lValueRequested": false,
+                                  "memberName": "Call",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": null,
+                                  "src": "11098:19:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_enum$_Operation_$3234",
+                                    "typeString": "enum Enum.Operation"
+                                  }
+                                }
+                              ],
+                              "expression": {
+                                "argumentTypes": [
+                                  {
+                                    "typeIdentifier": "t_address_payable",
+                                    "typeString": "address payable"
+                                  },
+                                  {
+                                    "typeIdentifier": "t_uint96",
+                                    "typeString": "uint96"
+                                  },
+                                  {
+                                    "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+                                    "typeString": "literal_string \"\""
+                                  },
+                                  {
+                                    "typeIdentifier": "t_enum$_Operation_$3234",
+                                    "typeString": "enum Enum.Operation"
+                                  }
+                                ],
+                                "expression": {
+                                  "argumentTypes": null,
+                                  "id": 835,
+                                  "name": "safe",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 820,
+                                  "src": "11051:4:0",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                                    "typeString": "contract GnosisSafe"
+                                  }
+                                },
+                                "id": 836,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "memberName": "execTransactionFromModule",
+                                "nodeType": "MemberAccess",
+                                "referencedDeclaration": 17,
+                                "src": "11051:30:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$_t_bytes_memory_ptr_$_t_enum$_Operation_$3234_$returns$_t_bool_$",
+                                  "typeString": "function (address,uint256,bytes memory,enum Enum.Operation) external returns (bool)"
+                                }
+                              },
+                              "id": 843,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "kind": "functionCall",
+                              "lValueRequested": false,
+                              "names": [],
+                              "nodeType": "FunctionCall",
+                              "src": "11051:67:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "436f756c64206e6f742065786563757465206574686572207472616e73666572",
+                              "id": 844,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "string",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "11120:34:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_stringliteral_2fae53cac084168982e43888b6e5eff084959ab65d511777b56b4cbb265d2586",
+                                "typeString": "literal_string \"Could not execute ether transfer\""
+                              },
+                              "value": "Could not execute ether transfer"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              },
+                              {
+                                "typeIdentifier": "t_stringliteral_2fae53cac084168982e43888b6e5eff084959ab65d511777b56b4cbb265d2586",
+                                "typeString": "literal_string \"Could not execute ether transfer\""
+                              }
+                            ],
+                            "id": 834,
+                            "name": "require",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [
+                              4980,
+                              4981
+                            ],
+                            "referencedDeclaration": 4981,
+                            "src": "11043:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                              "typeString": "function (bool,string memory) pure"
+                            }
+                          },
+                          "id": 845,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "11043:112:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 846,
+                        "nodeType": "ExpressionStatement",
+                        "src": "11043:112:0"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 873,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "transfer",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 827,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 820,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 873,
+                  "src": "10862:15:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                    "typeString": "contract GnosisSafe"
+                  },
+                  "typeName": {
+                    "contractScope": null,
+                    "id": 819,
+                    "name": "GnosisSafe",
+                    "nodeType": "UserDefinedTypeName",
+                    "referencedDeclaration": 18,
+                    "src": "10862:10:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_contract$_GnosisSafe_$18",
+                      "typeString": "contract GnosisSafe"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 822,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 873,
+                  "src": "10879:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 821,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "10879:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 824,
+                  "name": "to",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 873,
+                  "src": "10894:18:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address_payable",
+                    "typeString": "address payable"
+                  },
+                  "typeName": {
+                    "id": 823,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "10894:15:0",
+                    "stateMutability": "payable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address_payable",
+                      "typeString": "address payable"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 826,
+                  "name": "amount",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 873,
+                  "src": "10914:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint96",
+                    "typeString": "uint96"
+                  },
+                  "typeName": {
+                    "id": 825,
+                    "name": "uint96",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "10914:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint96",
+                      "typeString": "uint96"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "10861:67:0"
+            },
+            "returnParameters": {
+              "id": 828,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "10937:0:0"
+            },
+            "scope": 1224,
+            "src": "10844:569:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "private"
+          },
+          {
+            "body": {
+              "id": 889,
+              "nodeType": "Block",
+              "src": "11509:46:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "baseExpression": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "id": 883,
+                        "name": "tokens",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 51,
+                        "src": "11526:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$_$",
+                          "typeString": "mapping(address => mapping(address => address[] storage ref))"
+                        }
+                      },
+                      "id": 885,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "id": 884,
+                        "name": "safe",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 875,
+                        "src": "11533:4:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "IndexAccess",
+                      "src": "11526:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$",
+                        "typeString": "mapping(address => address[] storage ref)"
+                      }
+                    },
+                    "id": 887,
+                    "indexExpression": {
+                      "argumentTypes": null,
+                      "id": 886,
+                      "name": "delegate",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 877,
+                      "src": "11539:8:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "isConstant": false,
+                    "isLValue": true,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "IndexAccess",
+                    "src": "11526:22:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_address_$dyn_storage",
+                      "typeString": "address[] storage ref"
+                    }
+                  },
+                  "functionReturnParameters": 882,
+                  "id": 888,
+                  "nodeType": "Return",
+                  "src": "11519:29:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 890,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "getTokens",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 878,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 875,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 890,
+                  "src": "11438:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 874,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "11438:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 877,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 890,
+                  "src": "11452:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 876,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "11452:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "11437:32:0"
+            },
+            "returnParameters": {
+              "id": 882,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 881,
+                  "name": "",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 890,
+                  "src": "11491:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
+                    "typeString": "address[]"
+                  },
+                  "typeName": {
+                    "baseType": {
+                      "id": 879,
+                      "name": "address",
+                      "nodeType": "ElementaryTypeName",
+                      "src": "11491:7:0",
+                      "stateMutability": "nonpayable",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "id": 880,
+                    "length": null,
+                    "nodeType": "ArrayTypeName",
+                    "src": "11491:9:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                      "typeString": "address[]"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "11490:18:0"
+            },
+            "scope": 1224,
+            "src": "11419:136:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 933,
+              "nodeType": "Block",
+              "src": "11675:313:0",
+              "statements": [
+                {
+                  "assignments": [
+                    904
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 904,
+                      "name": "allowance",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 933,
+                      "src": "11685:26:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                        "typeString": "struct AllowanceModule.Allowance"
+                      },
+                      "typeName": {
+                        "contractScope": null,
+                        "id": 903,
+                        "name": "Allowance",
+                        "nodeType": "UserDefinedTypeName",
+                        "referencedDeclaration": 81,
+                        "src": "11685:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                          "typeString": "struct AllowanceModule.Allowance"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 910,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "id": 906,
+                        "name": "safe",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 892,
+                        "src": "11727:4:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 907,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 894,
+                        "src": "11733:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 908,
+                        "name": "token",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 896,
+                        "src": "11743:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 905,
+                      "name": "getAllowance",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 336,
+                      "src": "11714:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$returns$_t_struct$_Allowance_$81_memory_ptr_$",
+                        "typeString": "function (address,address,address) view returns (struct AllowanceModule.Allowance memory)"
+                      }
+                    },
+                    "id": 909,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "11714:35:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                      "typeString": "struct AllowanceModule.Allowance memory"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "11685:64:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "components": [
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 912,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 904,
+                              "src": "11788:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 913,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "amount",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 72,
+                            "src": "11788:16:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          ],
+                          "id": 911,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "11780:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_uint256_$",
+                            "typeString": "type(uint256)"
+                          },
+                          "typeName": "uint256"
+                        },
+                        "id": 914,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "11780:25:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 916,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 904,
+                              "src": "11827:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 917,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "spent",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 74,
+                            "src": "11827:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          ],
+                          "id": 915,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "11819:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_uint256_$",
+                            "typeString": "type(uint256)"
+                          },
+                          "typeName": "uint256"
+                        },
+                        "id": 918,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "11819:24:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 920,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 904,
+                              "src": "11865:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 921,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "resetTimeMin",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 76,
+                            "src": "11865:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          ],
+                          "id": 919,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "11857:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_uint256_$",
+                            "typeString": "type(uint256)"
+                          },
+                          "typeName": "uint256"
+                        },
+                        "id": 922,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "11857:31:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 924,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 904,
+                              "src": "11910:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 925,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "lastResetMin",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 78,
+                            "src": "11910:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          ],
+                          "id": 923,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "11902:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_uint256_$",
+                            "typeString": "type(uint256)"
+                          },
+                          "typeName": "uint256"
+                        },
+                        "id": 926,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "11902:31:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 928,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 904,
+                              "src": "11955:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 929,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "nonce",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 80,
+                            "src": "11955:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          ],
+                          "id": 927,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "11947:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_uint256_$",
+                            "typeString": "type(uint256)"
+                          },
+                          "typeName": "uint256"
+                        },
+                        "id": 930,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "11947:24:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      }
+                    ],
+                    "id": 931,
+                    "isConstant": false,
+                    "isInlineArray": true,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "11766:215:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_uint256_$5_memory_ptr",
+                      "typeString": "uint256[5] memory"
+                    }
+                  },
+                  "functionReturnParameters": 902,
+                  "id": 932,
+                  "nodeType": "Return",
+                  "src": "11759:222:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 934,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "getTokenAllowance",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 897,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 892,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 934,
+                  "src": "11588:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 891,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "11588:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 894,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 934,
+                  "src": "11602:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 893,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "11602:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 896,
+                  "name": "token",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 934,
+                  "src": "11620:13:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 895,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "11620:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "11587:47:0"
+            },
+            "returnParameters": {
+              "id": 902,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 901,
+                  "name": "",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 934,
+                  "src": "11656:17:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_array$_t_uint256_$5_memory_ptr",
+                    "typeString": "uint256[5]"
+                  },
+                  "typeName": {
+                    "baseType": {
+                      "id": 898,
+                      "name": "uint256",
+                      "nodeType": "ElementaryTypeName",
+                      "src": "11656:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "id": 900,
+                    "length": {
+                      "argumentTypes": null,
+                      "hexValue": "35",
+                      "id": 899,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "11664:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_5_by_1",
+                        "typeString": "int_const 5"
+                      },
+                      "value": "5"
+                    },
+                    "nodeType": "ArrayTypeName",
+                    "src": "11656:10:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_uint256_$5_storage_ptr",
+                      "typeString": "uint256[5]"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "11655:19:0"
+            },
+            "scope": 1224,
+            "src": "11561:427:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 1010,
+              "nodeType": "Block",
+              "src": "12040:517:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        },
+                        "id": 944,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "id": 940,
+                          "name": "delegate",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 936,
+                          "src": "12058:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "!=",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "hexValue": "30",
+                              "id": 942,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": true,
+                              "kind": "number",
+                              "lValueRequested": false,
+                              "nodeType": "Literal",
+                              "src": "12078:1:0",
+                              "subdenomination": null,
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_rational_0_by_1",
+                                "typeString": "int_const 0"
+                              },
+                              "value": "0"
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_rational_0_by_1",
+                                "typeString": "int_const 0"
+                              }
+                            ],
+                            "id": 941,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "lValueRequested": false,
+                            "nodeType": "ElementaryTypeNameExpression",
+                            "src": "12070:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_type$_t_address_$",
+                              "typeString": "type(address)"
+                            },
+                            "typeName": "address"
+                          },
+                          "id": 943,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "typeConversion",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "12070:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address_payable",
+                            "typeString": "address payable"
+                          }
+                        },
+                        "src": "12058:22:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "hexValue": "496e76616c69642064656c65676174652061646472657373",
+                        "id": 945,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "string",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "12082:26:0",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_stringliteral_2748b75fa8e9228d9f46d849def917a80513930a212cbb86b833e29bb53a5909",
+                          "typeString": "literal_string \"Invalid delegate address\""
+                        },
+                        "value": "Invalid delegate address"
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        {
+                          "typeIdentifier": "t_stringliteral_2748b75fa8e9228d9f46d849def917a80513930a212cbb86b833e29bb53a5909",
+                          "typeString": "literal_string \"Invalid delegate address\""
+                        }
+                      ],
+                      "id": 939,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        4980,
+                        4981
+                      ],
+                      "referencedDeclaration": 4981,
+                      "src": "12050:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$",
+                        "typeString": "function (bool,string memory) pure"
+                      }
+                    },
+                    "id": 946,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "12050:59:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 947,
+                  "nodeType": "ExpressionStatement",
+                  "src": "12050:59:0"
+                },
+                {
+                  "assignments": [
+                    949
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 949,
+                      "name": "index",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1010,
+                      "src": "12119:12:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      },
+                      "typeName": {
+                        "id": 948,
+                        "name": "uint48",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "12119:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint48",
+                          "typeString": "uint48"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 953,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "id": 951,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 936,
+                        "src": "12141:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 950,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "lValueRequested": false,
+                      "nodeType": "ElementaryTypeNameExpression",
+                      "src": "12134:6:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_type$_t_uint48_$",
+                        "typeString": "type(uint48)"
+                      },
+                      "typeName": "uint48"
+                    },
+                    "id": 952,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "typeConversion",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "12134:16:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "12119:31:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    },
+                    "id": 964,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 954,
+                            "name": "delegates",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 57,
+                            "src": "12213:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                              "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                            }
+                          },
+                          "id": 957,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 955,
+                              "name": "msg",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4977,
+                              "src": "12223:3:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_magic_message",
+                                "typeString": "msg"
+                              }
+                            },
+                            "id": 956,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "sender",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "12223:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address_payable",
+                              "typeString": "address payable"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "12213:21:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                            "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                          }
+                        },
+                        "id": 959,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "id": 958,
+                          "name": "index",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 949,
+                          "src": "12235:5:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "12213:28:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                          "typeString": "struct AllowanceModule.Delegate storage ref"
+                        }
+                      },
+                      "id": 960,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "delegate",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 65,
+                      "src": "12213:37:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "!=",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "hexValue": "30",
+                          "id": 962,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "12262:1:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          "value": "0"
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          }
+                        ],
+                        "id": 961,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "12254:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_address_$",
+                          "typeString": "type(address)"
+                        },
+                        "typeName": "address"
+                      },
+                      "id": 963,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "typeConversion",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "12254:10:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address_payable",
+                        "typeString": "address payable"
+                      }
+                    },
+                    "src": "12213:51:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 966,
+                  "nodeType": "IfStatement",
+                  "src": "12210:63:0",
+                  "trueBody": {
+                    "expression": null,
+                    "functionReturnParameters": 938,
+                    "id": 965,
+                    "nodeType": "Return",
+                    "src": "12266:7:0"
+                  }
+                },
+                {
+                  "assignments": [
+                    968
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 968,
+                      "name": "startIndex",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1010,
+                      "src": "12282:17:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      },
+                      "typeName": {
+                        "id": 967,
+                        "name": "uint48",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "12282:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint48",
+                          "typeString": "uint48"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 973,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "baseExpression": {
+                      "argumentTypes": null,
+                      "id": 969,
+                      "name": "delegatesStart",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 61,
+                      "src": "12302:14:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_mapping$_t_address_$_t_uint48_$",
+                        "typeString": "mapping(address => uint48)"
+                      }
+                    },
+                    "id": 972,
+                    "indexExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 970,
+                        "name": "msg",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 4977,
+                        "src": "12317:3:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_magic_message",
+                          "typeString": "msg"
+                        }
+                      },
+                      "id": 971,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "sender",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "12317:10:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address_payable",
+                        "typeString": "address payable"
+                      }
+                    },
+                    "isConstant": false,
+                    "isLValue": true,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "IndexAccess",
+                    "src": "12302:26:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "12282:46:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 985,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "id": 974,
+                          "name": "delegates",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 57,
+                          "src": "12338:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                            "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                          }
+                        },
+                        "id": 978,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 975,
+                            "name": "msg",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 4977,
+                            "src": "12348:3:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_magic_message",
+                              "typeString": "msg"
+                            }
+                          },
+                          "id": 976,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "sender",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": null,
+                          "src": "12348:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address_payable",
+                            "typeString": "address payable"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "12338:21:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                          "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                        }
+                      },
+                      "id": 979,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "id": 977,
+                        "name": "index",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 949,
+                        "src": "12360:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint48",
+                          "typeString": "uint48"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "nodeType": "IndexAccess",
+                      "src": "12338:28:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                        "typeString": "struct AllowanceModule.Delegate storage ref"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "id": 981,
+                          "name": "delegate",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 936,
+                          "src": "12378:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        {
+                          "argumentTypes": null,
+                          "hexValue": "30",
+                          "id": 982,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "12388:1:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          "value": "0"
+                        },
+                        {
+                          "argumentTypes": null,
+                          "id": 983,
+                          "name": "startIndex",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 968,
+                          "src": "12391:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          }
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          }
+                        ],
+                        "id": 980,
+                        "name": "Delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 70,
+                        "src": "12369:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_struct$_Delegate_$70_storage_ptr_$",
+                          "typeString": "type(struct AllowanceModule.Delegate storage pointer)"
+                        }
+                      },
+                      "id": 984,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "structConstructorCall",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "12369:33:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Delegate_$70_memory",
+                        "typeString": "struct AllowanceModule.Delegate memory"
+                      }
+                    },
+                    "src": "12338:64:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                      "typeString": "struct AllowanceModule.Delegate storage ref"
+                    }
+                  },
+                  "id": 986,
+                  "nodeType": "ExpressionStatement",
+                  "src": "12338:64:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 995,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 987,
+                            "name": "delegates",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 57,
+                            "src": "12412:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                              "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                            }
+                          },
+                          "id": 991,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 988,
+                              "name": "msg",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4977,
+                              "src": "12422:3:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_magic_message",
+                                "typeString": "msg"
+                              }
+                            },
+                            "id": 989,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "sender",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "12422:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address_payable",
+                              "typeString": "address payable"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "12412:21:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                            "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                          }
+                        },
+                        "id": 992,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "id": 990,
+                          "name": "startIndex",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 968,
+                          "src": "12434:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "12412:33:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                          "typeString": "struct AllowanceModule.Delegate storage ref"
+                        }
+                      },
+                      "id": 993,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "prev",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 67,
+                      "src": "12412:38:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 994,
+                      "name": "index",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 949,
+                      "src": "12453:5:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "src": "12412:46:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "id": 996,
+                  "nodeType": "ExpressionStatement",
+                  "src": "12412:46:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 1002,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "id": 997,
+                        "name": "delegatesStart",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 61,
+                        "src": "12468:14:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_uint48_$",
+                          "typeString": "mapping(address => uint48)"
+                        }
+                      },
+                      "id": 1000,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 998,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "12483:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 999,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "12483:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "nodeType": "IndexAccess",
+                      "src": "12468:26:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 1001,
+                      "name": "index",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 949,
+                      "src": "12497:5:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "src": "12468:34:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "id": 1003,
+                  "nodeType": "ExpressionStatement",
+                  "src": "12468:34:0"
+                },
+                {
+                  "eventCall": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1005,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "12529:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 1006,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "12529:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 1007,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 936,
+                        "src": "12541:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 1004,
+                      "name": "AddDelegate",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 87,
+                      "src": "12517:11:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
+                        "typeString": "function (address,address)"
+                      }
+                    },
+                    "id": 1008,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "12517:33:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 1009,
+                  "nodeType": "EmitStatement",
+                  "src": "12512:38:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 1011,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "addDelegate",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 937,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 936,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1011,
+                  "src": "12015:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 935,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "12015:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "12014:18:0"
+            },
+            "returnParameters": {
+              "id": 938,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "12040:0:0"
+            },
+            "scope": 1224,
+            "src": "11994:563:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 1136,
+              "nodeType": "Block",
+              "src": "12612:918:0",
+              "statements": [
+                {
+                  "assignments": [
+                    1017
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 1017,
+                      "name": "current",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1136,
+                      "src": "12622:23:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                        "typeString": "struct AllowanceModule.Delegate"
+                      },
+                      "typeName": {
+                        "contractScope": null,
+                        "id": 1016,
+                        "name": "Delegate",
+                        "nodeType": "UserDefinedTypeName",
+                        "referencedDeclaration": 70,
+                        "src": "12622:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_storage_ptr",
+                          "typeString": "struct AllowanceModule.Delegate"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 1026,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "baseExpression": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "id": 1018,
+                        "name": "delegates",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 57,
+                        "src": "12648:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                          "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                        }
+                      },
+                      "id": 1021,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1019,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "12658:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 1020,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "12658:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "IndexAccess",
+                      "src": "12648:21:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                        "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                      }
+                    },
+                    "id": 1025,
+                    "indexExpression": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "id": 1023,
+                          "name": "delegate",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 1013,
+                          "src": "12677:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        ],
+                        "id": 1022,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "12670:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_uint48_$",
+                          "typeString": "type(uint48)"
+                        },
+                        "typeName": "uint48"
+                      },
+                      "id": 1024,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "typeConversion",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "12670:16:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "isConstant": false,
+                    "isLValue": true,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "IndexAccess",
+                    "src": "12648:39:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                      "typeString": "struct AllowanceModule.Delegate storage ref"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "12622:65:0"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    },
+                    "id": 1032,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 1027,
+                        "name": "current",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1017,
+                        "src": "12750:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                          "typeString": "struct AllowanceModule.Delegate memory"
+                        }
+                      },
+                      "id": 1028,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "delegate",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 65,
+                      "src": "12750:16:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "==",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "hexValue": "30",
+                          "id": 1030,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "12778:1:0",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          },
+                          "value": "0"
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_rational_0_by_1",
+                            "typeString": "int_const 0"
+                          }
+                        ],
+                        "id": 1029,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "12770:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_address_$",
+                          "typeString": "type(address)"
+                        },
+                        "typeName": "address"
+                      },
+                      "id": 1031,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "typeConversion",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "12770:10:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address_payable",
+                        "typeString": "address payable"
+                      }
+                    },
+                    "src": "12750:30:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 1034,
+                  "nodeType": "IfStatement",
+                  "src": "12747:42:0",
+                  "trueBody": {
+                    "expression": null,
+                    "functionReturnParameters": 1015,
+                    "id": 1033,
+                    "nodeType": "Return",
+                    "src": "12782:7:0"
+                  }
+                },
+                {
+                  "assignments": [
+                    1038
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 1038,
+                      "name": "delegateTokens",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1136,
+                      "src": "12798:32:0",
+                      "stateVariable": false,
+                      "storageLocation": "storage",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                        "typeString": "address[]"
+                      },
+                      "typeName": {
+                        "baseType": {
+                          "id": 1036,
+                          "name": "address",
+                          "nodeType": "ElementaryTypeName",
+                          "src": "12798:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "id": 1037,
+                        "length": null,
+                        "nodeType": "ArrayTypeName",
+                        "src": "12798:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                          "typeString": "address[]"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 1045,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "baseExpression": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "id": 1039,
+                        "name": "tokens",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 51,
+                        "src": "12833:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$_$",
+                          "typeString": "mapping(address => mapping(address => address[] storage ref))"
+                        }
+                      },
+                      "id": 1042,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1040,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "12840:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 1041,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "12840:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "IndexAccess",
+                      "src": "12833:18:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$",
+                        "typeString": "mapping(address => address[] storage ref)"
+                      }
+                    },
+                    "id": 1044,
+                    "indexExpression": {
+                      "argumentTypes": null,
+                      "id": 1043,
+                      "name": "delegate",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 1013,
+                      "src": "12852:8:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "isConstant": false,
+                    "isLValue": true,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "IndexAccess",
+                    "src": "12833:28:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_address_$dyn_storage",
+                      "typeString": "address[] storage ref"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "12798:63:0"
+                },
+                {
+                  "body": {
+                    "id": 1104,
+                    "nodeType": "Block",
+                    "src": "12923:420:0",
+                    "statements": [
+                      {
+                        "assignments": [
+                          1058
+                        ],
+                        "declarations": [
+                          {
+                            "constant": false,
+                            "id": 1058,
+                            "name": "token",
+                            "nodeType": "VariableDeclaration",
+                            "scope": 1104,
+                            "src": "12937:13:0",
+                            "stateVariable": false,
+                            "storageLocation": "default",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            },
+                            "typeName": {
+                              "id": 1057,
+                              "name": "address",
+                              "nodeType": "ElementaryTypeName",
+                              "src": "12937:7:0",
+                              "stateMutability": "nonpayable",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            "value": null,
+                            "visibility": "internal"
+                          }
+                        ],
+                        "id": 1062,
+                        "initialValue": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 1059,
+                            "name": "delegateTokens",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1038,
+                            "src": "12953:14:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                              "typeString": "address[] storage pointer"
+                            }
+                          },
+                          "id": 1061,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "id": 1060,
+                            "name": "i",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1047,
+                            "src": "12968:1:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint256",
+                              "typeString": "uint256"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "12953:17:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "nodeType": "VariableDeclarationStatement",
+                        "src": "12937:33:0"
+                      },
+                      {
+                        "assignments": [
+                          1064
+                        ],
+                        "declarations": [
+                          {
+                            "constant": false,
+                            "id": 1064,
+                            "name": "allowance",
+                            "nodeType": "VariableDeclaration",
+                            "scope": 1104,
+                            "src": "13046:26:0",
+                            "stateVariable": false,
+                            "storageLocation": "memory",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                              "typeString": "struct AllowanceModule.Allowance"
+                            },
+                            "typeName": {
+                              "contractScope": null,
+                              "id": 1063,
+                              "name": "Allowance",
+                              "nodeType": "UserDefinedTypeName",
+                              "referencedDeclaration": 81,
+                              "src": "13046:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_storage_ptr",
+                                "typeString": "struct AllowanceModule.Allowance"
+                              }
+                            },
+                            "value": null,
+                            "visibility": "internal"
+                          }
+                        ],
+                        "id": 1071,
+                        "initialValue": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 1066,
+                                "name": "msg",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4977,
+                                "src": "13088:3:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_magic_message",
+                                  "typeString": "msg"
+                                }
+                              },
+                              "id": 1067,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "sender",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": null,
+                              "src": "13088:10:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 1068,
+                              "name": "delegate",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1013,
+                              "src": "13100:8:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 1069,
+                              "name": "token",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1058,
+                              "src": "13110:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "id": 1065,
+                            "name": "getAllowance",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 336,
+                            "src": "13075:12:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$returns$_t_struct$_Allowance_$81_memory_ptr_$",
+                              "typeString": "function (address,address,address) view returns (struct AllowanceModule.Allowance memory)"
+                            }
+                          },
+                          "id": 1070,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "13075:41:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                            "typeString": "struct AllowanceModule.Allowance memory"
+                          }
+                        },
+                        "nodeType": "VariableDeclarationStatement",
+                        "src": "13046:70:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1076,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1072,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1064,
+                              "src": "13130:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 1074,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "amount",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 72,
+                            "src": "13130:16:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 1075,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "13149:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          },
+                          "src": "13130:20:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          }
+                        },
+                        "id": 1077,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13130:20:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1082,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1078,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1064,
+                              "src": "13164:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 1080,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "spent",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 74,
+                            "src": "13164:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint96",
+                              "typeString": "uint96"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 1081,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "13182:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          },
+                          "src": "13164:19:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint96",
+                            "typeString": "uint96"
+                          }
+                        },
+                        "id": 1083,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13164:19:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1088,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1084,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1064,
+                              "src": "13197:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 1086,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "resetTimeMin",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 76,
+                            "src": "13197:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint16",
+                              "typeString": "uint16"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 1087,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "13222:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          },
+                          "src": "13197:26:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint16",
+                            "typeString": "uint16"
+                          }
+                        },
+                        "id": 1089,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13197:26:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1094,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1090,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1064,
+                              "src": "13237:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            },
+                            "id": 1092,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "lastResetMin",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 78,
+                            "src": "13237:22:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint32",
+                              "typeString": "uint32"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 1093,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "13262:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          },
+                          "src": "13237:26:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint32",
+                            "typeString": "uint32"
+                          }
+                        },
+                        "id": 1095,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13237:26:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 1097,
+                                "name": "msg",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4977,
+                                "src": "13293:3:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_magic_message",
+                                  "typeString": "msg"
+                                }
+                              },
+                              "id": 1098,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "sender",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": null,
+                              "src": "13293:10:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 1099,
+                              "name": "delegate",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1013,
+                              "src": "13305:8:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 1100,
+                              "name": "token",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1058,
+                              "src": "13315:5:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "id": 1101,
+                              "name": "allowance",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1064,
+                              "src": "13322:9:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address_payable",
+                                "typeString": "address payable"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_struct$_Allowance_$81_memory_ptr",
+                                "typeString": "struct AllowanceModule.Allowance memory"
+                              }
+                            ],
+                            "id": 1096,
+                            "name": "updateAllowance",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 358,
+                            "src": "13277:15:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_struct$_Allowance_$81_memory_ptr_$returns$__$",
+                              "typeString": "function (address,address,address,struct AllowanceModule.Allowance memory)"
+                            }
+                          },
+                          "id": 1102,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "13277:55:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 1103,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13277:55:0"
+                      }
+                    ]
+                  },
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    },
+                    "id": 1053,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 1050,
+                      "name": "i",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 1047,
+                      "src": "12891:1:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "<",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 1051,
+                        "name": "delegateTokens",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1038,
+                        "src": "12895:14:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                          "typeString": "address[] storage pointer"
+                        }
+                      },
+                      "id": 1052,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "length",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "12895:21:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "src": "12891:25:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "id": 1105,
+                  "initializationExpression": {
+                    "assignments": [
+                      1047
+                    ],
+                    "declarations": [
+                      {
+                        "constant": false,
+                        "id": 1047,
+                        "name": "i",
+                        "nodeType": "VariableDeclaration",
+                        "scope": 1105,
+                        "src": "12876:9:0",
+                        "stateVariable": false,
+                        "storageLocation": "default",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        },
+                        "typeName": {
+                          "id": 1046,
+                          "name": "uint256",
+                          "nodeType": "ElementaryTypeName",
+                          "src": "12876:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "value": null,
+                        "visibility": "internal"
+                      }
+                    ],
+                    "id": 1049,
+                    "initialValue": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 1048,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "12888:1:0",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    },
+                    "nodeType": "VariableDeclarationStatement",
+                    "src": "12876:13:0"
+                  },
+                  "loopExpression": {
+                    "expression": {
+                      "argumentTypes": null,
+                      "id": 1055,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "UnaryOperation",
+                      "operator": "++",
+                      "prefix": false,
+                      "src": "12918:3:0",
+                      "subExpression": {
+                        "argumentTypes": null,
+                        "id": 1054,
+                        "name": "i",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1047,
+                        "src": "12918:1:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      },
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "id": 1056,
+                    "nodeType": "ExpressionStatement",
+                    "src": "12918:3:0"
+                  },
+                  "nodeType": "ForStatement",
+                  "src": "12871:472:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 1116,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 1106,
+                            "name": "delegates",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 57,
+                            "src": "13352:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                              "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                            }
+                          },
+                          "id": 1111,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1107,
+                              "name": "msg",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4977,
+                              "src": "13362:3:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_magic_message",
+                                "typeString": "msg"
+                              }
+                            },
+                            "id": 1108,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "sender",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "13362:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address_payable",
+                              "typeString": "address payable"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "13352:21:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                            "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                          }
+                        },
+                        "id": 1112,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 1109,
+                            "name": "current",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1017,
+                            "src": "13374:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                              "typeString": "struct AllowanceModule.Delegate memory"
+                            }
+                          },
+                          "id": 1110,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "prev",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 67,
+                          "src": "13374:12:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "13352:35:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                          "typeString": "struct AllowanceModule.Delegate storage ref"
+                        }
+                      },
+                      "id": 1113,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "next",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 69,
+                      "src": "13352:40:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 1114,
+                        "name": "current",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1017,
+                        "src": "13395:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                          "typeString": "struct AllowanceModule.Delegate memory"
+                        }
+                      },
+                      "id": 1115,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "next",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 69,
+                      "src": "13395:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "src": "13352:55:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "id": 1117,
+                  "nodeType": "ExpressionStatement",
+                  "src": "13352:55:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 1128,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "baseExpression": {
+                            "argumentTypes": null,
+                            "id": 1118,
+                            "name": "delegates",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 57,
+                            "src": "13417:9:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                              "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                            }
+                          },
+                          "id": 1123,
+                          "indexExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1119,
+                              "name": "msg",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4977,
+                              "src": "13427:3:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_magic_message",
+                                "typeString": "msg"
+                              }
+                            },
+                            "id": 1120,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "sender",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": null,
+                            "src": "13427:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address_payable",
+                              "typeString": "address payable"
+                            }
+                          },
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "IndexAccess",
+                          "src": "13417:21:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                            "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                          }
+                        },
+                        "id": 1124,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 1121,
+                            "name": "current",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1017,
+                            "src": "13439:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                              "typeString": "struct AllowanceModule.Delegate memory"
+                            }
+                          },
+                          "id": 1122,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "next",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 69,
+                          "src": "13439:12:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "13417:35:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                          "typeString": "struct AllowanceModule.Delegate storage ref"
+                        }
+                      },
+                      "id": 1125,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "prev",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 67,
+                      "src": "13417:40:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 1126,
+                        "name": "current",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1017,
+                        "src": "13460:7:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                          "typeString": "struct AllowanceModule.Delegate memory"
+                        }
+                      },
+                      "id": 1127,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "prev",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 67,
+                      "src": "13460:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "src": "13417:55:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "id": 1129,
+                  "nodeType": "ExpressionStatement",
+                  "src": "13417:55:0"
+                },
+                {
+                  "eventCall": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1131,
+                          "name": "msg",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 4977,
+                          "src": "13502:3:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_magic_message",
+                            "typeString": "msg"
+                          }
+                        },
+                        "id": 1132,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "sender",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": null,
+                        "src": "13502:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      {
+                        "argumentTypes": null,
+                        "id": 1133,
+                        "name": "delegate",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1013,
+                        "src": "13514:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        },
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 1130,
+                      "name": "RemoveDelegate",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 93,
+                      "src": "13487:14:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
+                        "typeString": "function (address,address)"
+                      }
+                    },
+                    "id": 1134,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "13487:36:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 1135,
+                  "nodeType": "EmitStatement",
+                  "src": "13482:41:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 1137,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "removeDelegate",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 1014,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 1013,
+                  "name": "delegate",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1137,
+                  "src": "12587:16:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 1012,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "12587:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "12586:18:0"
+            },
+            "returnParameters": {
+              "id": 1015,
+              "nodeType": "ParameterList",
+              "parameters": [],
+              "src": "12612:0:0"
+            },
+            "scope": 1224,
+            "src": "12563:967:0",
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          {
+            "body": {
+              "id": 1222,
+              "nodeType": "Block",
+              "src": "13662:633:0",
+              "statements": [
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 1157,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "id": 1151,
+                      "name": "results",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 1147,
+                      "src": "13672:7:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
+                        "typeString": "address[] memory"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "id": 1155,
+                          "name": "pageSize",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 1143,
+                          "src": "13696:8:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint8",
+                            "typeString": "uint8"
+                          }
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_uint8",
+                            "typeString": "uint8"
+                          }
+                        ],
+                        "id": 1154,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "NewExpression",
+                        "src": "13682:13:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_address_$dyn_memory_$",
+                          "typeString": "function (uint256) pure returns (address[] memory)"
+                        },
+                        "typeName": {
+                          "baseType": {
+                            "id": 1152,
+                            "name": "address",
+                            "nodeType": "ElementaryTypeName",
+                            "src": "13686:7:0",
+                            "stateMutability": "nonpayable",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "id": 1153,
+                          "length": null,
+                          "nodeType": "ArrayTypeName",
+                          "src": "13686:9:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                            "typeString": "address[]"
+                          }
+                        }
+                      },
+                      "id": 1156,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "functionCall",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "13682:23:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_array$_t_address_$dyn_memory",
+                        "typeString": "address[] memory"
+                      }
+                    },
+                    "src": "13672:33:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
+                      "typeString": "address[] memory"
+                    }
+                  },
+                  "id": 1158,
+                  "nodeType": "ExpressionStatement",
+                  "src": "13672:33:0"
+                },
+                {
+                  "assignments": [
+                    1160
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 1160,
+                      "name": "i",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1222,
+                      "src": "13715:7:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint8",
+                        "typeString": "uint8"
+                      },
+                      "typeName": {
+                        "id": 1159,
+                        "name": "uint8",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "13715:5:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint8",
+                          "typeString": "uint8"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 1162,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "hexValue": "30",
+                    "id": 1161,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": true,
+                    "kind": "number",
+                    "lValueRequested": false,
+                    "nodeType": "Literal",
+                    "src": "13725:1:0",
+                    "subdenomination": null,
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_rational_0_by_1",
+                      "typeString": "int_const 0"
+                    },
+                    "value": "0"
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "13715:11:0"
+                },
+                {
+                  "assignments": [
+                    1164
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 1164,
+                      "name": "initialIndex",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1222,
+                      "src": "13736:19:0",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      },
+                      "typeName": {
+                        "id": 1163,
+                        "name": "uint48",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "13736:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint48",
+                          "typeString": "uint48"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 1174,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "condition": {
+                      "argumentTypes": null,
+                      "components": [
+                        {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_uint48",
+                            "typeString": "uint48"
+                          },
+                          "id": 1167,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "id": 1165,
+                            "name": "start",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1141,
+                            "src": "13759:5:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint48",
+                              "typeString": "uint48"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "!=",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 1166,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "13768:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          },
+                          "src": "13759:10:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        }
+                      ],
+                      "id": 1168,
+                      "isConstant": false,
+                      "isInlineArray": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "TupleExpression",
+                      "src": "13758:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "falseExpression": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "id": 1170,
+                        "name": "delegatesStart",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 61,
+                        "src": "13781:14:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_uint48_$",
+                          "typeString": "mapping(address => uint48)"
+                        }
+                      },
+                      "id": 1172,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "id": 1171,
+                        "name": "safe",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1139,
+                        "src": "13796:4:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "IndexAccess",
+                      "src": "13781:20:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "id": 1173,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "Conditional",
+                    "src": "13758:43:0",
+                    "trueExpression": {
+                      "argumentTypes": null,
+                      "id": 1169,
+                      "name": "start",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 1141,
+                      "src": "13773:5:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "13736:65:0"
+                },
+                {
+                  "assignments": [
+                    1176
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 1176,
+                      "name": "current",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 1222,
+                      "src": "13811:23:0",
+                      "stateVariable": false,
+                      "storageLocation": "memory",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                        "typeString": "struct AllowanceModule.Delegate"
+                      },
+                      "typeName": {
+                        "contractScope": null,
+                        "id": 1175,
+                        "name": "Delegate",
+                        "nodeType": "UserDefinedTypeName",
+                        "referencedDeclaration": 70,
+                        "src": "13811:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Delegate_$70_storage_ptr",
+                          "typeString": "struct AllowanceModule.Delegate"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 1182,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "baseExpression": {
+                      "argumentTypes": null,
+                      "baseExpression": {
+                        "argumentTypes": null,
+                        "id": 1177,
+                        "name": "delegates",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 57,
+                        "src": "13837:9:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                          "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                        }
+                      },
+                      "id": 1179,
+                      "indexExpression": {
+                        "argumentTypes": null,
+                        "id": 1178,
+                        "name": "safe",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1139,
+                        "src": "13847:4:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "IndexAccess",
+                      "src": "13837:15:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                        "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                      }
+                    },
+                    "id": 1181,
+                    "indexExpression": {
+                      "argumentTypes": null,
+                      "id": 1180,
+                      "name": "initialIndex",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 1164,
+                      "src": "13853:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "isConstant": false,
+                    "isLValue": true,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "IndexAccess",
+                    "src": "13837:29:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                      "typeString": "struct AllowanceModule.Delegate storage ref"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "13811:55:0"
+                },
+                {
+                  "body": {
+                    "id": 1212,
+                    "nodeType": "Block",
+                    "src": "13930:124:0",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1198,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "baseExpression": {
+                              "argumentTypes": null,
+                              "id": 1193,
+                              "name": "results",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1147,
+                              "src": "13944:7:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
+                                "typeString": "address[] memory"
+                              }
+                            },
+                            "id": 1195,
+                            "indexExpression": {
+                              "argumentTypes": null,
+                              "id": 1194,
+                              "name": "i",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1160,
+                              "src": "13952:1:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint8",
+                                "typeString": "uint8"
+                              }
+                            },
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "nodeType": "IndexAccess",
+                            "src": "13944:10:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 1196,
+                              "name": "current",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 1176,
+                              "src": "13957:7:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                                "typeString": "struct AllowanceModule.Delegate memory"
+                              }
+                            },
+                            "id": 1197,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "delegate",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 65,
+                            "src": "13957:16:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "src": "13944:29:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        },
+                        "id": 1199,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13944:29:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1201,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "nodeType": "UnaryOperation",
+                          "operator": "++",
+                          "prefix": false,
+                          "src": "13987:3:0",
+                          "subExpression": {
+                            "argumentTypes": null,
+                            "id": 1200,
+                            "name": "i",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1160,
+                            "src": "13987:1:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_uint8",
+                              "typeString": "uint8"
+                            }
+                          },
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint8",
+                            "typeString": "uint8"
+                          }
+                        },
+                        "id": 1202,
+                        "nodeType": "ExpressionStatement",
+                        "src": "13987:3:0"
+                      },
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1210,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "id": 1203,
+                            "name": "current",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1176,
+                            "src": "14004:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                              "typeString": "struct AllowanceModule.Delegate memory"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "baseExpression": {
+                              "argumentTypes": null,
+                              "baseExpression": {
+                                "argumentTypes": null,
+                                "id": 1204,
+                                "name": "delegates",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 57,
+                                "src": "14014:9:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$_$",
+                                  "typeString": "mapping(address => mapping(uint48 => struct AllowanceModule.Delegate storage ref))"
+                                }
+                              },
+                              "id": 1206,
+                              "indexExpression": {
+                                "argumentTypes": null,
+                                "id": 1205,
+                                "name": "safe",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 1139,
+                                "src": "14024:4:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              },
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "nodeType": "IndexAccess",
+                              "src": "14014:15:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_mapping$_t_uint48_$_t_struct$_Delegate_$70_storage_$",
+                                "typeString": "mapping(uint48 => struct AllowanceModule.Delegate storage ref)"
+                              }
+                            },
+                            "id": 1209,
+                            "indexExpression": {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 1207,
+                                "name": "current",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 1176,
+                                "src": "14030:7:0",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                                  "typeString": "struct AllowanceModule.Delegate memory"
+                                }
+                              },
+                              "id": 1208,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "next",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 69,
+                              "src": "14030:12:0",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_uint48",
+                                "typeString": "uint48"
+                              }
+                            },
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "nodeType": "IndexAccess",
+                            "src": "14014:29:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Delegate_$70_storage",
+                              "typeString": "struct AllowanceModule.Delegate storage ref"
+                            }
+                          },
+                          "src": "14004:39:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                            "typeString": "struct AllowanceModule.Delegate memory"
+                          }
+                        },
+                        "id": 1211,
+                        "nodeType": "ExpressionStatement",
+                        "src": "14004:39:0"
+                      }
+                    ]
+                  },
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    },
+                    "id": 1192,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      },
+                      "id": 1188,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 1183,
+                          "name": "current",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 1176,
+                          "src": "13882:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                            "typeString": "struct AllowanceModule.Delegate memory"
+                          }
+                        },
+                        "id": 1184,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "delegate",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 65,
+                        "src": "13882:16:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": "!=",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "arguments": [
+                          {
+                            "argumentTypes": null,
+                            "hexValue": "30",
+                            "id": 1186,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "13910:1:0",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0"
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": [
+                            {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            }
+                          ],
+                          "id": 1185,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "lValueRequested": false,
+                          "nodeType": "ElementaryTypeNameExpression",
+                          "src": "13902:7:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_type$_t_address_$",
+                            "typeString": "type(address)"
+                          },
+                          "typeName": "address"
+                        },
+                        "id": 1187,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "typeConversion",
+                        "lValueRequested": false,
+                        "names": [],
+                        "nodeType": "FunctionCall",
+                        "src": "13902:10:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address_payable",
+                          "typeString": "address payable"
+                        }
+                      },
+                      "src": "13882:30:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "&&",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "commonType": {
+                        "typeIdentifier": "t_uint8",
+                        "typeString": "uint8"
+                      },
+                      "id": 1191,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftExpression": {
+                        "argumentTypes": null,
+                        "id": 1189,
+                        "name": "i",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1160,
+                        "src": "13916:1:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint8",
+                          "typeString": "uint8"
+                        }
+                      },
+                      "nodeType": "BinaryOperation",
+                      "operator": "<",
+                      "rightExpression": {
+                        "argumentTypes": null,
+                        "id": 1190,
+                        "name": "pageSize",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1143,
+                        "src": "13920:8:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint8",
+                          "typeString": "uint8"
+                        }
+                      },
+                      "src": "13916:12:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_bool",
+                        "typeString": "bool"
+                      }
+                    },
+                    "src": "13882:46:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "id": 1213,
+                  "nodeType": "WhileStatement",
+                  "src": "13876:178:0"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 1219,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "id": 1214,
+                      "name": "next",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 1149,
+                      "src": "14063:4:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "arguments": [
+                        {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 1216,
+                            "name": "current",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 1176,
+                            "src": "14077:7:0",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Delegate_$70_memory_ptr",
+                              "typeString": "struct AllowanceModule.Delegate memory"
+                            }
+                          },
+                          "id": 1217,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "delegate",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 65,
+                          "src": "14077:16:0",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        }
+                      ],
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          }
+                        ],
+                        "id": 1215,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "14070:6:0",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_uint48_$",
+                          "typeString": "type(uint48)"
+                        },
+                        "typeName": "uint48"
+                      },
+                      "id": 1218,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "typeConversion",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "14070:24:0",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint48",
+                        "typeString": "uint48"
+                      }
+                    },
+                    "src": "14063:31:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "id": 1220,
+                  "nodeType": "ExpressionStatement",
+                  "src": "14063:31:0"
+                },
+                {
+                  "externalReferences": [
+                    {
+                      "results": {
+                        "declaration": 1147,
+                        "isOffset": false,
+                        "isSlot": false,
+                        "src": "14268:7:0",
+                        "valueSize": 1
+                      }
+                    },
+                    {
+                      "i": {
+                        "declaration": 1160,
+                        "isOffset": false,
+                        "isSlot": false,
+                        "src": "14277:1:0",
+                        "valueSize": 1
+                      }
+                    }
+                  ],
+                  "id": 1221,
+                  "nodeType": "InlineAssembly",
+                  "operations": "{ mstore(results, i) }",
+                  "src": "14238:51:0"
+                }
+              ]
+            },
+            "documentation": null,
+            "id": 1223,
+            "implemented": true,
+            "kind": "function",
+            "modifiers": [],
+            "name": "getDelegates",
+            "nodeType": "FunctionDefinition",
+            "parameters": {
+              "id": 1144,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 1139,
+                  "name": "safe",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1223,
+                  "src": "13558:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  },
+                  "typeName": {
+                    "id": 1138,
+                    "name": "address",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "13558:7:0",
+                    "stateMutability": "nonpayable",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 1141,
+                  "name": "start",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1223,
+                  "src": "13572:12:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint48",
+                    "typeString": "uint48"
+                  },
+                  "typeName": {
+                    "id": 1140,
+                    "name": "uint48",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "13572:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 1143,
+                  "name": "pageSize",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1223,
+                  "src": "13586:14:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint8",
+                    "typeString": "uint8"
+                  },
+                  "typeName": {
+                    "id": 1142,
+                    "name": "uint8",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "13586:5:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint8",
+                      "typeString": "uint8"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "13557:44:0"
+            },
+            "returnParameters": {
+              "id": 1150,
+              "nodeType": "ParameterList",
+              "parameters": [
+                {
+                  "constant": false,
+                  "id": 1147,
+                  "name": "results",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1223,
+                  "src": "13623:24:0",
+                  "stateVariable": false,
+                  "storageLocation": "memory",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
+                    "typeString": "address[]"
+                  },
+                  "typeName": {
+                    "baseType": {
+                      "id": 1145,
+                      "name": "address",
+                      "nodeType": "ElementaryTypeName",
+                      "src": "13623:7:0",
+                      "stateMutability": "nonpayable",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    },
+                    "id": 1146,
+                    "length": null,
+                    "nodeType": "ArrayTypeName",
+                    "src": "13623:9:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
+                      "typeString": "address[]"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                },
+                {
+                  "constant": false,
+                  "id": 1149,
+                  "name": "next",
+                  "nodeType": "VariableDeclaration",
+                  "scope": 1223,
+                  "src": "13649:11:0",
+                  "stateVariable": false,
+                  "storageLocation": "default",
+                  "typeDescriptions": {
+                    "typeIdentifier": "t_uint48",
+                    "typeString": "uint48"
+                  },
+                  "typeName": {
+                    "id": 1148,
+                    "name": "uint48",
+                    "nodeType": "ElementaryTypeName",
+                    "src": "13649:6:0",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint48",
+                      "typeString": "uint48"
+                    }
+                  },
+                  "value": null,
+                  "visibility": "internal"
+                }
+              ],
+              "src": "13622:39:0"
+            },
+            "scope": 1224,
+            "src": "13536:759:0",
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "public"
+          }
+        ],
+        "scope": 1225,
+        "src": "769:13528:0"
+      }
+    ],
+    "src": "0:14297:0"
+  },
+  "compiler": {
+    "name": "solc",
+    "version": "0.5.11+commit.c082d0b4.Emscripten.clang"
+  },
+  "networks": {
+    "4": {
+      "events": {
+        "0x2fd5b26f00131bd8ca0fc556207292b85a6bec241341df82724333227458e630": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "safe",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "delegate",
+              "type": "address"
+            }
+          ],
+          "name": "AddDelegate",
+          "type": "event"
+        },
+        "0xdccc2d936ded24d2153d2760581a7f0dcb23ec71190c9726b3584cdd700214d4": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "safe",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "delegate",
+              "type": "address"
+            }
+          ],
+          "name": "RemoveDelegate",
+          "type": "event"
+        },
+        "0xa11cca2c2027e28ab0046aab4d4040f59d8b06e819ccd974c1e53e86aa814c19": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "safe",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "delegate",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "token",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "to",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "uint96",
+              "name": "value",
+              "type": "uint96"
+            },
+            {
+              "indexed": false,
+              "internalType": "uint16",
+              "name": "nonce",
+              "type": "uint16"
+            }
+          ],
+          "name": "ExecuteAllowanceTransfer",
+          "type": "event"
+        },
+        "0x49caa04c5e1e168069c09df7f88c07ca87be980b0bf4570ab77fe9aae3ca7eba": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "safe",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "delegate",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "token",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "uint96",
+              "name": "allowanceAmount",
+              "type": "uint96"
+            },
+            {
+              "indexed": false,
+              "internalType": "uint16",
+              "name": "resetTime",
+              "type": "uint16"
+            }
+          ],
+          "name": "SetAllowance",
+          "type": "event"
+        }
+      },
+      "links": {},
+      "address": "0x9e9Bf12b5a66c0f0A7435835e0365477E121B110",
+      "transactionHash": "0xc78f1aef6d837d7373fe352e70e3917f0798cee15a45dc8e74035263fd7988fb"
+    }
+  },
+  "schemaVersion": "3.2.3",
+  "updatedAt": "2020-08-13T14:18:40.132Z",
+  "networkType": "ethereum",
+  "devdoc": {
+    "methods": {
+      "setAllowance(address,address,uint96,uint16,uint32)": {
+        "details": "Allows to update the allowance for a specified token. This can only be done via a Safe transaction.",
+        "params": {
+          "allowanceAmount": "allowance in smallest token unit.",
+          "delegate": "Delegate whose allowance should be updated.",
+          "resetBaseMin": "Time based on which the reset time should be increased",
+          "resetTimeMin": "Time after which the allowance should reset",
+          "token": "Token contract address."
+        }
+      }
+    }
+  },
+  "userdoc": {
+    "methods": {}
+  }
+}
\ No newline at end of file
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index a21a6b6c9d..cb84da136b 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -14,3 +14,5 @@ export const OPENSEA_API_KEY = process.env.REACT_APP_OPENSEA_API_KEY || ''
 export const COLLECTIBLES_SOURCE = process.env.REACT_APP_COLLECTIBLES_SOURCE || 'OpenSea'
 export const TIMEOUT = process.env.NODE_ENV === 'test' ? 1500 : 5000
 export const ETHERSCAN_API_KEY = process.env.REACT_APP_ETHERSCAN_API_KEY
+export const SPENDING_LIMIT_MODULE_ADDRESS =
+  process.env.REACT_APP_SPENDING_LIMIT_MODULE_ADDRESS || '0x9e9Bf12b5a66c0f0A7435835e0365477E121B110'
diff --git a/yarn.lock b/yarn.lock
index 01e4debdfc..8f6440d93d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1342,7 +1342,7 @@
     solc "0.5.14"
     truffle "^5.1.21"
 
-"@gnosis.pm/safe-react-components@https://github.com/gnosis/safe-react-components.git#45c746a12661b9c38e839e76022b6a0a92285db7":
+"@gnosis.pm/safe-react-components@https://github.com/gnosis/safe-react-components.git#45c746a":
   version "0.2.0"
   resolved "https://github.com/gnosis/safe-react-components.git#45c746a12661b9c38e839e76022b6a0a92285db7"
   dependencies:
@@ -3048,13 +3048,6 @@ ansi-colors@4.1.1, ansi-colors@^4.1.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
-ansi-colors@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
-  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
-  dependencies:
-    ansi-wrap "^0.1.0"
-
 ansi-colors@^3.0.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
@@ -3072,13 +3065,6 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   dependencies:
     type-fest "^0.11.0"
 
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
-  dependencies:
-    ansi-wrap "0.1.0"
-
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -3124,11 +3110,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
-ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
-
 any-promise@1.3.0, any-promise@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -3188,23 +3169,11 @@ app-module-path@^2.2.0:
   resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5"
   integrity sha1-ZBqlXft9am8KgUHEucCqULbCTdU=
 
-append-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
-  integrity sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=
-  dependencies:
-    buffer-equal "^1.0.0"
-
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-archy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
-
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
@@ -3246,25 +3215,11 @@ arr-diff@^4.0.0:
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
   integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-filter@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee"
-  integrity sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=
-  dependencies:
-    make-iterator "^1.0.0"
-
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
-arr-map@^2.0.0, arr-map@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/arr-map/-/arr-map-2.0.2.tgz#3a77345ffc1cf35e2a91825601f9e58f2e24cac4"
-  integrity sha1-Onc0X/wc814qkYJWAfnljy4kysQ=
-  dependencies:
-    make-iterator "^1.0.0"
-
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
@@ -3284,11 +3239,6 @@ array-back@^2.0.0:
   dependencies:
     typical "^2.6.1"
 
-array-each@^1.0.0, array-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
-  integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
-
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
@@ -3318,35 +3268,6 @@ array-includes@^3.0.3, array-includes@^3.1.1:
     es-abstract "^1.17.0"
     is-string "^1.0.5"
 
-array-initial@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795"
-  integrity sha1-L6dLJnOTccOUe9enrcc74zSz15U=
-  dependencies:
-    array-slice "^1.0.0"
-    is-number "^4.0.0"
-
-array-last@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/array-last/-/array-last-1.3.0.tgz#7aa77073fec565ddab2493f5f88185f404a9d336"
-  integrity sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==
-  dependencies:
-    is-number "^4.0.0"
-
-array-slice@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
-  integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
-
-array-sort@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
-  integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
-  dependencies:
-    default-compare "^1.0.0"
-    get-value "^2.0.6"
-    kind-of "^5.0.2"
-
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -3457,16 +3378,6 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-async-done@^1.2.0, async-done@^1.2.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2"
-  integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.2"
-    process-nextick-args "^2.0.0"
-    stream-exhaust "^1.0.1"
-
 async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
@@ -3499,13 +3410,6 @@ async-sema@^3.1.0:
   resolved "https://registry.yarnpkg.com/async-sema/-/async-sema-3.1.0.tgz#3a813beb261e4cc58b19213916a48e931e21d21e"
   integrity sha512-+JpRq3r0zjpRLDruS6q/nC4V5tzsaiu07521677Mdi5i+AkaU/aNJH38rYHJVQ4zvz+SSkjgc8FUI7qIZrR+3g==
 
-async-settle@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-1.0.0.tgz#1d0a914bb02575bec8a8f3a74e5080f72b2c0c6b"
-  integrity sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=
-  dependencies:
-    async-done "^1.2.2"
-
 async@0.9.x:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
@@ -4291,21 +4195,6 @@ babylon@^6.18.0:
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
   integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
-bach@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880"
-  integrity sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=
-  dependencies:
-    arr-filter "^1.1.1"
-    arr-flatten "^1.0.1"
-    arr-map "^2.0.0"
-    array-each "^1.0.0"
-    array-initial "^1.0.0"
-    array-last "^1.1.1"
-    async-done "^1.2.2"
-    async-settle "^1.0.0"
-    now-and-later "^2.0.0"
-
 backoff@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/backoff/-/backoff-2.5.0.tgz#f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"
@@ -4743,11 +4632,6 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
-buffer-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
-  integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
-
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
@@ -4983,11 +4867,6 @@ camelcase@^2.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
   integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
-
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -5108,7 +4987,7 @@ chokidar@3.3.1:
   optionalDependencies:
     fsevents "~2.1.2"
 
-chokidar@^2.0.0, chokidar@^2.1.8:
+chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -5245,15 +5124,6 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-cliui@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wrap-ansi "^2.0.0"
-
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
@@ -5281,11 +5151,6 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
 clone-deep@^0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6"
@@ -5313,25 +5178,11 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
-
 clone@^2.0.0, clone@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
   integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
-cloneable-readable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
-  integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^2.0.0"
-    readable-stream "^2.3.5"
-
 clsx@^1.0.4, clsx@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
@@ -5356,15 +5207,6 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-collection-map@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c"
-  integrity sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=
-  dependencies:
-    arr-map "^2.0.2"
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -5405,11 +5247,6 @@ color-string@^1.5.2:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
 color@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10"
@@ -5523,7 +5360,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.5.1, concat-stream@^1.6.0, concat-stream@^1.6.2:
+concat-stream@^1.5.0, concat-stream@^1.5.1, concat-stream@^1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -5626,7 +5463,7 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@1.7.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+convert-source-map@1.7.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -5670,14 +5507,6 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-props@^2.0.1:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.4.tgz#93bb1cadfafd31da5bb8a9d4b41f471ec3a72dfe"
-  integrity sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==
-  dependencies:
-    each-props "^1.3.0"
-    is-plain-object "^2.0.1"
-
 core-js-compat@^3.6.2:
   version "3.6.5"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
@@ -6222,7 +6051,7 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
+decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -6331,13 +6160,6 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
-default-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
-  integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
-  dependencies:
-    kind-of "^5.0.2"
-
 default-gateway@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
@@ -6346,11 +6168,6 @@ default-gateway@^4.2.0:
     execa "^1.0.0"
     ip-regex "^2.1.0"
 
-default-resolution@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684"
-  integrity sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=
-
 defer-to-connect@^1.0.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
@@ -6443,11 +6260,6 @@ detect-browser@5.1.0:
   resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.1.0.tgz#0c51c66b747ad8f98a6832bf3026a5a23a7850ff"
   integrity sha512-WKa9p+/MNwmTiS+V2AS6eGxic+807qvnV3hC+4z2GTY+F42h1n8AynVTMMc4EJBC32qMs6yjOTpeDEQQt/AVqQ==
 
-detect-file@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
-
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
@@ -6708,14 +6520,6 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-each-props@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.2.tgz#ea45a414d16dd5cfa419b1a81720d5ca06892333"
-  integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==
-  dependencies:
-    is-plain-object "^2.0.1"
-    object.defaults "^1.1.0"
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -7017,7 +6821,7 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50:
+es5-ext@^0.10.35, es5-ext@^0.10.50:
   version "0.10.53"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
   integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
@@ -7031,7 +6835,7 @@ es6-error@^4.1.1:
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
-es6-iterator@2.0.3, es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
+es6-iterator@2.0.3, es6-iterator@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
   integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
@@ -7053,16 +6857,6 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.3:
     d "^1.0.1"
     ext "^1.1.2"
 
-es6-weak-map@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
-  integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
-  dependencies:
-    d "1"
-    es5-ext "^0.10.46"
-    es6-iterator "^2.0.3"
-    es6-symbol "^3.1.1"
-
 escalade@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
@@ -8016,13 +7810,6 @@ expand-template@^2.0.3:
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
-expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
 expect@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
@@ -8098,7 +7885,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.2:
+extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -8153,16 +7940,6 @@ fake-merkle-patricia-tree@^1.0.1:
   dependencies:
     checkpoint-store "^1.1.0"
 
-fancy-log@^1.3.2:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
-  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    parse-node-version "^1.0.0"
-    time-stamp "^1.0.0"
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -8421,42 +8198,6 @@ find-versions@^3.2.0:
   dependencies:
     semver-regex "^2.0.0"
 
-findup-sync@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
-  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^3.1.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
-findup-sync@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
-  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^4.0.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
-fined@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
-  integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
-  dependencies:
-    expand-tilde "^2.0.2"
-    is-plain-object "^2.0.3"
-    object.defaults "^1.1.0"
-    object.pick "^1.2.0"
-    parse-filepath "^1.0.1"
-
-flagged-respawn@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
-  integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
-
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -8483,7 +8224,7 @@ flatten@^1.0.2:
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
   integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
 
-flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:
+flush-write-stream@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
   integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
@@ -8527,13 +8268,6 @@ for-own@^0.1.3:
   dependencies:
     for-in "^1.0.1"
 
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
-  dependencies:
-    for-in "^1.0.1"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -8659,14 +8393,6 @@ fs-minipass@^2.0.0:
   dependencies:
     minipass "^3.0.0"
 
-fs-mkdirp-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb"
-  integrity sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=
-  dependencies:
-    graceful-fs "^4.1.11"
-    through2 "^2.0.3"
-
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -8820,40 +8546,11 @@ glob-parent@^5.0.0, glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob-stream@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
-  integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=
-  dependencies:
-    extend "^3.0.0"
-    glob "^7.1.1"
-    glob-parent "^3.1.0"
-    is-negated-glob "^1.0.0"
-    ordered-read-streams "^1.0.0"
-    pumpify "^1.3.5"
-    readable-stream "^2.1.5"
-    remove-trailing-separator "^1.0.1"
-    to-absolute-glob "^2.0.0"
-    unique-stream "^2.0.2"
-
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob-watcher@^5.0.3:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.5.tgz#aa6bce648332924d9a8489be41e3e5c52d4186dc"
-  integrity sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==
-  dependencies:
-    anymatch "^2.0.0"
-    async-done "^1.2.0"
-    chokidar "^2.0.0"
-    is-negated-glob "^1.0.0"
-    just-debounce "^1.0.0"
-    normalize-path "^3.0.0"
-    object.defaults "^1.1.0"
-
 glob@7.1.6, glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1, glob@~7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -8893,26 +8590,6 @@ global-modules@2.0.0:
   dependencies:
     global-prefix "^3.0.0"
 
-global-modules@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
-  dependencies:
-    global-prefix "^1.0.1"
-    is-windows "^1.0.1"
-    resolve-dir "^1.0.0"
-
-global-prefix@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
-  dependencies:
-    expand-tilde "^2.0.2"
-    homedir-polyfill "^1.0.1"
-    ini "^1.3.4"
-    is-windows "^1.0.1"
-    which "^1.2.14"
-
 global-prefix@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
@@ -9005,13 +8682,6 @@ globule@^1.0.0:
     lodash "~4.17.10"
     minimatch "~3.0.2"
 
-glogg@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
-  integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
-  dependencies:
-    sparkles "^1.0.0"
-
 got@9.6.0, got@^9.6.0:
   version "9.6.0"
   resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
@@ -9049,7 +8719,7 @@ got@^7.1.0:
     url-parse-lax "^1.0.0"
     url-to-options "^1.0.1"
 
-graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
+graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
@@ -9069,47 +8739,6 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-gulp-cli@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f"
-  integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==
-  dependencies:
-    ansi-colors "^1.0.1"
-    archy "^1.0.0"
-    array-sort "^1.0.0"
-    color-support "^1.1.3"
-    concat-stream "^1.6.0"
-    copy-props "^2.0.1"
-    fancy-log "^1.3.2"
-    gulplog "^1.0.0"
-    interpret "^1.4.0"
-    isobject "^3.0.1"
-    liftoff "^3.1.0"
-    matchdep "^2.0.0"
-    mute-stdout "^1.0.0"
-    pretty-hrtime "^1.0.0"
-    replace-homedir "^1.0.0"
-    semver-greatest-satisfied-range "^1.1.0"
-    v8flags "^3.2.0"
-    yargs "^7.1.0"
-
-gulp@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa"
-  integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==
-  dependencies:
-    glob-watcher "^5.0.3"
-    gulp-cli "^2.2.0"
-    undertaker "^1.2.1"
-    vinyl-fs "^3.0.0"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
-  dependencies:
-    glogg "^1.0.0"
-
 gzip-size@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
@@ -9308,13 +8937,6 @@ home-or-tmp@^2.0.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
-homedir-polyfill@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
-  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
-  dependencies:
-    parse-passwd "^1.0.0"
-
 hosted-git-info@^2.1.4:
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
@@ -9770,7 +9392,7 @@ internal-slot@^1.0.2:
     has "^1.0.3"
     side-channel "^1.0.2"
 
-interpret@^1.0.0, interpret@^1.4.0:
+interpret@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
@@ -9782,11 +9404,6 @@ invariant@^2.2.2, invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
-
 invert-kv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
@@ -9817,14 +9434,6 @@ is-absolute-url@^3.0.3:
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
   integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
 
-is-absolute@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
-  dependencies:
-    is-relative "^1.0.0"
-    is-windows "^1.0.1"
-
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -10045,11 +9654,6 @@ is-natural-number@^4.0.1:
   resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
   integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=
 
-is-negated-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
-  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
-
 is-npm@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
@@ -10062,11 +9666,6 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -10142,13 +9741,6 @@ is-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
   integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
 
-is-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
-  dependencies:
-    is-unc-path "^1.0.0"
-
 is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
@@ -10203,24 +9795,12 @@ is-typedarray@1.0.0, is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-unc-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
-  dependencies:
-    unc-path-regex "^0.1.2"
-
-is-utf8@^0.2.0, is-utf8@^0.2.1:
+is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
   integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
-is-valid-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
-  integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
-
-is-windows@^1.0.1, is-windows@^1.0.2:
+is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
@@ -11151,11 +10731,6 @@ just-curry-it@^3.1.0:
   resolved "https://registry.yarnpkg.com/just-curry-it/-/just-curry-it-3.1.0.tgz#ab59daed308a58b847ada166edd0a2d40766fbc5"
   integrity sha512-mjzgSOFzlrurlURaHVjnQodyPNvrHrf1TbQP2XU9NSqBtHQPuHZ+Eb6TAJP7ASeJN9h9K0KXoRTs8u6ouHBKvg==
 
-just-debounce@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.0.0.tgz#87fccfaeffc0b68cd19d55f6722943f929ea35ea"
-  integrity sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=
-
 keccak256@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/keccak256/-/keccak256-1.0.0.tgz#1ba55ce78ed3d63fb7091d045469007da984171d"
@@ -11223,7 +10798,7 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^5.0.0, kind-of@^5.0.2:
+kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
@@ -11265,14 +10840,6 @@ last-call-webpack-plugin@^3.0.0:
     lodash "^4.17.5"
     webpack-sources "^1.1.0"
 
-last-run@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/last-run/-/last-run-1.1.1.tgz#45b96942c17b1c79c772198259ba943bebf8ca5b"
-  integrity sha1-RblpQsF7HHnHchmCWbqUO+v4yls=
-  dependencies:
-    default-resolution "^2.0.0"
-    es6-weak-map "^2.0.1"
-
 latest-version@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
@@ -11295,20 +10862,6 @@ lazy-val@^1.0.4:
   resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"
   integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==
 
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
-  dependencies:
-    readable-stream "^2.0.5"
-
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
-  dependencies:
-    invert-kv "^1.0.0"
-
 lcid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
@@ -11321,13 +10874,6 @@ lcov-parse@^1.0.0:
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
   integrity sha1-6w1GtUER68VhrLTECO+TY73I9+A=
 
-lead@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
-  integrity sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=
-  dependencies:
-    flush-write-stream "^1.0.2"
-
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
@@ -11403,20 +10949,6 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-liftoff@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3"
-  integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==
-  dependencies:
-    extend "^3.0.0"
-    findup-sync "^3.0.0"
-    fined "^1.0.1"
-    flagged-respawn "^1.0.0"
-    is-plain-object "^2.0.4"
-    object.map "^1.0.0"
-    rechoir "^0.6.2"
-    resolve "^1.1.7"
-
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -11761,13 +11293,6 @@ make-dir@^3.0.0, make-dir@^3.0.2:
   dependencies:
     semver "^6.0.0"
 
-make-iterator@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
-  integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
-  dependencies:
-    kind-of "^6.0.2"
-
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -11787,7 +11312,7 @@ map-age-cleaner@^0.1.1:
   dependencies:
     p-defer "^1.0.0"
 
-map-cache@^0.2.0, map-cache@^0.2.2:
+map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
@@ -11809,16 +11334,6 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-matchdep@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"
-  integrity sha1-xvNINKDY28OzfCfui7yyfHd1WC4=
-  dependencies:
-    findup-sync "^2.0.0"
-    micromatch "^3.0.4"
-    resolve "^1.4.0"
-    stack-trace "0.0.10"
-
 matcher@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
@@ -11989,7 +11504,7 @@ microevent.ts@~0.1.1:
   resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
   integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==
 
-micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
+micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -12341,11 +11856,6 @@ multihashes@^0.4.15, multihashes@~0.4.15:
     multibase "^0.7.0"
     varint "^5.0.0"
 
-mute-stdout@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331"
-  integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==
-
 mute-stream@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -12642,13 +12152,6 @@ normalize-url@^4.1.0:
     prop-types "^15.7.2"
     react-is "^16.9.0"
 
-now-and-later@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c"
-  integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==
-  dependencies:
-    once "^1.3.2"
-
 npm-conf@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
@@ -12784,7 +12287,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@4.1.0, object.assign@^4.0.4, object.assign@^4.1.0:
+object.assign@4.1.0, object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
   integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
@@ -12794,16 +12297,6 @@ object.assign@4.1.0, object.assign@^4.0.4, object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
-object.defaults@^1.0.0, object.defaults@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
-  integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
-  dependencies:
-    array-each "^1.0.1"
-    array-slice "^1.0.0"
-    for-own "^1.0.0"
-    isobject "^3.0.0"
-
 object.entries@^1.1.0, object.entries@^1.1.1, object.entries@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
@@ -12831,29 +12324,13 @@ object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-object.map@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
-  integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
-  dependencies:
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
-object.pick@^1.2.0, object.pick@^1.3.0:
+object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
   integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
-object.reduce@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.reduce/-/object.reduce-1.0.1.tgz#6fe348f2ac7fa0f95ca621226599096825bb03ad"
-  integrity sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=
-  dependencies:
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
 object.values@^1.1.0, object.values@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
@@ -12898,7 +12375,7 @@ on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -12957,13 +12434,6 @@ optionator@^0.8.1, optionator@^0.8.3:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
-ordered-read-streams@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
-  integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=
-  dependencies:
-    readable-stream "^2.0.1"
-
 original-require@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/original-require/-/original-require-1.0.1.tgz#0f130471584cd33511c5ec38c8d59213f9ac5e20"
@@ -12986,13 +12456,6 @@ os-homedir@^1.0.0:
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
-  dependencies:
-    lcid "^1.0.0"
-
 os-locale@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -13181,15 +12644,6 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-filepath@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
-  dependencies:
-    is-absolute "^1.0.0"
-    map-cache "^0.2.0"
-    path-root "^0.1.1"
-
 parse-headers@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz#5e8e7512383d140ba02f0c7aa9f49b4399c92515"
@@ -13220,16 +12674,6 @@ parse-json@^5.0.0:
     json-parse-better-errors "^1.0.1"
     lines-and-columns "^1.1.6"
 
-parse-node-version@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
-  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
-
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
-
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -13310,18 +12754,6 @@ path-parse@^1.0.6:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-root-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
-
-path-root@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
-  dependencies:
-    path-root-regex "^0.1.0"
-
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -14298,17 +13730,12 @@ pretty-format@^25.2.1, pretty-format@^25.5.0:
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
 
-pretty-hrtime@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
-  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
-
 private@^0.1.6, private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
+process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
@@ -14439,7 +13866,7 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pumpify@^1.3.3, pumpify@^1.3.5:
+pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
   integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
@@ -14966,7 +14393,7 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -15255,24 +14682,7 @@ relateurl@^0.2.7:
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
-remove-bom-buffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
-  integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==
-  dependencies:
-    is-buffer "^1.1.5"
-    is-utf8 "^0.2.1"
-
-remove-bom-stream@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523"
-  integrity sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=
-  dependencies:
-    remove-bom-buffer "^3.0.0"
-    safe-buffer "^5.1.0"
-    through2 "^2.0.3"
-
-remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0:
+remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
   integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
@@ -15305,20 +14715,6 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-replace-ext@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
-  integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
-
-replace-homedir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-1.0.0.tgz#e87f6d513b928dde808260c12be7fec6ff6e798c"
-  integrity sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-    is-absolute "^1.0.0"
-    remove-trailing-separator "^1.1.0"
-
 request-promise-core@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
@@ -15398,14 +14794,6 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
-resolve-dir@^1.0.0, resolve-dir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
-  dependencies:
-    expand-tilde "^2.0.0"
-    global-modules "^1.0.0"
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -15416,13 +14804,6 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve-options@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
-  integrity sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=
-  dependencies:
-    value-or-function "^3.0.0"
-
 resolve-pathname@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
@@ -15461,7 +14842,7 @@ resolve@1.15.0:
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.8.1, resolve@~1.17.0:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.8.1, resolve@~1.17.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -15814,13 +15195,6 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-semver-greatest-satisfied-range@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz#13e8c2658ab9691cb0cd71093240280d36f77a5b"
-  integrity sha1-E+jCZYq5aRywzXEJMkAoDTb3els=
-  dependencies:
-    sver-compat "^1.5.0"
-
 semver-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
@@ -16280,11 +15654,6 @@ source-map@^0.7.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-sparkles@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
-  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
-
 spawn-command@^0.0.2-1:
   version "0.0.2-1"
   resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
@@ -16432,11 +15801,6 @@ stable@^0.1.8:
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
-stack-trace@0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
-  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
-
 stack-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
@@ -16493,11 +15857,6 @@ stream-each@^1.1.0:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
 
-stream-exhaust@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d"
-  integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==
-
 stream-http@^2.7.2:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
@@ -16550,7 +15909,7 @@ string-length@^3.1.0:
     astral-regex "^1.0.0"
     strip-ansi "^5.2.0"
 
-string-width@^1.0.1, string-width@^1.0.2:
+string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
@@ -16829,14 +16188,6 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-sver-compat@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"
-  integrity sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=
-  dependencies:
-    es6-iterator "^2.0.1"
-    es6-symbol "^3.1.1"
-
 svg-parser@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5"
@@ -17069,15 +16420,7 @@ throat@^4.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
   integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
 
-through2-filter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
-  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
+through2@^2.0.0, through2@^2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -17095,11 +16438,6 @@ thunky@^1.0.2:
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
 timed-out@^4.0.0, timed-out@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
@@ -17139,14 +16477,6 @@ tmpl@1.0.x:
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
   integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
-to-absolute-glob@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
-  integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=
-  dependencies:
-    is-absolute "^1.0.0"
-    is-negated-glob "^1.0.0"
-
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
@@ -17230,13 +16560,6 @@ to-space-case@^1.0.0:
   dependencies:
     to-no-case "^1.0.0"
 
-to-through@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"
-  integrity sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=
-  dependencies:
-    through2 "^2.0.3"
-
 toidentifier@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
@@ -17531,36 +16854,11 @@ unbzip2-stream@^1.0.9:
     buffer "^5.2.1"
     through "^2.3.8"
 
-unc-path-regex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
-
 underscore@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
   integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
 
-undertaker-registry@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50"
-  integrity sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=
-
-undertaker@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.2.1.tgz#701662ff8ce358715324dfd492a4f036055dfe4b"
-  integrity sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==
-  dependencies:
-    arr-flatten "^1.0.1"
-    arr-map "^2.0.0"
-    bach "^1.0.0"
-    collection-map "^1.0.0"
-    es6-weak-map "^2.0.1"
-    last-run "^1.1.0"
-    object.defaults "^1.0.0"
-    object.reduce "^1.0.0"
-    undertaker-registry "^1.0.0"
-
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -17618,14 +16916,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-stream@^2.0.2:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
-  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
-  dependencies:
-    json-stable-stringify-without-jsonify "^1.0.1"
-    through2-filter "^3.0.0"
-
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -17863,13 +17153,6 @@ v8-compile-cache@^2.0.3:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
   integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
 
-v8flags@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
-  integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -17883,11 +17166,6 @@ value-equal@^1.0.1:
   resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
   integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
 
-value-or-function@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
-  integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=
-
 varint@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.0.tgz#d826b89f7490732fabc0c0ed693ed475dcb29ebf"
@@ -17912,54 +17190,6 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vinyl-fs@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
-  integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==
-  dependencies:
-    fs-mkdirp-stream "^1.0.0"
-    glob-stream "^6.1.0"
-    graceful-fs "^4.0.0"
-    is-valid-glob "^1.0.0"
-    lazystream "^1.0.0"
-    lead "^1.0.0"
-    object.assign "^4.0.4"
-    pumpify "^1.3.5"
-    readable-stream "^2.3.3"
-    remove-bom-buffer "^3.0.0"
-    remove-bom-stream "^1.2.0"
-    resolve-options "^1.1.0"
-    through2 "^2.0.0"
-    to-through "^2.0.0"
-    value-or-function "^3.0.0"
-    vinyl "^2.0.0"
-    vinyl-sourcemap "^1.1.0"
-
-vinyl-sourcemap@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16"
-  integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=
-  dependencies:
-    append-buffer "^1.0.2"
-    convert-source-map "^1.5.0"
-    graceful-fs "^4.1.6"
-    normalize-path "^2.1.1"
-    now-and-later "^2.0.0"
-    remove-bom-buffer "^3.0.0"
-    vinyl "^2.0.0"
-
-vinyl@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
-  integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
-  dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
 vm-browserify@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -18913,11 +18143,6 @@ whatwg-url@^7.0.0:
     tr46 "^1.0.1"
     webidl-conversions "^4.0.2"
 
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
-
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
@@ -18935,7 +18160,7 @@ which@2.0.2, which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
+which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -19276,11 +18501,6 @@ xtend@~2.1.1:
   dependencies:
     object-keys "~0.4.0"
 
-y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
-
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
@@ -19319,14 +18539,6 @@ yargs-parser@13.1.2, yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@5.0.0-security.0:
-  version "5.0.0-security.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz#4ff7271d25f90ac15643b86076a2ab499ec9ee24"
-  integrity sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==
-  dependencies:
-    camelcase "^3.0.0"
-    object.assign "^4.1.0"
-
 yargs-parser@^10.0.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
@@ -19410,25 +18622,6 @@ yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-yargs@^7.1.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.1.tgz#67f0ef52e228d4ee0d6311acede8850f53464df6"
-  integrity sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "5.0.0-security.0"
-
 yauzl@^2.10.0, yauzl@^2.4.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"

From b5aadc822977fb6ff2ffaa2a64d8ee1bfcdc1320 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Sat, 15 Aug 2020 21:28:16 -0300
Subject: [PATCH 16/69] WIP: verify module is enabled and works

---
 .../Settings/SpendingLimit/index.tsx          | 87 +++++++++++--------
 1 file changed, 52 insertions(+), 35 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 21a718e8a9..b7252eabbe 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -717,11 +717,58 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
  * New Spending Limit Form - END
  */
 
+const SpendingLimitSteps = (): React.ReactElement => (
+  <Steps>
+    <SpendingLimitStep>
+      <Img alt="Select Beneficiary" title="Beneficiary" height={96} src={Beneficiary} />
+      <Text size="lg" color="placeHolder" strong center>
+        Select Beneficiary
+      </Text>
+      <Text size="lg" color="placeHolder" center>
+        Choose an account that will benefit from this allowance.
+      </Text>
+      <Text size="lg" color="placeHolder" center>
+        The beneficiary does not have to be an owner of this Safe
+      </Text>
+    </SpendingLimitStep>
+    <StepsLine />
+    <SpendingLimitStep>
+      <Img alt="Select asset and amount" title="Asset and Amount" height={96} src={AssetAmount} />
+      <Text size="lg" color="placeHolder" strong center>
+        Select asset and amount
+      </Text>
+      <Text size="lg" color="placeHolder" center>
+        You can set a spending limit for any asset stored in your Safe
+      </Text>
+    </SpendingLimitStep>
+    <StepsLine />
+    <SpendingLimitStep>
+      <Img alt="Select time" title="Time" height={96} src={Time} />
+      <Text size="lg" color="placeHolder" strong center>
+        Select time
+      </Text>
+      <Text size="lg" color="placeHolder" center>
+        You can choose to set a one-time spending limit or to have it automatically refill after a defined time-period
+      </Text>
+    </SpendingLimitStep>
+  </Steps>
+)
 const SpendingLimit = (): React.ReactElement => {
   const classes = useStyles()
   const granted = useSelector(grantedSelector)
   const [showNewSpendingLimitModal, setShowNewSpendingLimitModal] = React.useState(false)
 
+  // TODO: Refactor `delegates` for better performance. This is just to verify allowance works
+  const safeAddress = useSelector(safeParamAddressFromStateSelector)
+  const [delegates, setDelegates] = React.useState({ results: [], next: '' })
+  React.useEffect(() => {
+    const doRequestData = async () => {
+      const [, delegates] = await requestModuleData(safeAddress)
+      setDelegates(delegates[0])
+    }
+    doRequestData()
+  }, [safeAddress])
+
   const openNewSpendingLimitModal = () => {
     setShowNewSpendingLimitModal(true)
   }
@@ -740,41 +787,11 @@ const SpendingLimit = (): React.ReactElement => {
           You can set rules for specific beneficiaries to access funds from this Safe without having to collect all
           signatures.
         </InfoText>
-        <Steps>
-          <SpendingLimitStep>
-            <Img alt="Select Beneficiary" title="Beneficiary" height={96} src={Beneficiary} />
-            <Text size="lg" color="placeHolder" strong center>
-              Select Beneficiary
-            </Text>
-            <Text size="lg" color="placeHolder" center>
-              Choose an account that will benefit from this allowance.
-            </Text>
-            <Text size="lg" color="placeHolder" center>
-              The beneficiary does not have to be an owner of this Safe
-            </Text>
-          </SpendingLimitStep>
-          <StepsLine />
-          <SpendingLimitStep>
-            <Img alt="Select asset and amount" title="Asset and Amount" height={96} src={AssetAmount} />
-            <Text size="lg" color="placeHolder" strong center>
-              Select asset and amount
-            </Text>
-            <Text size="lg" color="placeHolder" center>
-              You can set a spending limit for any asset stored in your Safe
-            </Text>
-          </SpendingLimitStep>
-          <StepsLine />
-          <SpendingLimitStep>
-            <Img alt="Select time" title="Time" height={96} src={Time} />
-            <Text size="lg" color="placeHolder" strong center>
-              Select time
-            </Text>
-            <Text size="lg" color="placeHolder" center>
-              You can choose to set a one-time spending limit or to have it automatically refill after a defined
-              time-period
-            </Text>
-          </SpendingLimitStep>
-        </Steps>
+        {delegates?.results?.length ? (
+          delegates.results.map((delegate) => <div key={delegate}>{delegate}</div>)
+        ) : (
+          <SpendingLimitSteps />
+        )}
       </Block>
       <Row align="end" className={classes.buttonRow} grow>
         <Col end="xs">

From 1fea250e6865a2a9ebe22e2b9a61cdea52e7819e Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Tue, 18 Aug 2020 16:00:23 -0300
Subject: [PATCH 17/69] WIP: complete New Spending Limit flow

- create
- verify existent and inform the user
---
 .../Settings/SpendingLimit/index.tsx          | 143 +++++++++++++++---
 1 file changed, 121 insertions(+), 22 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index b7252eabbe..7edfb72b24 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -476,6 +476,7 @@ interface ReviewSpendingLimitProps {
   onSubmit: () => void
   txToken: Token | null
   values: Record<string, string>
+  existentSpendingLimit?: Record<string, string>
 }
 const ReviewSpendingLimit = ({
   onBack,
@@ -483,6 +484,7 @@ const ReviewSpendingLimit = ({
   onSubmit,
   txToken,
   values,
+  existentSpendingLimit,
 }: ReviewSpendingLimitProps): React.ReactElement => {
   const classes = useStyles()
   const addressBook = useSelector(getAddressBook)
@@ -522,12 +524,19 @@ const ReviewSpendingLimit = ({
             Amount
           </Text>
           {txToken !== null ? (
-            <StyledImageName>
-              <StyledImage alt={txToken.name} onError={setImageToPlaceholder} src={txToken.logoUri} />
-              <Text size="lg">
-                {values.amount} {txToken.symbol}
-              </Text>
-            </StyledImageName>
+            <>
+              <StyledImageName>
+                <StyledImage alt={txToken.name} onError={setImageToPlaceholder} src={txToken.logoUri} />
+                <Text size="lg">
+                  {values.amount} {txToken.symbol}
+                </Text>
+              </StyledImageName>
+              {existentSpendingLimit && (
+                <Text size="lg" color="error">
+                  Previous Amount: {existentSpendingLimit.amount}
+                </Text>
+              )}
+            </>
           ) : (
             <Skeleton animation="wave" variant="text" />
           )}
@@ -553,7 +562,23 @@ const ReviewSpendingLimit = ({
               </Text>
             </Row>
           )}
+          {existentSpendingLimit && (
+            <Row align="center" margin="md">
+              <Text size="lg" color="error">
+                Previous Amount:{' '}
+                {RESET_TIME_OPTIONS.find(
+                  ({ value }) => value === (+existentSpendingLimit.resetTimeMin / 60 / 24).toString(),
+                )?.label ?? 'One-time spending limit allowance'}
+              </Text>
+            </Row>
+          )}
         </Col>
+
+        {existentSpendingLimit && (
+          <Text size="xl" color="error" center strong>
+            You are about to replace an existent spending limit
+          </Text>
+        )}
       </Block>
 
       <FooterSection>
@@ -585,11 +610,13 @@ const requestModuleData = (safeAddress: string): Promise<any[]> => {
       abi: GnosisSafeSol.abi,
       address: safeAddress,
       methods: [{ method: 'getModulesPaginated', args: [SENTINEL_ADDRESS, 100] }],
+      batch,
     },
     {
       abi: SpendingLimitModule.abi,
       address: SPENDING_LIMIT_MODULE_ADDRESS,
       methods: [{ method: 'getDelegates', args: [safeAddress, 0, 100] }],
+      batch,
     },
   ]
 
@@ -597,7 +624,60 @@ const requestModuleData = (safeAddress: string): Promise<any[]> => {
 
   batch.execute()
 
-  return Promise.all(whenRequestsValues)
+  return Promise.all(whenRequestsValues).then(([modules, delegates]) => [modules[0], delegates[0]])
+}
+
+const requestTokensByDelegate = async (safeAddress: string, delegates: string[]): Promise<any[]> => {
+  const batch = new web3ReadOnly.BatchRequest()
+
+  const whenRequestValues = delegates.map((delegateAddress: string) =>
+    generateBatchRequests({
+      abi: SpendingLimitModule.abi,
+      address: SPENDING_LIMIT_MODULE_ADDRESS,
+      methods: [{ method: 'getTokens', args: [safeAddress, delegateAddress] }],
+      batch,
+      context: delegateAddress,
+    }),
+  )
+
+  batch.execute()
+
+  return Promise.all(whenRequestValues)
+}
+
+const requestAllowancesByDelegatesAndTokens = async (
+  safeAddress: string,
+  tokensByDelegate: [string, string[]][],
+): Promise<any[]> => {
+  const batch = new web3ReadOnly.BatchRequest()
+
+  let whenRequestValues = []
+
+  tokensByDelegate.map(([delegate, tokens]) => {
+    whenRequestValues = tokens.map((token) =>
+      generateBatchRequests({
+        abi: SpendingLimitModule.abi,
+        address: SPENDING_LIMIT_MODULE_ADDRESS,
+        methods: [{ method: 'getTokenAllowance', args: [safeAddress, delegate, token] }],
+        batch,
+        context: { delegate, token },
+      }),
+    )
+  })
+
+  batch.execute()
+
+  return Promise.all(whenRequestValues).then((allowances) =>
+    allowances.map(([{ delegate, token }, [amount, spent, resetTimeMin, lastResetMin, nonce]]) => ({
+      delegate,
+      token,
+      amount,
+      spent,
+      resetTimeMin,
+      lastResetMin,
+      nonce,
+    })),
+  )
 }
 
 const currentMinutes = () => Math.floor(Date.now() / (1000 * 60))
@@ -605,30 +685,52 @@ const currentMinutes = () => Math.floor(Date.now() / (1000 * 60))
 const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boolean }): React.ReactElement => {
   const classes = useStyles()
 
+  const safeAddress = useSelector(safeParamAddressFromStateSelector)
+  const modules = useSelector(safeModulesSelector)
+  const { enqueueSnackbar, closeSnackbar } = useSnackbar()
+  const dispatch = useDispatch()
+
   const [step, setStep] = React.useState<'create' | 'review'>('create')
   const [values, setValues] = React.useState()
   const tokens = useSelector(extendedSafeTokensSelector)
   const [txToken, setTxToken] = React.useState(null)
-  const handleReview = (values) => {
+  const [existentSpendingLimit, setExistentSpendingLimit] = React.useState()
+
+  const handleReview = async (values) => {
     setValues(values)
+
     if (values.token) {
       setTxToken(tokens.find((token) => token.address === values.token))
     }
+
+    const checkExistence = async () => {
+      const [, delegates] = await requestModuleData(safeAddress)
+      const tokensByDelegate = await requestTokensByDelegate(safeAddress, delegates.results)
+      const allowances = await requestAllowancesByDelegatesAndTokens(safeAddress, tokensByDelegate)
+
+      // if `delegate` already exist, check what tokens were delegated to the _beneficiary_ `getTokens(safe, delegate)`
+      const currentDelegate = allowances.find(
+        ({ delegate, token }) =>
+          delegate.toLowerCase() === values.beneficiary.toLowerCase() &&
+          token.toLowerCase() === values.token.toLowerCase(),
+      )
+
+      // let the user know that is about to replace an existent allowance
+      if (currentDelegate !== undefined) {
+        setExistentSpendingLimit(currentDelegate)
+      }
+    }
+
+    await checkExistence()
     setStep('review')
   }
 
-  const safeAddress = useSelector(safeParamAddressFromStateSelector)
-  const modules = useSelector(safeModulesSelector)
-  const { enqueueSnackbar, closeSnackbar } = useSnackbar()
-  const dispatch = useDispatch()
-
   const handleSubmit = async (values: Record<string, string>) => {
     // TODO: here we do the magic. FINALLY!!!!
     const [enabledModules, delegates] = await requestModuleData(safeAddress)
     const isSpendingLimitEnabled =
-      enabledModules[0]?.array?.some(
-        (module) => module.toLowerCase() === SPENDING_LIMIT_MODULE_ADDRESS.toLowerCase(),
-      ) ?? false
+      enabledModules?.array?.some((module) => module.toLowerCase() === SPENDING_LIMIT_MODULE_ADDRESS.toLowerCase()) ??
+      false
     const transactions = []
 
     // is spendingLimit module enabled? -> if not, create the tx to enable it, and encode it
@@ -644,7 +746,7 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
     // does `delegate` already exist? (`getDelegates`, previously queried to build the table with allowances (??))
     //                                  ^ - shall we rely on this or query the list of delegates once again?
     const isDelegateAlreadyAdded =
-      delegates[0].results.some((delegate) => delegate.toLowerCase() === values?.beneficiary.toLowerCase()) ?? false
+      delegates.results.some((delegate) => delegate.toLowerCase() === values?.beneficiary.toLowerCase()) ?? false
 
     // if `delegate` does not exist, add it by calling `addDelegate(beneficiary)`
     if (!isDelegateAlreadyAdded) {
@@ -655,10 +757,6 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
         value: 0,
         data: spendingLimit.methods.addDelegate(values?.beneficiary).encodeABI(),
       })
-    } else {
-      // if `delegate` already exist, check what tokens were delegated to the _beneficiary_ `getTokens(safe, delegate)`
-      // if tokens were delegated to the _beneficiary_, prevent "setting a 'new' allowance", and inform the user about the current allowance and opt in for replacement (??)
-      // TODO: we must do this check before building the tx
     }
 
     // prepare the setAllowance tx
@@ -708,6 +806,7 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
           onSubmit={() => handleSubmit(values)}
           txToken={txToken}
           values={values}
+          existentSpendingLimit={existentSpendingLimit}
         />
       )}
     </GnoModal>
@@ -764,7 +863,7 @@ const SpendingLimit = (): React.ReactElement => {
   React.useEffect(() => {
     const doRequestData = async () => {
       const [, delegates] = await requestModuleData(safeAddress)
-      setDelegates(delegates[0])
+      setDelegates(delegates)
     }
     doRequestData()
   }, [safeAddress])

From 4bd62a688ae58a31f481a85d6cc38e55896ccbef Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Tue, 18 Aug 2020 17:05:31 -0300
Subject: [PATCH 18/69] WIP: properly handle tokens' decimals also fix typos
 and existentSpendingLimit state issue

---
 .../Settings/SpendingLimit/index.tsx          | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 7edfb72b24..66a5f55c07 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -1,6 +1,4 @@
 import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
-import { useSnackbar } from 'notistack'
-import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import {
   Button,
   EthHashInfo,
@@ -14,17 +12,12 @@ import {
 import { FormControlLabel, hexToRgb, Switch as SwitchMui } from '@material-ui/core'
 import { makeStyles } from '@material-ui/core/styles'
 import { Skeleton } from '@material-ui/lab'
+import { BigNumber } from 'bignumber.js'
 import { Mutator } from 'final-form'
+import { useSnackbar } from 'notistack'
 import React from 'react'
 import { useField, useForm, useFormState } from 'react-final-form'
 import { useDispatch, useSelector } from 'react-redux'
-import generateBatchRequests from 'src/logic/contracts/generateBatchRequests'
-import { getGnosisSafeInstanceAt, SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
-import { getWeb3, web3ReadOnly } from 'src/logic/wallets/getWeb3'
-import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
-import { safeModulesSelector, safeParamAddressFromStateSelector } from 'src/routes/safe/store/selectors'
-import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
-import styled from 'styled-components'
 
 import GnoField from 'src/components/forms/Field'
 import GnoForm from 'src/components/forms/GnoForm'
@@ -39,11 +32,19 @@ import { ScanQRWrapper } from 'src/components/ScanQRModal/ScanQRWrapper'
 import { getNetwork } from 'src/config'
 import { getAddressBook } from 'src/logic/addressBook/store/selectors'
 import { getNameFromAdbk } from 'src/logic/addressBook/utils'
+import generateBatchRequests from 'src/logic/contracts/generateBatchRequests'
+import { getGnosisSafeInstanceAt, SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
 import { Token } from 'src/logic/tokens/store/model/token'
+import { getWeb3, web3ReadOnly } from 'src/logic/wallets/getWeb3'
+import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
 import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/screens/AddressBookInput'
 import TokenSelectField from 'src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
+import { safeModulesSelector, safeParamAddressFromStateSelector } from 'src/routes/safe/store/selectors'
+import SpendingLimitModule from 'src/utils/AllowanceModule.json'
+import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
+import styled from 'styled-components'
 
 import AssetAmount from './assets/asset-amount.svg'
 import Beneficiary from './assets/beneficiary.svg'
@@ -565,7 +566,7 @@ const ReviewSpendingLimit = ({
           {existentSpendingLimit && (
             <Row align="center" margin="md">
               <Text size="lg" color="error">
-                Previous Amount:{' '}
+                Previous Reset Time:{' '}
                 {RESET_TIME_OPTIONS.find(
                   ({ value }) => value === (+existentSpendingLimit.resetTimeMin / 60 / 24).toString(),
                 )?.label ?? 'One-time spending limit allowance'}
@@ -680,6 +681,10 @@ const requestAllowancesByDelegatesAndTokens = async (
   )
 }
 
+const fromTokenUnit = (amount: string, decimals: string | number): string =>
+  new BigNumber(amount).times(`1e-${decimals}`).toFixed()
+const toTokenUnit = (amount: string, decimals: string | number): string =>
+  new BigNumber(amount).times(`1e${decimals}`).toFixed()
 const currentMinutes = () => Math.floor(Date.now() / (1000 * 60))
 
 const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boolean }): React.ReactElement => {
@@ -697,11 +702,10 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
   const [existentSpendingLimit, setExistentSpendingLimit] = React.useState()
 
   const handleReview = async (values) => {
-    setValues(values)
+    const selectedToken = tokens.find((token) => token.address === values.token)
 
-    if (values.token) {
-      setTxToken(tokens.find((token) => token.address === values.token))
-    }
+    setValues(values)
+    setTxToken(selectedToken)
 
     const checkExistence = async () => {
       const [, delegates] = await requestModuleData(safeAddress)
@@ -717,7 +721,12 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
 
       // let the user know that is about to replace an existent allowance
       if (currentDelegate !== undefined) {
-        setExistentSpendingLimit(currentDelegate)
+        setExistentSpendingLimit({
+          ...currentDelegate,
+          amount: fromTokenUnit(currentDelegate.amount, selectedToken.decimals),
+        })
+      } else {
+        setExistentSpendingLimit(undefined)
       }
     }
 
@@ -770,7 +779,7 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
         .setAllowance(
           values.beneficiary,
           values.token,
-          values.amount,
+          toTokenUnit(values.amount, txToken.decimals),
           values.withResetTime ? +values.resetTime * 60 * 24 : 0,
           startTime,
         )

From 53f9e4af813405e07176cbafa02a8acafcf47ec9 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Tue, 18 Aug 2020 18:07:44 -0300
Subject: [PATCH 19/69] refactor: split code into components

---
 .../Settings/SpendingLimit/Amount.tsx         |  55 ++
 .../SpendingLimit/BeneficiarySelect.tsx       | 109 ++++
 .../SpendingLimit/NewSpendingLimit.tsx        | 115 ++++
 .../Settings/SpendingLimit/ResetTime.tsx      | 113 ++++
 .../SpendingLimit/ReviewSpendingLimit.tsx     | 162 +++++
 .../SpendingLimit/SpendingLimitSteps.tsx      |  79 +++
 .../Settings/SpendingLimit/TokenSelect.tsx    |  21 +
 .../Settings/SpendingLimit/index.tsx          | 613 +-----------------
 .../Settings/SpendingLimit/style.ts           | 232 +++----
 9 files changed, 786 insertions(+), 713 deletions(-)
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/Amount.tsx
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps.tsx
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/TokenSelect.tsx

diff --git a/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx b/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx
new file mode 100644
index 0000000000..54f95475cd
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx
@@ -0,0 +1,55 @@
+import { TextField } from '@gnosis.pm/safe-react-components'
+import React from 'react'
+import { useField } from 'react-final-form'
+import { useSelector } from 'react-redux'
+
+import GnoField from 'src/components/forms/Field'
+import { composeValidators, minValue, mustBeFloat, required } from 'src/components/forms/validator'
+import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
+import styled from 'styled-components'
+import { useStyles } from './style'
+
+export const Field = styled(GnoField)`
+  margin: 8px 0;
+  width: 100%;
+`
+
+const AmountInput = styled.div`
+  grid-area: amountInput;
+`
+
+const GnoTextField = styled(TextField)`
+  margin: 0;
+`
+
+export const Amount = (): React.ReactElement => {
+  const classes = useStyles()
+
+  const {
+    input: { value: tokenAddress },
+  } = useField('token', { subscription: { value: true } })
+  const {
+    meta: { touched, visited },
+  } = useField('amount', { subscription: { touched: true, visited: true } })
+
+  const tokens = useSelector(extendedSafeTokensSelector)
+
+  const selectedTokenRecord = tokens.find((token) => token.address === tokenAddress)
+
+  const validate = (touched || visited) && composeValidators(required, mustBeFloat, minValue(0, false))
+
+  return (
+    <AmountInput>
+      <Field
+        component={GnoTextField}
+        label="Amount*"
+        name="amount"
+        type="text"
+        data-testid="amount-input"
+        endAdornment={selectedTokenRecord?.symbol}
+        className={classes.amountInput}
+        validate={validate}
+      />
+    </AmountInput>
+  )
+}
diff --git a/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx b/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
new file mode 100644
index 0000000000..bb7fdae8c9
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
@@ -0,0 +1,109 @@
+import { EthHashInfo } from '@gnosis.pm/safe-react-components'
+import React from 'react'
+import { useForm, useFormState } from 'react-final-form'
+import { useSelector } from 'react-redux'
+import styled from 'styled-components'
+
+import { ScanQRWrapper } from 'src/components/ScanQRModal/ScanQRWrapper'
+import { getNetwork } from 'src/config'
+import { getAddressBook } from 'src/logic/addressBook/store/selectors'
+import { getNameFromAdbk } from 'src/logic/addressBook/utils'
+import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/screens/AddressBookInput'
+
+const KEYCODES = {
+  TAB: 9,
+  SHIFT: 16,
+}
+
+const BeneficiaryInput = styled.div`
+  grid-area: beneficiaryInput;
+`
+
+const BeneficiaryScan = styled.div`
+  grid-area: beneficiaryScan;
+`
+
+const BeneficiarySelect = (): React.ReactElement => {
+  const { initialValues } = useFormState()
+  const { mutators } = useForm()
+
+  const [selectedEntry, setSelectedEntry] = React.useState<{ address: string; name: string } | null>({
+    address: initialValues?.beneficiary || '',
+    name: '',
+  })
+
+  const [pristine, setPristine] = React.useState<boolean>(!initialValues?.beneficiary)
+
+  React.useEffect(() => {
+    if (selectedEntry === null) {
+      mutators?.setBeneficiary?.('')
+
+      if (pristine) {
+        setPristine(false)
+      }
+    }
+  }, [mutators, pristine, selectedEntry])
+
+  const addressBook = useSelector(getAddressBook)
+
+  const handleScan = (value, closeQrModal) => {
+    let scannedAddress = value
+
+    if (scannedAddress.startsWith('ethereum:')) {
+      scannedAddress = scannedAddress.replace('ethereum:', '')
+    }
+
+    const scannedName = addressBook ? getNameFromAdbk(addressBook, scannedAddress) : ''
+
+    mutators?.setBeneficiary?.(scannedAddress)
+
+    setSelectedEntry({
+      name: scannedName,
+      address: scannedAddress,
+    })
+
+    closeQrModal()
+  }
+
+  return selectedEntry !== null && selectedEntry.address ? (
+    <BeneficiaryInput
+      role="button"
+      aria-pressed="false"
+      tabIndex={0}
+      onKeyDown={(e) => {
+        if (![KEYCODES.TAB, KEYCODES.SHIFT].includes(e.keyCode)) {
+          setSelectedEntry(null)
+        }
+      }}
+      onClick={() => {
+        setSelectedEntry(null)
+      }}
+    >
+      <EthHashInfo
+        hash={selectedEntry.address}
+        name={selectedEntry.name}
+        showCopyBtn
+        showEtherscanBtn
+        showIdenticon
+        textSize="lg"
+        network={getNetwork()}
+      />
+    </BeneficiaryInput>
+  ) : (
+    <>
+      <BeneficiaryInput>
+        <AddressBookInput
+          fieldMutator={mutators?.setBeneficiary}
+          pristine={pristine}
+          setSelectedEntry={setSelectedEntry}
+          label="Beneficiary"
+        />
+      </BeneficiaryInput>
+      <BeneficiaryScan>
+        <ScanQRWrapper handleScan={handleScan} />
+      </BeneficiaryScan>
+    </>
+  )
+}
+
+export default BeneficiarySelect
diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx
new file mode 100644
index 0000000000..c13074d1ed
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx
@@ -0,0 +1,115 @@
+import { Button, Icon, Text, Title } from '@gnosis.pm/safe-react-components'
+import { Mutator } from 'final-form'
+import React from 'react'
+import GnoForm from 'src/components/forms/GnoForm'
+import GnoButton from 'src/components/layout/Button'
+import { Amount } from 'src/routes/safe/components/Settings/SpendingLimit/Amount'
+import BeneficiarySelect from 'src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect'
+import {
+  TitleSection,
+  StyledButton,
+  FooterSection,
+  FooterWrapper,
+} from 'src/routes/safe/components/Settings/SpendingLimit/index'
+import ResetTime from 'src/routes/safe/components/Settings/SpendingLimit/ResetTime'
+import TokenSelect from 'src/routes/safe/components/Settings/SpendingLimit/TokenSelect'
+import styled from 'styled-components'
+
+const FormContainer = styled.div`
+  padding: 24px;
+  align-items: center;
+  display: grid;
+  grid-template-columns: 4fr 1fr;
+  grid-template-rows: 6fr;
+  gap: 16px 8px;
+  grid-template-areas:
+    'beneficiaryInput beneficiaryScan'
+    'tokenInput .'
+    'amountInput .'
+    'resetTimeLabel resetTimeLabel'
+    'resetTimeToggle resetTimeToggle'
+    'resetTimeOption resetTimeOption';
+`
+
+const YetAnotherButton = styled(GnoButton)`
+  &.Mui-disabled {
+    background-color: ${({ theme }) => theme.colors.primary};
+    color: ${({ theme }) => theme.colors.white};
+    opacity: 0.5;
+  }
+`
+
+// TODO: propose refactor in safe-react-components based on this requirements
+const formMutators: Record<string, Mutator<{ beneficiary: { name: string } }>> = {
+  setBeneficiary: (args, state, utils) => {
+    utils.changeValue(state, 'beneficiary', () => args[0])
+  },
+}
+
+interface NewSpendingLimitProps {
+  initialValues?: Record<string, string>
+  onCancel: () => void
+  onReview: (values) => void
+}
+
+const canReview = ({ invalid, submitting, dirtyFieldsSinceLastSubmit, values }): boolean => {
+  return !(
+    submitting ||
+    invalid ||
+    !values.beneficiary ||
+    (values.token && !values.amount) ||
+    // TODO: review the next validation, as resetTime has a default value, this check looks unnecessary
+    (values.withResetTime && !values.resetTime) ||
+    !dirtyFieldsSinceLastSubmit
+  )
+}
+
+const NewSpendingLimit = ({ initialValues, onCancel, onReview }: NewSpendingLimitProps): React.ReactElement => (
+  <>
+    <TitleSection>
+      <Title size="xs" withoutMargin>
+        New Spending Limit{' '}
+        <Text size="lg" color="secondaryLight">
+          1 of 2
+        </Text>
+      </Title>
+
+      <StyledButton onClick={onCancel}>
+        <Icon size="sm" type="cross" />
+      </StyledButton>
+    </TitleSection>
+
+    <GnoForm formMutators={formMutators} onSubmit={onReview} initialValues={initialValues}>
+      {(...args) => (
+        <>
+          <FormContainer>
+            <BeneficiarySelect />
+            <TokenSelect />
+            <Amount />
+            <ResetTime />
+          </FormContainer>
+
+          <FooterSection>
+            <FooterWrapper>
+              <Button color="primary" size="md" onClick={onCancel}>
+                Cancel
+              </Button>
+
+              <YetAnotherButton
+                color="primary"
+                size="medium"
+                variant="contained"
+                type="submit"
+                disabled={!canReview(args[2])}
+              >
+                Review
+              </YetAnotherButton>
+            </FooterWrapper>
+          </FooterSection>
+        </>
+      )}
+    </GnoForm>
+  </>
+)
+
+export default NewSpendingLimit
diff --git a/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx b/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx
new file mode 100644
index 0000000000..ee9d4bc35c
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx
@@ -0,0 +1,113 @@
+import { RadioButtons, Text } from '@gnosis.pm/safe-react-components'
+import { FormControlLabel, hexToRgb, Switch as SwitchMui } from '@material-ui/core'
+import React from 'react'
+import { useField } from 'react-final-form'
+import { Field } from 'src/routes/safe/components/Settings/SpendingLimit/Amount'
+import styled from 'styled-components'
+
+// TODO: propose refactor in safe-react-components based on this requirements
+const SpendingLimitRadioButtons = styled(RadioButtons)`
+  & .MuiRadio-colorPrimary.Mui-checked {
+    color: ${({ theme }) => theme.colors.primary};
+  }
+`
+const StyledSwitch = styled(({ ...rest }) => <SwitchMui {...rest} />)`
+  && {
+    .MuiIconButton-label,
+    .MuiSwitch-colorSecondary {
+      color: ${({ theme }) => theme.colors.icon};
+    }
+
+    .MuiSwitch-colorSecondary.Mui-checked .MuiIconButton-label {
+      color: ${({ theme }) => theme.colors.primary};
+    }
+
+    .MuiSwitch-colorSecondary.Mui-checked:hover {
+      background-color: ${({ theme }) => hexToRgb(`${theme.colors.primary}03`)};
+    }
+
+    .Mui-checked + .MuiSwitch-track {
+      background-color: ${({ theme }) => theme.colors.primaryLight};
+    }
+  }
+`
+
+interface RadioButtonOption {
+  label: string
+  value: string
+}
+
+interface RadioButtonProps {
+  options: RadioButtonOption[]
+  initialValue: string
+  groupName: string
+}
+
+const SafeRadioButtons = ({ options, initialValue, groupName }: RadioButtonProps): React.ReactElement => (
+  <Field name={groupName} initialValue={initialValue}>
+    {({ input: { name, value, onChange } }) => (
+      <SpendingLimitRadioButtons name={name} value={value || initialValue} onRadioChange={onChange} options={options} />
+    )}
+  </Field>
+)
+
+const Switch = ({ label, name }: { label: string; name: string }): React.ReactElement => (
+  <FormControlLabel
+    label={label}
+    control={
+      <Field
+        name={name}
+        type="checkbox"
+        render={({ input: { checked, onChange, name, value } }) => (
+          <StyledSwitch checked={checked} onChange={onChange} name={name} value={value} />
+        )}
+      />
+    }
+  />
+)
+
+const ResetTimeLabel = styled.div`
+  grid-area: resetTimeLabel;
+`
+
+const ResetTimeToggle = styled.div`
+  grid-area: resetTimeToggle;
+`
+
+const ResetTimeOptions = styled.div`
+  grid-area: resetTimeOption;
+`
+
+export const RESET_TIME_OPTIONS = [
+  { label: '1 day', value: '1' },
+  { label: '1 week', value: '7' },
+  { label: '1 month', value: '30' },
+]
+
+const ResetTime = (): React.ReactElement => {
+  const {
+    input: { value: withResetTime },
+  } = useField('withResetTime', { subscription: { value: true } })
+
+  return (
+    <>
+      <ResetTimeLabel>
+        <Text size="xl">Set a reset-time to have the allowance automatically refill after a defined time-period.</Text>
+      </ResetTimeLabel>
+      <ResetTimeToggle>
+        <Switch label="Reset time" name="withResetTime" />
+      </ResetTimeToggle>
+      {withResetTime && (
+        <ResetTimeOptions>
+          <SafeRadioButtons
+            groupName="resetTime"
+            initialValue={RESET_TIME_OPTIONS[0].value}
+            options={RESET_TIME_OPTIONS}
+          />
+        </ResetTimeOptions>
+      )}
+    </>
+  )
+}
+
+export default ResetTime
diff --git a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx b/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
new file mode 100644
index 0000000000..2ffeb2bcb0
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
@@ -0,0 +1,162 @@
+import { Button, EthHashInfo, Icon, IconText, Text, Title } from '@gnosis.pm/safe-react-components'
+import { Skeleton } from '@material-ui/lab'
+import React from 'react'
+import { useSelector } from 'react-redux'
+import Block from 'src/components/layout/Block'
+import Col from 'src/components/layout/Col'
+import Row from 'src/components/layout/Row'
+import { getNetwork } from 'src/config'
+import { getAddressBook } from 'src/logic/addressBook/store/selectors'
+import { getNameFromAdbk } from 'src/logic/addressBook/utils'
+import { Token } from 'src/logic/tokens/store/model/token'
+import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
+import {
+  FooterSection,
+  FooterWrapper,
+  StyledButton,
+  TitleSection,
+} from 'src/routes/safe/components/Settings/SpendingLimit/index'
+import { RESET_TIME_OPTIONS } from 'src/routes/safe/components/Settings/SpendingLimit/ResetTime'
+import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
+import styled from 'styled-components'
+
+const StyledImage = styled.img`
+  width: 32px;
+  height: 32px;
+  object-fit: contain;
+  margin: 0 8px 0 0;
+`
+
+const StyledImageName = styled.div`
+  display: flex;
+  align-items: center;
+`
+
+interface ReviewSpendingLimitProps {
+  onBack: () => void
+  onClose: () => void
+  onSubmit: () => void
+  txToken: Token | null
+  values: Record<string, string>
+  existentSpendingLimit?: Record<string, string>
+}
+
+const ReviewSpendingLimit = ({
+  onBack,
+  onClose,
+  onSubmit,
+  txToken,
+  values,
+  existentSpendingLimit,
+}: ReviewSpendingLimitProps): React.ReactElement => {
+  const classes = useStyles()
+  const addressBook = useSelector(getAddressBook)
+
+  return (
+    <>
+      <TitleSection>
+        <Title size="xs" withoutMargin>
+          New Spending Limit{' '}
+          <Text size="lg" color="secondaryLight">
+            2 of 2
+          </Text>
+        </Title>
+
+        <StyledButton onClick={onClose}>
+          <Icon size="sm" type="cross" />
+        </StyledButton>
+      </TitleSection>
+
+      <Block className={classes.container}>
+        <Col margin="lg">
+          <Text size="lg" color="secondaryLight">
+            Beneficiary
+          </Text>
+          <EthHashInfo
+            hash={values.beneficiary}
+            name={addressBook ? getNameFromAdbk(addressBook, values.beneficiary) : ''}
+            showCopyBtn
+            showEtherscanBtn
+            showIdenticon
+            textSize="lg"
+            network={getNetwork()}
+          />
+        </Col>
+        <Col margin="lg">
+          <Text size="lg" color="secondaryLight">
+            Amount
+          </Text>
+          {txToken !== null ? (
+            <>
+              <StyledImageName>
+                <StyledImage alt={txToken.name} onError={setImageToPlaceholder} src={txToken.logoUri} />
+                <Text size="lg">
+                  {values.amount} {txToken.symbol}
+                </Text>
+              </StyledImageName>
+              {existentSpendingLimit && (
+                <Text size="lg" color="error">
+                  Previous Amount: {existentSpendingLimit.amount}
+                </Text>
+              )}
+            </>
+          ) : (
+            <Skeleton animation="wave" variant="text" />
+          )}
+        </Col>
+        <Col margin="lg">
+          <Text size="lg" color="secondaryLight">
+            Reset Time
+          </Text>
+          {values.withResetTime ? (
+            <Row align="center" margin="md">
+              <IconText
+                iconSize="md"
+                iconType="fuelIndicator"
+                text={RESET_TIME_OPTIONS.find(({ value }) => value === values.resetTime).label}
+                textSize="lg"
+              />
+            </Row>
+          ) : (
+            <Row align="center" margin="md">
+              <Text size="lg">
+                {/* TODO: review message */}
+                One-time spending limit allowance
+              </Text>
+            </Row>
+          )}
+          {existentSpendingLimit && (
+            <Row align="center" margin="md">
+              <Text size="lg" color="error">
+                Previous Reset Time:{' '}
+                {RESET_TIME_OPTIONS.find(
+                  ({ value }) => value === (+existentSpendingLimit.resetTimeMin / 60 / 24).toString(),
+                )?.label ?? 'One-time spending limit allowance'}
+              </Text>
+            </Row>
+          )}
+        </Col>
+
+        {existentSpendingLimit && (
+          <Text size="xl" color="error" center strong>
+            You are about to replace an existent spending limit
+          </Text>
+        )}
+      </Block>
+
+      <FooterSection>
+        <FooterWrapper>
+          <Button color="primary" size="md" onClick={onBack}>
+            Back
+          </Button>
+
+          <Button color="primary" size="md" variant="contained" onClick={onSubmit}>
+            Submit
+          </Button>
+        </FooterWrapper>
+      </FooterSection>
+    </>
+  )
+}
+
+export default ReviewSpendingLimit
diff --git a/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps.tsx b/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps.tsx
new file mode 100644
index 0000000000..45382385d1
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps.tsx
@@ -0,0 +1,79 @@
+import { Text } from '@gnosis.pm/safe-react-components'
+import React from 'react'
+import styled from 'styled-components'
+
+import Img from 'src/components/layout/Img'
+import AssetAmount from 'src/routes/safe/components/Settings/SpendingLimit/assets/asset-amount.svg'
+import Beneficiary from 'src/routes/safe/components/Settings/SpendingLimit/assets/beneficiary.svg'
+import Time from 'src/routes/safe/components/Settings/SpendingLimit/assets/time.svg'
+
+const StepWrapper = styled.div`
+  display: flex;
+  justify-content: space-around;
+  margin-top: 20px;
+  max-width: 720px;
+  text-align: center;
+`
+
+const Step = styled.div`
+  width: 24%;
+  min-width: 120px;
+  max-width: 164px;
+`
+
+const StepsLine = styled.div`
+  height: 2px;
+  flex: 1;
+  background: #d4d5d3;
+  margin: 46px 0;
+`
+
+const SpendingLimitSteps = (): React.ReactElement => (
+  <StepWrapper>
+    <Step>
+      <Img alt="Select Beneficiary" title="Beneficiary" height={96} src={Beneficiary} />
+
+      <Text size="lg" color="placeHolder" strong center>
+        Select Beneficiary
+      </Text>
+
+      <Text size="lg" color="placeHolder" center>
+        Choose an account that will benefit from this allowance.
+      </Text>
+
+      <Text size="lg" color="placeHolder" center>
+        The beneficiary does not have to be an owner of this Safe
+      </Text>
+    </Step>
+
+    <StepsLine />
+
+    <Step>
+      <Img alt="Select asset and amount" title="Asset and Amount" height={96} src={AssetAmount} />
+
+      <Text size="lg" color="placeHolder" strong center>
+        Select asset and amount
+      </Text>
+
+      <Text size="lg" color="placeHolder" center>
+        You can set a spending limit for any asset stored in your Safe
+      </Text>
+    </Step>
+
+    <StepsLine />
+
+    <Step>
+      <Img alt="Select time" title="Time" height={96} src={Time} />
+
+      <Text size="lg" color="placeHolder" strong center>
+        Select time
+      </Text>
+
+      <Text size="lg" color="placeHolder" center>
+        You can choose to set a one-time spending limit or to have it automatically refill after a defined time-period
+      </Text>
+    </Step>
+  </StepWrapper>
+)
+
+export default SpendingLimitSteps
diff --git a/src/routes/safe/components/Settings/SpendingLimit/TokenSelect.tsx b/src/routes/safe/components/Settings/SpendingLimit/TokenSelect.tsx
new file mode 100644
index 0000000000..276a84e666
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/TokenSelect.tsx
@@ -0,0 +1,21 @@
+import React from 'react'
+import { useSelector } from 'react-redux'
+import TokenSelectField from 'src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField'
+import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
+import styled from 'styled-components'
+
+const TokenInput = styled.div`
+  grid-area: tokenInput;
+`
+
+const TokenSelect = (): React.ReactElement => {
+  const tokens = useSelector(extendedSafeTokensSelector)
+
+  return (
+    <TokenInput>
+      <TokenSelectField tokens={tokens} />
+    </TokenInput>
+  )
+}
+
+export default TokenSelect
diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 66a5f55c07..8c86167051 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -1,379 +1,42 @@
 import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
-import {
-  Button,
-  EthHashInfo,
-  Icon,
-  IconText,
-  RadioButtons,
-  Text,
-  TextField,
-  Title,
-} from '@gnosis.pm/safe-react-components'
-import { FormControlLabel, hexToRgb, Switch as SwitchMui } from '@material-ui/core'
-import { makeStyles } from '@material-ui/core/styles'
-import { Skeleton } from '@material-ui/lab'
+import { Button, Text, Title } from '@gnosis.pm/safe-react-components'
 import { BigNumber } from 'bignumber.js'
-import { Mutator } from 'final-form'
 import { useSnackbar } from 'notistack'
 import React from 'react'
-import { useField, useForm, useFormState } from 'react-final-form'
 import { useDispatch, useSelector } from 'react-redux'
+import styled from 'styled-components'
 
-import GnoField from 'src/components/forms/Field'
-import GnoForm from 'src/components/forms/GnoForm'
-import { composeValidators, minValue, mustBeFloat, required } from 'src/components/forms/validator'
 import Block from 'src/components/layout/Block'
-import GnoButton from 'src/components/layout/Button'
 import Col from 'src/components/layout/Col'
-import Img from 'src/components/layout/Img'
 import Row from 'src/components/layout/Row'
 import GnoModal from 'src/components/Modal'
-import { ScanQRWrapper } from 'src/components/ScanQRModal/ScanQRWrapper'
-import { getNetwork } from 'src/config'
-import { getAddressBook } from 'src/logic/addressBook/store/selectors'
-import { getNameFromAdbk } from 'src/logic/addressBook/utils'
 import generateBatchRequests from 'src/logic/contracts/generateBatchRequests'
 import { getGnosisSafeInstanceAt, SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
-import { Token } from 'src/logic/tokens/store/model/token'
 import { getWeb3, web3ReadOnly } from 'src/logic/wallets/getWeb3'
 import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
-import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/screens/AddressBookInput'
-import TokenSelectField from 'src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField'
-import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
+
+import NewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit'
+import ReviewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit'
+import SpendingLimitSteps from 'src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps'
 import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
-import { safeModulesSelector, safeParamAddressFromStateSelector } from 'src/routes/safe/store/selectors'
+import { safeParamAddressFromStateSelector } from 'src/routes/safe/store/selectors'
 import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
-import styled from 'styled-components'
-
-import AssetAmount from './assets/asset-amount.svg'
-import Beneficiary from './assets/beneficiary.svg'
-import Time from './assets/time.svg'
 
-import { styles } from './style'
-
-const useStyles = makeStyles(styles)
+import { useStyles } from './style'
 
 const InfoText = styled(Text)`
   margin-top: 16px;
 `
 
-const Steps = styled.div`
-  display: flex;
-  justify-content: space-around;
-  margin-top: 20px;
-  max-width: 720px;
-  text-align: center;
-`
-
-const StepsLine = styled.div`
-  height: 2px;
-  flex: 1;
-  background: #d4d5d3;
-  margin: 46px 0;
-`
-
-const SpendingLimitStep = styled.div`
-  width: 24%;
-  min-width: 120px;
-  max-width: 164px;
-`
-//
-// TODO: refactor and split into components for better readability
-//
-
-const Field = styled(GnoField)`
-  margin: 8px 0;
-  width: 100%;
-`
-
-/**
- * beneficiary - START
- */
-const KEYCODES = {
-  TAB: 9,
-  SHIFT: 16,
-}
-const BeneficiaryInput = styled.div`
-  grid-area: beneficiaryInput;
-`
-const BeneficiaryScan = styled.div`
-  grid-area: beneficiaryScan;
-`
-const SelectAddressRow = (): React.ReactElement => {
-  const { initialValues } = useFormState()
-  const { mutators } = useForm()
-  React.useEffect(() => {
-    if (initialValues?.beneficiary) {
-      mutators?.setBeneficiary?.(initialValues.beneficiary)
-    }
-  }, [initialValues, mutators])
-
-  const [selectedEntry, setSelectedEntry] = React.useState<{ address: string; name: string } | null>({
-    address: initialValues?.beneficiary || '',
-    name: '',
-  })
-
-  const [pristine, setPristine] = React.useState<boolean>(!initialValues?.beneficiary)
-  React.useMemo(() => {
-    if (selectedEntry === null) {
-      mutators?.setBeneficiary?.('')
-
-      if (pristine) {
-        setPristine(false)
-      }
-    }
-  }, [selectedEntry, mutators, pristine])
-
-  const addressBook = useSelector(getAddressBook)
-  const handleScan = (value, closeQrModal) => {
-    let scannedAddress = value
-
-    if (scannedAddress.startsWith('ethereum:')) {
-      scannedAddress = scannedAddress.replace('ethereum:', '')
-    }
-    const scannedName = addressBook ? getNameFromAdbk(addressBook, scannedAddress) : ''
-    mutators?.setBeneficiary?.(scannedAddress)
-    setSelectedEntry({
-      name: scannedName,
-      address: scannedAddress,
-    })
-    closeQrModal()
-  }
-
-  return !!selectedEntry?.address ? (
-    <BeneficiaryInput
-      role="button"
-      aria-pressed="false"
-      tabIndex={0}
-      onKeyDown={(e) => {
-        if (![KEYCODES.TAB, KEYCODES.SHIFT].includes(e.keyCode)) {
-          setSelectedEntry(null)
-        }
-      }}
-      onClick={() => {
-        setSelectedEntry(null)
-      }}
-    >
-      <EthHashInfo
-        hash={selectedEntry.address}
-        name={selectedEntry.name}
-        showCopyBtn
-        showEtherscanBtn
-        showIdenticon
-        textSize="lg"
-        network={getNetwork()}
-      />
-    </BeneficiaryInput>
-  ) : (
-    <>
-      <BeneficiaryInput>
-        <AddressBookInput
-          fieldMutator={mutators?.setBeneficiary}
-          pristine={pristine}
-          setSelectedEntry={setSelectedEntry}
-          label="Beneficiary"
-        />
-      </BeneficiaryInput>
-      <BeneficiaryScan>
-        <ScanQRWrapper handleScan={handleScan} />
-      </BeneficiaryScan>
-    </>
-  )
-}
-/**
- * beneficiary - END
- */
-
-/**
- * token
- */
-const TokenInput = styled.div`
-  grid-area: tokenInput;
-`
-const TokenSelectRow = (): React.ReactElement => {
-  const tokens = useSelector(extendedSafeTokensSelector)
-
-  return (
-    <TokenInput>
-      <TokenSelectField tokens={tokens} />
-    </TokenInput>
-  )
-}
-
-/**
- * amount
- */
-const AmountInput = styled.div`
-  grid-area: amountInput;
-`
-const GnoTextField = styled(TextField)`
-  margin: 0;
-`
-const AmountSetRow = (): React.ReactElement => {
-  const classes = useStyles()
-
-  const {
-    input: { value: tokenAddress },
-  } = useField('token', { subscription: { value: true } })
-  const {
-    meta: { touched, visited },
-  } = useField('amount', { subscription: { touched: true, visited: true } })
-  const tokens = useSelector(extendedSafeTokensSelector)
-  const selectedTokenRecord = tokens.find((token) => token.address === tokenAddress)
-  const validate = (touched || visited) && composeValidators(required, mustBeFloat, minValue(0, false))
-
-  return (
-    <AmountInput>
-      <Field
-        component={GnoTextField}
-        label="Amount*"
-        name="amount"
-        type="text"
-        data-testid="amount-input"
-        endAdornment={selectedTokenRecord?.symbol}
-        className={classes.amountInput}
-        validate={validate}
-      />
-    </AmountInput>
-  )
-}
-
-/**
- * resetTime - START
- */
-// TODO: propose refactor in safe-react-components based on this requirements
-const SpendingLimitRadioButtons = styled(RadioButtons)`
-  & .MuiRadio-colorPrimary.Mui-checked {
-    color: ${({ theme }) => theme.colors.primary};
-  }
-`
-const StyledSwitch = styled(({ ...rest }) => <SwitchMui {...rest} />)`
-  && {
-    .MuiIconButton-label,
-    .MuiSwitch-colorSecondary {
-      color: ${({ theme }) => theme.colors.icon};
-    }
-
-    .MuiSwitch-colorSecondary.Mui-checked .MuiIconButton-label {
-      color: ${({ theme }) => theme.colors.primary};
-    }
-
-    .MuiSwitch-colorSecondary.Mui-checked:hover {
-      background-color: ${({ theme }) => hexToRgb(`${theme.colors.primary}03`)};
-    }
-
-    .Mui-checked + .MuiSwitch-track {
-      background-color: ${({ theme }) => theme.colors.primaryLight};
-    }
-  }
-`
-interface RadioButtonOption {
-  label: string
-  value: string
-}
-interface RadioButtonProps {
-  options: RadioButtonOption[]
-  initialValue: string
-  groupName: string
-}
-const SafeRadioButtons = ({ options, initialValue, groupName }: RadioButtonProps): React.ReactElement => (
-  <Field name={groupName} initialValue={initialValue}>
-    {({ input: { name, value, onChange } }) => (
-      <SpendingLimitRadioButtons name={name} value={value || initialValue} onRadioChange={onChange} options={options} />
-    )}
-  </Field>
-)
-const Switch = ({ label, name }: { label: string; name: string }): React.ReactElement => (
-  <FormControlLabel
-    label={label}
-    control={
-      <Field
-        name={name}
-        type="checkbox"
-        render={({ input: { checked, onChange, name, value } }) => (
-          <StyledSwitch checked={checked} onChange={onChange} name={name} value={value} />
-        )}
-      />
-    }
-  />
-)
-const RESET_TIME_OPTIONS = [
-  { label: '1 day', value: '1' },
-  { label: '1 week', value: '7' },
-  { label: '1 month', value: '30' },
-]
-const ResetTimeLabel = styled.div`
-  grid-area: resetTimeLabel;
-`
-const ResetTimeToggle = styled.div`
-  grid-area: resetTimeToggle;
-`
-const ResetTimeOptions = styled.div`
-  grid-area: resetTimeOption;
-`
-const ResetTime = (): React.ReactElement => {
-  const {
-    input: { value: withResetTime },
-  } = useField('withResetTime', { subscription: { value: true } })
-
-  return (
-    <>
-      <ResetTimeLabel>
-        <Text size="xl">Set a reset-time to have the allowance automatically refill after a defined time-period.</Text>
-      </ResetTimeLabel>
-      <ResetTimeToggle>
-        <Switch label="Reset time" name="withResetTime" />
-      </ResetTimeToggle>
-      {withResetTime && (
-        <ResetTimeOptions>
-          <SafeRadioButtons
-            groupName="resetTime"
-            initialValue={RESET_TIME_OPTIONS[0].value}
-            options={RESET_TIME_OPTIONS}
-          />
-        </ResetTimeOptions>
-      )}
-    </>
-  )
-}
-/**
- * resetTime - END
- */
-
-const YetAnotherButton = styled(GnoButton)`
-  &.Mui-disabled {
-    background-color: ${({ theme }) => theme.colors.primary};
-    color: ${({ theme }) => theme.colors.white};
-    opacity: 0.5;
-  }
-`
-const canReview = ({ invalid, submitting, dirtyFieldsSinceLastSubmit, values }): boolean => {
-  return !(
-    submitting ||
-    invalid ||
-    !values.beneficiary ||
-    (values.token && !values.amount) ||
-    // TODO: review the next validation, as resetTime has a default value, this check looks unnecessary
-    (values.withResetTime && !values.resetTime) ||
-    !dirtyFieldsSinceLastSubmit
-  )
-}
-interface NewSpendingLimitProps {
-  initialValues?: Record<string, string>
-  onCancel: () => void
-  onReview: (values) => void
-}
-/**
- * New Spending Limit Form - START
- */
-const TitleSection = styled.div`
+export const TitleSection = styled.div`
   display: flex;
   justify-content: space-between;
   padding: 16px 24px;
   border-bottom: 2px solid ${({ theme }) => theme.colors.separator};
 `
-const StyledButton = styled.button`
+
+export const StyledButton = styled.button`
   background: none;
   border: none;
   padding: 5px;
@@ -390,218 +53,16 @@ const StyledButton = styled.button`
     cursor: pointer;
   }
 `
-const FormContainer = styled.div`
-  padding: 24px;
-  align-items: center;
-  display: grid;
-  grid-template-columns: 4fr 1fr;
-  grid-template-rows: 6fr;
-  gap: 16px 8px;
-  grid-template-areas:
-    'beneficiaryInput beneficiaryScan'
-    'tokenInput .'
-    'amountInput .'
-    'resetTimeLabel resetTimeLabel'
-    'resetTimeToggle resetTimeToggle'
-    'resetTimeOption resetTimeOption';
-`
-const FooterSection = styled.div`
+
+export const FooterSection = styled.div`
   border-top: 2px solid ${({ theme }) => theme.colors.separator};
   padding: 16px 24px;
 `
-const FooterWrapper = styled.div`
+
+export const FooterWrapper = styled.div`
   display: flex;
   justify-content: space-around;
 `
-const NewSpendingLimit = ({ initialValues, onCancel, onReview }: NewSpendingLimitProps): React.ReactElement => (
-  <>
-    <TitleSection>
-      <Title size="xs" withoutMargin>
-        New Spending Limit{' '}
-        <Text size="lg" color="secondaryLight">
-          1 of 2
-        </Text>
-      </Title>
-
-      <StyledButton onClick={onCancel}>
-        <Icon size="sm" type="cross" />
-      </StyledButton>
-    </TitleSection>
-
-    <GnoForm formMutators={formMutators} onSubmit={onReview} initialValues={initialValues}>
-      {(...args) => (
-        <>
-          <FormContainer>
-            <SelectAddressRow />
-            <TokenSelectRow />
-            <AmountSetRow />
-            <ResetTime />
-          </FormContainer>
-
-          <FooterSection>
-            <FooterWrapper>
-              <Button color="primary" size="md" onClick={onCancel}>
-                Cancel
-              </Button>
-
-              <YetAnotherButton
-                color="primary"
-                size="medium"
-                variant="contained"
-                type="submit"
-                disabled={!canReview(args[2])}
-              >
-                Review
-              </YetAnotherButton>
-            </FooterWrapper>
-          </FooterSection>
-        </>
-      )}
-    </GnoForm>
-  </>
-)
-
-const StyledImage = styled.img`
-  width: 32px;
-  height: 32px;
-  object-fit: contain;
-  margin: 0 8px 0 0;
-`
-const StyledImageName = styled.div`
-  display: flex;
-  align-items: center;
-`
-interface ReviewSpendingLimitProps {
-  onBack: () => void
-  onClose: () => void
-  onSubmit: () => void
-  txToken: Token | null
-  values: Record<string, string>
-  existentSpendingLimit?: Record<string, string>
-}
-const ReviewSpendingLimit = ({
-  onBack,
-  onClose,
-  onSubmit,
-  txToken,
-  values,
-  existentSpendingLimit,
-}: ReviewSpendingLimitProps): React.ReactElement => {
-  const classes = useStyles()
-  const addressBook = useSelector(getAddressBook)
-
-  return (
-    <>
-      <TitleSection>
-        <Title size="xs" withoutMargin>
-          New Spending Limit{' '}
-          <Text size="lg" color="secondaryLight">
-            2 of 2
-          </Text>
-        </Title>
-
-        <StyledButton onClick={onClose}>
-          <Icon size="sm" type="cross" />
-        </StyledButton>
-      </TitleSection>
-
-      <Block className={classes.container}>
-        <Col margin="lg">
-          <Text size="lg" color="secondaryLight">
-            Beneficiary
-          </Text>
-          <EthHashInfo
-            hash={values.beneficiary}
-            name={addressBook ? getNameFromAdbk(addressBook, values.beneficiary) : ''}
-            showCopyBtn
-            showEtherscanBtn
-            showIdenticon
-            textSize="lg"
-            network={getNetwork()}
-          />
-        </Col>
-        <Col margin="lg">
-          <Text size="lg" color="secondaryLight">
-            Amount
-          </Text>
-          {txToken !== null ? (
-            <>
-              <StyledImageName>
-                <StyledImage alt={txToken.name} onError={setImageToPlaceholder} src={txToken.logoUri} />
-                <Text size="lg">
-                  {values.amount} {txToken.symbol}
-                </Text>
-              </StyledImageName>
-              {existentSpendingLimit && (
-                <Text size="lg" color="error">
-                  Previous Amount: {existentSpendingLimit.amount}
-                </Text>
-              )}
-            </>
-          ) : (
-            <Skeleton animation="wave" variant="text" />
-          )}
-        </Col>
-        <Col margin="lg">
-          <Text size="lg" color="secondaryLight">
-            Reset Time
-          </Text>
-          {values.withResetTime ? (
-            <Row align="center" margin="md">
-              <IconText
-                iconSize="md"
-                iconType="fuelIndicator"
-                text={RESET_TIME_OPTIONS.find(({ value }) => value === values.resetTime).label}
-                textSize="lg"
-              />
-            </Row>
-          ) : (
-            <Row align="center" margin="md">
-              <Text size="lg">
-                {/* TODO: review message */}
-                One-time spending limit allowance
-              </Text>
-            </Row>
-          )}
-          {existentSpendingLimit && (
-            <Row align="center" margin="md">
-              <Text size="lg" color="error">
-                Previous Reset Time:{' '}
-                {RESET_TIME_OPTIONS.find(
-                  ({ value }) => value === (+existentSpendingLimit.resetTimeMin / 60 / 24).toString(),
-                )?.label ?? 'One-time spending limit allowance'}
-              </Text>
-            </Row>
-          )}
-        </Col>
-
-        {existentSpendingLimit && (
-          <Text size="xl" color="error" center strong>
-            You are about to replace an existent spending limit
-          </Text>
-        )}
-      </Block>
-
-      <FooterSection>
-        <FooterWrapper>
-          <Button color="primary" size="md" onClick={onBack}>
-            Back
-          </Button>
-
-          <Button color="primary" size="md" variant="contained" onClick={onSubmit}>
-            Submit
-          </Button>
-        </FooterWrapper>
-      </FooterSection>
-    </>
-  )
-}
-// TODO: propose refactor in safe-react-components based on this requirements
-const formMutators: Record<string, Mutator<{ beneficiary: { name: string } }>> = {
-  setBeneficiary: (args, state, utils) => {
-    utils.changeValue(state, 'beneficiary', () => args[0])
-  },
-}
 
 const requestModuleData = (safeAddress: string): Promise<any[]> => {
   const batch = new web3ReadOnly.BatchRequest()
@@ -691,7 +152,6 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
   const classes = useStyles()
 
   const safeAddress = useSelector(safeParamAddressFromStateSelector)
-  const modules = useSelector(safeModulesSelector)
   const { enqueueSnackbar, closeSnackbar } = useSnackbar()
   const dispatch = useDispatch()
 
@@ -735,7 +195,6 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
   }
 
   const handleSubmit = async (values: Record<string, string>) => {
-    // TODO: here we do the magic. FINALLY!!!!
     const [enabledModules, delegates] = await requestModuleData(safeAddress)
     const isSpendingLimitEnabled =
       enabledModules?.array?.some((module) => module.toLowerCase() === SPENDING_LIMIT_MODULE_ADDRESS.toLowerCase()) ??
@@ -786,8 +245,6 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
         .encodeABI(),
     })
 
-    console.log({ modules, enabledModules, delegates, values })
-
     await sendTransactions(
       dispatch,
       safeAddress,
@@ -821,46 +278,6 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
     </GnoModal>
   )
 }
-/**
- * New Spending Limit Form - END
- */
-
-const SpendingLimitSteps = (): React.ReactElement => (
-  <Steps>
-    <SpendingLimitStep>
-      <Img alt="Select Beneficiary" title="Beneficiary" height={96} src={Beneficiary} />
-      <Text size="lg" color="placeHolder" strong center>
-        Select Beneficiary
-      </Text>
-      <Text size="lg" color="placeHolder" center>
-        Choose an account that will benefit from this allowance.
-      </Text>
-      <Text size="lg" color="placeHolder" center>
-        The beneficiary does not have to be an owner of this Safe
-      </Text>
-    </SpendingLimitStep>
-    <StepsLine />
-    <SpendingLimitStep>
-      <Img alt="Select asset and amount" title="Asset and Amount" height={96} src={AssetAmount} />
-      <Text size="lg" color="placeHolder" strong center>
-        Select asset and amount
-      </Text>
-      <Text size="lg" color="placeHolder" center>
-        You can set a spending limit for any asset stored in your Safe
-      </Text>
-    </SpendingLimitStep>
-    <StepsLine />
-    <SpendingLimitStep>
-      <Img alt="Select time" title="Time" height={96} src={Time} />
-      <Text size="lg" color="placeHolder" strong center>
-        Select time
-      </Text>
-      <Text size="lg" color="placeHolder" center>
-        You can choose to set a one-time spending limit or to have it automatically refill after a defined time-period
-      </Text>
-    </SpendingLimitStep>
-  </Steps>
-)
 const SpendingLimit = (): React.ReactElement => {
   const classes = useStyles()
   const granted = useSelector(grantedSelector)
diff --git a/src/routes/safe/components/Settings/SpendingLimit/style.ts b/src/routes/safe/components/Settings/SpendingLimit/style.ts
index b01a6cf360..c098eb109f 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/style.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/style.ts
@@ -1,4 +1,4 @@
-import { createStyles } from '@material-ui/core'
+import { createStyles, makeStyles } from '@material-ui/core'
 import {
   background,
   boldFont,
@@ -13,119 +13,121 @@ import {
   xl,
 } from 'src/theme/variables'
 
-export const styles = createStyles({
-  title: {
-    padding: lg,
-    paddingBottom: 0,
-  },
-  hide: {
-    '&:hover': {
-      backgroundColor: '#fff3e2',
-    },
-    '&:hover $actions': {
-      visibility: 'initial',
-    },
-  },
-  actions: {
-    justifyContent: 'flex-end',
-    visibility: 'hidden',
-    minWidth: '100px',
-  },
-  noBorderBottom: {
-    '& > td': {
-      borderBottom: 'none',
-    },
-  },
-  annotation: {
-    paddingLeft: lg,
-  },
-  ownersText: {
-    color: secondaryText,
-    '& b': {
-      color: fontColor,
-    },
-  },
-  container: {
-    padding: lg,
-  },
-  actionButton: {
-    fontWeight: boldFont,
-    marginRight: sm,
-  },
-  buttonRow: {
-    padding: lg,
-    position: 'absolute',
-    left: 0,
-    bottom: 0,
-    boxSizing: 'border-box',
-    width: '100%',
-    justifyContent: 'flex-end',
-    borderTop: `2px solid ${border}`,
-  },
-  modifyBtn: {
-    height: xl,
-    fontSize: smallFontSize,
-  },
-  removeModuleIcon: {
-    marginLeft: lg,
-    cursor: 'pointer',
-  },
-  modalHeading: {
-    boxSizing: 'border-box',
-    justifyContent: 'space-between',
-    maxHeight: '75px',
-    padding: `${sm} ${lg}`,
-  },
-  modalContainer: {
-    minHeight: '369px',
-  },
-  modalManage: {
-    fontSize: lg,
-  },
-  modalClose: {
-    height: '35px',
-    width: '35px',
-  },
-  modalButtonRow: {
-    height: '84px',
-    justifyContent: 'center',
-  },
-  modalButtonRemove: {
-    color: '#fff',
-    backgroundColor: error,
-    height: '42px',
-  },
-  modalName: {
-    textOverflow: 'ellipsis',
-    overflow: 'hidden',
-  },
-  modalUserName: {
-    whiteSpace: 'nowrap',
-  },
-  modalOwner: {
-    backgroundColor: background,
-    padding: md,
-    alignItems: 'center',
-  },
-  modalUser: {
-    justifyContent: 'left',
-  },
-  modalDescription: {
-    padding: md,
-  },
-  modalOpen: {
-    paddingLeft: sm,
-    width: 'auto',
-    '&:hover': {
+export const useStyles = makeStyles(
+  createStyles({
+    title: {
+      padding: lg,
+      paddingBottom: 0,
+    },
+    hide: {
+      '&:hover': {
+        backgroundColor: '#fff3e2',
+      },
+      '&:hover $actions': {
+        visibility: 'initial',
+      },
+    },
+    actions: {
+      justifyContent: 'flex-end',
+      visibility: 'hidden',
+      minWidth: '100px',
+    },
+    noBorderBottom: {
+      '& > td': {
+        borderBottom: 'none',
+      },
+    },
+    annotation: {
+      paddingLeft: lg,
+    },
+    ownersText: {
+      color: secondaryText,
+      '& b': {
+        color: fontColor,
+      },
+    },
+    container: {
+      padding: lg,
+    },
+    actionButton: {
+      fontWeight: boldFont,
+      marginRight: sm,
+    },
+    buttonRow: {
+      padding: lg,
+      position: 'absolute',
+      left: 0,
+      bottom: 0,
+      boxSizing: 'border-box',
+      width: '100%',
+      justifyContent: 'flex-end',
+      borderTop: `2px solid ${border}`,
+    },
+    modifyBtn: {
+      height: xl,
+      fontSize: smallFontSize,
+    },
+    removeModuleIcon: {
+      marginLeft: lg,
       cursor: 'pointer',
     },
-  },
-  modal: {
-    height: 'auto',
-    maxWidth: 'calc(100% - 30px)',
-    overflow: 'hidden',
-  },
-  amountInput: {
-    width: '100% !important',
-  },
-})
+    modalHeading: {
+      boxSizing: 'border-box',
+      justifyContent: 'space-between',
+      maxHeight: '75px',
+      padding: `${sm} ${lg}`,
+    },
+    modalContainer: {
+      minHeight: '369px',
+    },
+    modalManage: {
+      fontSize: lg,
+    },
+    modalClose: {
+      height: '35px',
+      width: '35px',
+    },
+    modalButtonRow: {
+      height: '84px',
+      justifyContent: 'center',
+    },
+    modalButtonRemove: {
+      color: '#fff',
+      backgroundColor: error,
+      height: '42px',
+    },
+    modalName: {
+      textOverflow: 'ellipsis',
+      overflow: 'hidden',
+    },
+    modalUserName: {
+      whiteSpace: 'nowrap',
+    },
+    modalOwner: {
+      backgroundColor: background,
+      padding: md,
+      alignItems: 'center',
+    },
+    modalUser: {
+      justifyContent: 'left',
+    },
+    modalDescription: {
+      padding: md,
+    },
+    modalOpen: {
+      paddingLeft: sm,
+      width: 'auto',
+      '&:hover': {
+        cursor: 'pointer',
+      },
+    },
+    modal: {
+      height: 'auto',
+      maxWidth: 'calc(100% - 30px)',
+      overflow: 'hidden',
+    },
+    amountInput: {
+      width: '100% !important',
+    },
+  }),
+)

From 9be7cd739c486305007954074ca721e863434216 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Tue, 18 Aug 2020 18:21:35 -0300
Subject: [PATCH 20/69] fix reference after merge

---
 src/routes/safe/components/Settings/SpendingLimit/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 8c86167051..c7311a2938 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -12,14 +12,14 @@ import Row from 'src/components/layout/Row'
 import GnoModal from 'src/components/Modal'
 import generateBatchRequests from 'src/logic/contracts/generateBatchRequests'
 import { getGnosisSafeInstanceAt, SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
+import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
 import { getWeb3, web3ReadOnly } from 'src/logic/wallets/getWeb3'
-import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
 
+import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
 import NewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit'
 import ReviewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit'
 import SpendingLimitSteps from 'src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps'
 import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
-import { safeParamAddressFromStateSelector } from 'src/routes/safe/store/selectors'
 import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 

From b4656700c0c399f4f424ecf49488994e80fcf7f5 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Tue, 18 Aug 2020 18:27:43 -0300
Subject: [PATCH 21/69] add `REACT_APP_SPENDING_LIMIT_MODULE_ADDRESS` as .env
 variable

---
 .env.example | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.env.example b/.env.example
index cb172be891..d755ccf010 100644
--- a/.env.example
+++ b/.env.example
@@ -30,3 +30,6 @@ REACT_APP_APP_VERSION=$npm_package_version
 
 # For Apps
 REACT_APP_GNOSIS_APPS_URL=https://safe-apps.staging.gnosisdev.com
+
+# Contracts Addresses
+REACT_APP_SPENDING_LIMIT_MODULE_ADDRESS=

From 91826212cbbed94faf300f5e1fd24f846ab2bd3f Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Tue, 18 Aug 2020 18:52:08 -0300
Subject: [PATCH 22/69] set return type for array map

---
 src/routes/safe/components/Settings/SpendingLimit/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index c7311a2938..172163eeea 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -115,7 +115,7 @@ const requestAllowancesByDelegatesAndTokens = async (
 
   let whenRequestValues = []
 
-  tokensByDelegate.map(([delegate, tokens]) => {
+  tokensByDelegate.map(([delegate, tokens]): void => {
     whenRequestValues = tokens.map((token) =>
       generateBatchRequests({
         abi: SpendingLimitModule.abi,

From e0a62aec0895ef6b029bdb7dacb1e8879326a009 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Tue, 18 Aug 2020 19:03:18 -0300
Subject: [PATCH 23/69] add return value

---
 src/routes/safe/components/Settings/SpendingLimit/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 172163eeea..6c4d7a3328 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -125,6 +125,7 @@ const requestAllowancesByDelegatesAndTokens = async (
         context: { delegate, token },
       }),
     )
+    return
   })
 
   batch.execute()

From 1000ffa0870bdaaf1d7a661c1e4bed3e6ef97f4f Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Tue, 18 Aug 2020 19:14:27 -0300
Subject: [PATCH 24/69] replace map with for..of loop

---
 src/routes/safe/components/Settings/SpendingLimit/index.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 6c4d7a3328..e0e354468c 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -115,7 +115,7 @@ const requestAllowancesByDelegatesAndTokens = async (
 
   let whenRequestValues = []
 
-  tokensByDelegate.map(([delegate, tokens]): void => {
+  for (const [delegate, tokens] of tokensByDelegate) {
     whenRequestValues = tokens.map((token) =>
       generateBatchRequests({
         abi: SpendingLimitModule.abi,
@@ -125,8 +125,7 @@ const requestAllowancesByDelegatesAndTokens = async (
         context: { delegate, token },
       }),
     )
-    return
-  })
+  }
 
   batch.execute()
 

From b81938af618ce9ce6fe6e2c01663a235a07e9c58 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 11:07:48 -0300
Subject: [PATCH 25/69] move MODULE_ADDRESS constant to .env.example

---
 .env.example           | 3 ++-
 src/utils/constants.ts | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index d755ccf010..23a68730e6 100644
--- a/.env.example
+++ b/.env.example
@@ -32,4 +32,5 @@ REACT_APP_APP_VERSION=$npm_package_version
 REACT_APP_GNOSIS_APPS_URL=https://safe-apps.staging.gnosisdev.com
 
 # Contracts Addresses
-REACT_APP_SPENDING_LIMIT_MODULE_ADDRESS=
+REACT_APP_SPENDING_LIMIT_MODULE_ADDRESS=0x9e9Bf12b5a66c0f0A7435835e0365477E121B110
+
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index cb84da136b..e640cfb597 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -14,5 +14,4 @@ export const OPENSEA_API_KEY = process.env.REACT_APP_OPENSEA_API_KEY || ''
 export const COLLECTIBLES_SOURCE = process.env.REACT_APP_COLLECTIBLES_SOURCE || 'OpenSea'
 export const TIMEOUT = process.env.NODE_ENV === 'test' ? 1500 : 5000
 export const ETHERSCAN_API_KEY = process.env.REACT_APP_ETHERSCAN_API_KEY
-export const SPENDING_LIMIT_MODULE_ADDRESS =
-  process.env.REACT_APP_SPENDING_LIMIT_MODULE_ADDRESS || '0x9e9Bf12b5a66c0f0A7435835e0365477E121B110'
+export const SPENDING_LIMIT_MODULE_ADDRESS = process.env.REACT_APP_SPENDING_LIMIT_MODULE_ADDRESS

From f2d333a3d32b645f237559a9a1405e2fe6c1ca62 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 11:56:37 -0300
Subject: [PATCH 26/69] replace native button with src Button component

---
 .../ScanQRModal/ScanQRWrapper/index.tsx          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/ScanQRModal/ScanQRWrapper/index.tsx b/src/components/ScanQRModal/ScanQRWrapper/index.tsx
index 1a4cbca479..63b8572fbf 100644
--- a/src/components/ScanQRModal/ScanQRWrapper/index.tsx
+++ b/src/components/ScanQRModal/ScanQRWrapper/index.tsx
@@ -1,4 +1,4 @@
-import { Icon } from '@gnosis.pm/safe-react-components'
+import { Button, Icon } from '@gnosis.pm/safe-react-components'
 import { makeStyles } from '@material-ui/core/styles'
 import React from 'react'
 
@@ -8,7 +8,8 @@ const useStyles = makeStyles({
   qrCodeBtn: {
     cursor: 'pointer',
     border: 'none',
-    backgroundColor: 'transparent',
+    padding: '0 !important',
+    minWidth: '40px',
   },
 })
 
@@ -34,9 +35,16 @@ export const ScanQRWrapper = ({ handleScan }: ScanQRWrapperProps): React.ReactEl
 
   return (
     <>
-      <button onClick={openQrModal} className={classes.qrCodeBtn} title="Scan QR" data-testid="qr-icon" type="button">
+      <Button
+        size="md"
+        color="secondary"
+        title="Scan QR"
+        type="button"
+        onClick={openQrModal}
+        className={classes.qrCodeBtn}
+      >
         <Icon type="qrCode" size="sm" />
-      </button>
+      </Button>
       {qrModalOpen && <ScanQRModal isOpen={qrModalOpen} onClose={closeQrModal} onScan={onScanFinished} />}
     </>
   )

From c06f9035d4a44ac3af557fbf4bb9f4e413362bf4 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 12:00:59 -0300
Subject: [PATCH 27/69] remove unneeded button styles

---
 src/components/ScanQRModal/ScanQRWrapper/index.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/ScanQRModal/ScanQRWrapper/index.tsx b/src/components/ScanQRModal/ScanQRWrapper/index.tsx
index 63b8572fbf..e03654e410 100644
--- a/src/components/ScanQRModal/ScanQRWrapper/index.tsx
+++ b/src/components/ScanQRModal/ScanQRWrapper/index.tsx
@@ -6,8 +6,6 @@ import ScanQRModal from 'src/components/ScanQRModal'
 
 const useStyles = makeStyles({
   qrCodeBtn: {
-    cursor: 'pointer',
-    border: 'none',
     padding: '0 !important',
     minWidth: '40px',
   },

From 54b45ffcaf28c709c7f23e1035abab35d19fbc81 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 17:02:08 -0300
Subject: [PATCH 28/69] rename `TextField` to `SRCTextField`, and
 `GnoTextField` to `TextField`

---
 .../safe/components/Settings/SpendingLimit/Amount.tsx       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx b/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx
index 54f95475cd..9927cab2eb 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx
@@ -1,4 +1,4 @@
-import { TextField } from '@gnosis.pm/safe-react-components'
+import { TextField as SRCTextField } from '@gnosis.pm/safe-react-components'
 import React from 'react'
 import { useField } from 'react-final-form'
 import { useSelector } from 'react-redux'
@@ -18,7 +18,7 @@ const AmountInput = styled.div`
   grid-area: amountInput;
 `
 
-const GnoTextField = styled(TextField)`
+const TextField = styled(SRCTextField)`
   margin: 0;
 `
 
@@ -41,7 +41,7 @@ export const Amount = (): React.ReactElement => {
   return (
     <AmountInput>
       <Field
-        component={GnoTextField}
+        component={TextField}
         label="Amount*"
         name="amount"
         type="text"

From 43bf62ce8933e3c61a39ce69eef5a3d7a068dbdb Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 17:09:13 -0300
Subject: [PATCH 29/69] extract inline event handlers

---
 .../SpendingLimit/BeneficiarySelect.tsx       | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx b/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
index bb7fdae8c9..ba66c6b258 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
@@ -65,19 +65,23 @@ const BeneficiarySelect = (): React.ReactElement => {
     closeQrModal()
   }
 
+  const handleOnKeyDown = (e: React.KeyboardEvent<HTMLElement>): void => {
+    if (![KEYCODES.TAB, KEYCODES.SHIFT].includes(e.keyCode)) {
+      setSelectedEntry(null)
+    }
+  }
+
+  const handleOnClick = () => {
+    setSelectedEntry(null)
+  }
+
   return selectedEntry !== null && selectedEntry.address ? (
     <BeneficiaryInput
       role="button"
       aria-pressed="false"
       tabIndex={0}
-      onKeyDown={(e) => {
-        if (![KEYCODES.TAB, KEYCODES.SHIFT].includes(e.keyCode)) {
-          setSelectedEntry(null)
-        }
-      }}
-      onClick={() => {
-        setSelectedEntry(null)
-      }}
+      onKeyDown={handleOnKeyDown}
+      onClick={handleOnClick}
     >
       <EthHashInfo
         hash={selectedEntry.address}

From ea27f9746c192c79c438336ba6041bae6b4d25fa Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 17:13:15 -0300
Subject: [PATCH 30/69] extract utility functions

---
 .../SpendingLimit/BeneficiarySelect.tsx       |   6 +-
 .../Settings/SpendingLimit/index.tsx          | 102 +++---------------
 .../Settings/SpendingLimit/utils.ts           |  98 +++++++++++++++++
 3 files changed, 111 insertions(+), 95 deletions(-)
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/utils.ts

diff --git a/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx b/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
index ba66c6b258..b814f366bd 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
@@ -9,11 +9,7 @@ import { getNetwork } from 'src/config'
 import { getAddressBook } from 'src/logic/addressBook/store/selectors'
 import { getNameFromAdbk } from 'src/logic/addressBook/utils'
 import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/screens/AddressBookInput'
-
-const KEYCODES = {
-  TAB: 9,
-  SHIFT: 16,
-}
+import { KEYCODES } from 'src/routes/safe/components/Settings/SpendingLimit/utils'
 
 const BeneficiaryInput = styled.div`
   grid-area: beneficiaryInput;
diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index e0e354468c..d0b3144f91 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -1,27 +1,32 @@
-import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
 import { Button, Text, Title } from '@gnosis.pm/safe-react-components'
-import { BigNumber } from 'bignumber.js'
 import { useSnackbar } from 'notistack'
 import React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import styled from 'styled-components'
 
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
 import Row from 'src/components/layout/Row'
 import GnoModal from 'src/components/Modal'
-import generateBatchRequests from 'src/logic/contracts/generateBatchRequests'
-import { getGnosisSafeInstanceAt, SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
+import { getGnosisSafeInstanceAt } from 'src/logic/contracts/safeContracts'
 import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
-import { getWeb3, web3ReadOnly } from 'src/logic/wallets/getWeb3'
+import { getWeb3 } from 'src/logic/wallets/getWeb3'
 
 import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
 import NewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit'
 import ReviewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit'
 import SpendingLimitSteps from 'src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps'
+import {
+  currentMinutes,
+  fromTokenUnit,
+  requestAllowancesByDelegatesAndTokens,
+  requestModuleData,
+  requestTokensByDelegate,
+  toTokenUnit,
+} from 'src/routes/safe/components/Settings/SpendingLimit/utils'
 import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
 import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
+import styled from 'styled-components'
 
 import { useStyles } from './style'
 
@@ -64,90 +69,6 @@ export const FooterWrapper = styled.div`
   justify-content: space-around;
 `
 
-const requestModuleData = (safeAddress: string): Promise<any[]> => {
-  const batch = new web3ReadOnly.BatchRequest()
-
-  const requests = [
-    {
-      abi: GnosisSafeSol.abi,
-      address: safeAddress,
-      methods: [{ method: 'getModulesPaginated', args: [SENTINEL_ADDRESS, 100] }],
-      batch,
-    },
-    {
-      abi: SpendingLimitModule.abi,
-      address: SPENDING_LIMIT_MODULE_ADDRESS,
-      methods: [{ method: 'getDelegates', args: [safeAddress, 0, 100] }],
-      batch,
-    },
-  ]
-
-  const whenRequestsValues = requests.map(generateBatchRequests)
-
-  batch.execute()
-
-  return Promise.all(whenRequestsValues).then(([modules, delegates]) => [modules[0], delegates[0]])
-}
-
-const requestTokensByDelegate = async (safeAddress: string, delegates: string[]): Promise<any[]> => {
-  const batch = new web3ReadOnly.BatchRequest()
-
-  const whenRequestValues = delegates.map((delegateAddress: string) =>
-    generateBatchRequests({
-      abi: SpendingLimitModule.abi,
-      address: SPENDING_LIMIT_MODULE_ADDRESS,
-      methods: [{ method: 'getTokens', args: [safeAddress, delegateAddress] }],
-      batch,
-      context: delegateAddress,
-    }),
-  )
-
-  batch.execute()
-
-  return Promise.all(whenRequestValues)
-}
-
-const requestAllowancesByDelegatesAndTokens = async (
-  safeAddress: string,
-  tokensByDelegate: [string, string[]][],
-): Promise<any[]> => {
-  const batch = new web3ReadOnly.BatchRequest()
-
-  let whenRequestValues = []
-
-  for (const [delegate, tokens] of tokensByDelegate) {
-    whenRequestValues = tokens.map((token) =>
-      generateBatchRequests({
-        abi: SpendingLimitModule.abi,
-        address: SPENDING_LIMIT_MODULE_ADDRESS,
-        methods: [{ method: 'getTokenAllowance', args: [safeAddress, delegate, token] }],
-        batch,
-        context: { delegate, token },
-      }),
-    )
-  }
-
-  batch.execute()
-
-  return Promise.all(whenRequestValues).then((allowances) =>
-    allowances.map(([{ delegate, token }, [amount, spent, resetTimeMin, lastResetMin, nonce]]) => ({
-      delegate,
-      token,
-      amount,
-      spent,
-      resetTimeMin,
-      lastResetMin,
-      nonce,
-    })),
-  )
-}
-
-const fromTokenUnit = (amount: string, decimals: string | number): string =>
-  new BigNumber(amount).times(`1e-${decimals}`).toFixed()
-const toTokenUnit = (amount: string, decimals: string | number): string =>
-  new BigNumber(amount).times(`1e${decimals}`).toFixed()
-const currentMinutes = () => Math.floor(Date.now() / (1000 * 60))
-
 const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boolean }): React.ReactElement => {
   const classes = useStyles()
 
@@ -278,6 +199,7 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
     </GnoModal>
   )
 }
+
 const SpendingLimit = (): React.ReactElement => {
   const classes = useStyles()
   const granted = useSelector(grantedSelector)
diff --git a/src/routes/safe/components/Settings/SpendingLimit/utils.ts b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
new file mode 100644
index 0000000000..b5990dc9a4
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
@@ -0,0 +1,98 @@
+import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
+import { BigNumber } from 'bignumber.js'
+import generateBatchRequests from 'src/logic/contracts/generateBatchRequests'
+import { SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
+import { web3ReadOnly } from 'src/logic/wallets/getWeb3'
+import SpendingLimitModule from 'src/utils/AllowanceModule.json'
+import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
+
+export const KEYCODES = {
+  TAB: 9,
+  SHIFT: 16,
+}
+
+export const fromTokenUnit = (amount: string, decimals: string | number): string =>
+  new BigNumber(amount).times(`1e-${decimals}`).toFixed()
+
+export const toTokenUnit = (amount: string, decimals: string | number): string =>
+  new BigNumber(amount).times(`1e${decimals}`).toFixed()
+
+export const currentMinutes = () => Math.floor(Date.now() / (1000 * 60))
+
+export const requestModuleData = (safeAddress: string): Promise<any[]> => {
+  const batch = new web3ReadOnly.BatchRequest()
+
+  const requests = [
+    {
+      abi: GnosisSafeSol.abi,
+      address: safeAddress,
+      methods: [{ method: 'getModulesPaginated', args: [SENTINEL_ADDRESS, 100] }],
+      batch,
+    },
+    {
+      abi: SpendingLimitModule.abi,
+      address: SPENDING_LIMIT_MODULE_ADDRESS,
+      methods: [{ method: 'getDelegates', args: [safeAddress, 0, 100] }],
+      batch,
+    },
+  ]
+
+  const whenRequestsValues = requests.map(generateBatchRequests)
+
+  batch.execute()
+
+  return Promise.all(whenRequestsValues).then(([modules, delegates]) => [modules[0], delegates[0]])
+}
+
+export const requestTokensByDelegate = async (safeAddress: string, delegates: string[]): Promise<any[]> => {
+  const batch = new web3ReadOnly.BatchRequest()
+
+  const whenRequestValues = delegates.map((delegateAddress: string) =>
+    generateBatchRequests({
+      abi: SpendingLimitModule.abi,
+      address: SPENDING_LIMIT_MODULE_ADDRESS,
+      methods: [{ method: 'getTokens', args: [safeAddress, delegateAddress] }],
+      batch,
+      context: delegateAddress,
+    }),
+  )
+
+  batch.execute()
+
+  return Promise.all(whenRequestValues)
+}
+
+export const requestAllowancesByDelegatesAndTokens = async (
+  safeAddress: string,
+  tokensByDelegate: [string, string[]][],
+): Promise<any[]> => {
+  const batch = new web3ReadOnly.BatchRequest()
+
+  let whenRequestValues = []
+
+  for (const [delegate, tokens] of tokensByDelegate) {
+    whenRequestValues = tokens.map((token) =>
+      generateBatchRequests({
+        abi: SpendingLimitModule.abi,
+        address: SPENDING_LIMIT_MODULE_ADDRESS,
+        methods: [{ method: 'getTokenAllowance', args: [safeAddress, delegate, token] }],
+        batch,
+        context: { delegate, token },
+      }),
+    )
+  }
+
+  batch.execute()
+
+  return Promise.all(whenRequestValues).then((allowances) =>
+    allowances.map(([{ delegate, token }, [amount, spent, resetTimeMin, lastResetMin, nonce]]) => ({
+      delegate,
+      token,
+      amount,
+      spent,
+      resetTimeMin,
+      lastResetMin,
+      nonce,
+    })),
+  )
+}

From 9781dee5a22c0945c7723300b7874e230f2a1d36 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 17:23:43 -0300
Subject: [PATCH 31/69] add TODO for `YetAnotherButton`

---
 .../safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx
index c13074d1ed..71ed700fde 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx
@@ -39,7 +39,6 @@ const YetAnotherButton = styled(GnoButton)`
   }
 `
 
-// TODO: propose refactor in safe-react-components based on this requirements
 const formMutators: Record<string, Mutator<{ beneficiary: { name: string } }>> = {
   setBeneficiary: (args, state, utils) => {
     utils.changeValue(state, 'beneficiary', () => args[0])
@@ -95,6 +94,7 @@ const NewSpendingLimit = ({ initialValues, onCancel, onReview }: NewSpendingLimi
                 Cancel
               </Button>
 
+              {/* TODO: replace this with safe-react-components button. This is used as "submit" SRC Button does not triggers submission up until the 2nd click */}
               <YetAnotherButton
                 color="primary"
                 size="medium"

From e131e25a37231e70e780a326afe0eadacdfd9727 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 17:28:00 -0300
Subject: [PATCH 32/69] add TODO for StyledSwitch

---
 src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx b/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx
index ee9d4bc35c..208ee54c32 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx
@@ -11,6 +11,8 @@ const SpendingLimitRadioButtons = styled(RadioButtons)`
     color: ${({ theme }) => theme.colors.primary};
   }
 `
+
+// TODO: add `name` and `value` to SRC Switch, as they're required for a better RFF integration
 const StyledSwitch = styled(({ ...rest }) => <SwitchMui {...rest} />)`
   && {
     .MuiIconButton-label,

From 30f3c2f6e030a53b046ecc5323d277f22bc77164 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 16:32:34 -0300
Subject: [PATCH 33/69] WIP: listing Spending Limits

---
 .../SpendingLimit/ReviewSpendingLimit.tsx     |   5 +-
 .../Settings/SpendingLimit/dataFetcher.ts     |  73 ++++++++
 .../Settings/SpendingLimit/index.tsx          | 164 +++++++++++++++++-
 .../Settings/SpendingLimit/style.ts           |   1 -
 4 files changed, 233 insertions(+), 10 deletions(-)
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts

diff --git a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx b/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
index 2ffeb2bcb0..cfd49b619e 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
@@ -15,7 +15,8 @@ import {
   FooterWrapper,
   StyledButton,
   TitleSection,
-} from 'src/routes/safe/components/Settings/SpendingLimit/index'
+  SpendingLimit,
+} from 'src/routes/safe/components/Settings/SpendingLimit'
 import { RESET_TIME_OPTIONS } from 'src/routes/safe/components/Settings/SpendingLimit/ResetTime'
 import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
 import styled from 'styled-components'
@@ -38,7 +39,7 @@ interface ReviewSpendingLimitProps {
   onSubmit: () => void
   txToken: Token | null
   values: Record<string, string>
-  existentSpendingLimit?: Record<string, string>
+  existentSpendingLimit?: SpendingLimit
 }
 
 const ReviewSpendingLimit = ({
diff --git a/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts b/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
new file mode 100644
index 0000000000..c1a0a36fdb
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
@@ -0,0 +1,73 @@
+import { formatRelative } from 'date-fns'
+import { List } from 'immutable'
+import { TableColumn } from 'src/components/Table/types.d'
+import { SpendingLimit } from '.'
+
+export const SPENDING_LIMIT_TABLE_BENEFICIARY_ID = 'beneficiary'
+export const SPENDING_LIMIT_TABLE_SPENT_ID = 'spent'
+export const SPENDING_LIMIT_TABLE_RESET_TIME_ID = 'resetTime'
+export const SPENDING_LIMIT_TABLE_ACTION_ID = 'action'
+
+export type SpendingLimitTable = {
+  [SPENDING_LIMIT_TABLE_BENEFICIARY_ID]: string
+  [SPENDING_LIMIT_TABLE_SPENT_ID]: Record<string, string>
+  [SPENDING_LIMIT_TABLE_RESET_TIME_ID]: string
+}
+
+const relativeTime = (baseTimeMin: string, resetTimeMin: string): string => {
+  const baseTimeSeconds = +baseTimeMin * 60
+  const resetTimeSeconds = +resetTimeMin * 60
+  const nextResetTimeMilliseconds = (baseTimeSeconds + resetTimeSeconds) * 1000
+  return formatRelative(nextResetTimeMilliseconds, Date.now())
+}
+
+export const getSpendingLimitData = (spendingLimits: SpendingLimit[] | null): SpendingLimitTable[] | undefined => {
+  return spendingLimits?.map((spendingLimit) => ({
+    [SPENDING_LIMIT_TABLE_BENEFICIARY_ID]: spendingLimit.delegate,
+    [SPENDING_LIMIT_TABLE_SPENT_ID]: {
+      spent: spendingLimit.spent,
+      amount: spendingLimit.amount,
+      tokenAddress: spendingLimit.token,
+    },
+    [SPENDING_LIMIT_TABLE_RESET_TIME_ID]: relativeTime(spendingLimit.lastResetMin, spendingLimit.resetTimeMin),
+  }))
+}
+
+export const generateColumns = (): List<TableColumn> => {
+  const beneficiaryColumn: TableColumn = {
+    align: 'left',
+    custom: false,
+    disablePadding: false,
+    id: SPENDING_LIMIT_TABLE_BENEFICIARY_ID,
+    label: 'Beneficiary',
+    order: false,
+  }
+
+  const spentColumn: TableColumn = {
+    align: 'left',
+    custom: false,
+    disablePadding: false,
+    id: SPENDING_LIMIT_TABLE_SPENT_ID,
+    label: 'Spent',
+    order: false,
+  }
+
+  const resetColumn: TableColumn = {
+    align: 'left',
+    custom: false,
+    disablePadding: false,
+    id: SPENDING_LIMIT_TABLE_RESET_TIME_ID,
+    label: 'Reset Time',
+    order: false,
+  }
+
+  const actionsColumn: TableColumn = {
+    custom: true,
+    disablePadding: false,
+    id: SPENDING_LIMIT_TABLE_ACTION_ID,
+    label: '',
+    order: false,
+  }
+
+  return List([beneficiaryColumn, spentColumn, resetColumn, actionsColumn])
+}
diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index d0b3144f91..cac847c814 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -1,7 +1,21 @@
 import { Button, Text, Title } from '@gnosis.pm/safe-react-components'
+import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
+import { Button, EthHashInfo, Text, Title } from '@gnosis.pm/safe-react-components'
+import TableContainer from '@material-ui/core/TableContainer'
+import { BigNumber } from 'bignumber.js'
+import cn from 'classnames'
 import { useSnackbar } from 'notistack'
 import React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
+import { TableCell, TableRow } from 'src/components/layout/Table'
+import Table from 'src/components/Table'
+import { getNetwork } from 'src/config'
+import { getAddressBook } from 'src/logic/addressBook/store/selectors'
+import { getNameFromAdbk } from 'src/logic/addressBook/utils'
+import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
+import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
+import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
+import styled from 'styled-components'
 
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
@@ -26,9 +40,17 @@ import {
 import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
 import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
-import styled from 'styled-components'
 
+import {
+  generateColumns,
+  getSpendingLimitData,
+  SPENDING_LIMIT_TABLE_BENEFICIARY_ID,
+  SPENDING_LIMIT_TABLE_RESET_TIME_ID,
+  SPENDING_LIMIT_TABLE_SPENT_ID,
+  SpendingLimitTable,
+} from './dataFetcher'
 import { useStyles } from './style'
+import SpendingLimitSteps from './SpendingLimitSteps'
 
 const InfoText = styled(Text)`
   margin-top: 16px;
@@ -69,6 +91,16 @@ export const FooterWrapper = styled.div`
   justify-content: space-around;
 `
 
+export interface SpendingLimit {
+  delegate: string
+  token: string
+  amount: string
+  spent: string
+  resetTimeMin: string
+  lastResetMin: string
+  nonce: string
+}
+
 const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boolean }): React.ReactElement => {
   const classes = useStyles()
 
@@ -80,7 +112,7 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
   const [values, setValues] = React.useState()
   const tokens = useSelector(extendedSafeTokensSelector)
   const [txToken, setTxToken] = React.useState(null)
-  const [existentSpendingLimit, setExistentSpendingLimit] = React.useState()
+  const [existentSpendingLimit, setExistentSpendingLimit] = React.useState<SpendingLimit>()
 
   const handleReview = async (values) => {
     const selectedToken = tokens.find((token) => token.address === values.token)
@@ -200,21 +232,61 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
   )
 }
 
+const StyledImage = styled.img`
+  width: 32px;
+  height: 32px;
+  object-fit: contain;
+  margin: 0 8px 0 0;
+`
+
+const StyledImageName = styled.div`
+  display: flex;
+  align-items: center;
+`
+
+const TableActionButton = styled(Button)`
+  background-color: transparent;
+  padding: 0;
+
+  &:hover {
+    background-color: transparent;
+  }
+`
+
 const SpendingLimit = (): React.ReactElement => {
   const classes = useStyles()
   const granted = useSelector(grantedSelector)
+  const tokens = useSelector(extendedSafeTokensSelector)
+  const addressBook = useSelector(getAddressBook)
   const [showNewSpendingLimitModal, setShowNewSpendingLimitModal] = React.useState(false)
 
   // TODO: Refactor `delegates` for better performance. This is just to verify allowance works
   const safeAddress = useSelector(safeParamAddressFromStateSelector)
-  const [delegates, setDelegates] = React.useState({ results: [], next: '' })
+  const [spendingLimits, setSpendingLimits] = React.useState<SpendingLimit[]>()
+  const [spendingLimitData, setSpendingLimitData] = React.useState<SpendingLimitTable[] | undefined>()
   React.useEffect(() => {
     const doRequestData = async () => {
       const [, delegates] = await requestModuleData(safeAddress)
-      setDelegates(delegates)
+      const tokensByDelegate = await requestTokensByDelegate(safeAddress, delegates.results)
+      const allowances = await requestAllowancesByDelegatesAndTokens(safeAddress, tokensByDelegate)
+      setSpendingLimits(allowances)
+      setSpendingLimitData(getSpendingLimitData(allowances))
     }
     doRequestData()
-  }, [safeAddress])
+  }, [safeAddress, tokens])
+
+  const [cut, setCut] = React.useState(undefined)
+  const { width } = useWindowDimensions()
+  React.useEffect(() => {
+    if (width <= 1024) {
+      setCut(4)
+    } else {
+      setCut(8)
+    }
+  }, [width])
+
+  const columns = generateColumns()
+  const autoColumns = columns.filter(({ custom }) => !custom)
 
   const openNewSpendingLimitModal = () => {
     setShowNewSpendingLimitModal(true)
@@ -224,6 +296,19 @@ const SpendingLimit = (): React.ReactElement => {
     setShowNewSpendingLimitModal(false)
   }
 
+  const humanReadableSpent = (spent: string, amount: string, tokenAddress: string): React.ReactElement => {
+    const token = tokens.find((token) => token.address === tokenAddress)
+    const formattedSpent = formatAmount(fromTokenUnit(spent, token.decimals)).toString()
+    const formattedAmount = formatAmount(fromTokenUnit(amount, token.decimals)).toString()
+
+    return (
+      <StyledImageName>
+        {width > 1024 && <StyledImage alt={token.name} onError={setImageToPlaceholder} src={token.logoUri} />}
+        <Text size="lg">{`${formattedSpent} of ${formattedAmount} ${token.symbol}`}</Text>
+      </StyledImageName>
+    )
+  }
+
   return (
     <>
       <Block className={classes.container}>
@@ -234,8 +319,73 @@ const SpendingLimit = (): React.ReactElement => {
           You can set rules for specific beneficiaries to access funds from this Safe without having to collect all
           signatures.
         </InfoText>
-        {delegates?.results?.length ? (
-          delegates.results.map((delegate) => <div key={delegate}>{delegate}</div>)
+        {spendingLimits?.length && spendingLimitData?.length ? (
+          <TableContainer style={{ minHeight: '400px' }}>
+            <Table
+              columns={columns}
+              data={spendingLimitData}
+              defaultFixed
+              defaultOrderBy={SPENDING_LIMIT_TABLE_BENEFICIARY_ID}
+              defaultRowsPerPage={5}
+              label="Spending Limits"
+              noBorder
+              size={spendingLimitData.length}
+            >
+              {(sortedData) =>
+                sortedData.map((row, index) => (
+                  <TableRow
+                    className={cn(classes.hide, index >= 3 && index === sortedData.size - 1 && classes.noBorderBottom)}
+                    data-testid="spending-limit-table-row"
+                    key={index}
+                    tabIndex={-1}
+                  >
+                    {autoColumns.map((column, index) => {
+                      const columnId = column.id
+                      const rowElement = row[columnId]
+
+                      return (
+                        <TableCell align={column.align} component="td" key={`${columnId}-${index}`}>
+                          {columnId === SPENDING_LIMIT_TABLE_BENEFICIARY_ID && (
+                            <EthHashInfo
+                              hash={rowElement}
+                              name={addressBook ? getNameFromAdbk(addressBook, rowElement) : ''}
+                              showCopyBtn
+                              showEtherscanBtn
+                              showIdenticon
+                              textSize="lg"
+                              shortenHash={cut}
+                              network={getNetwork()}
+                            />
+                          )}
+
+                          {columnId === SPENDING_LIMIT_TABLE_SPENT_ID &&
+                            humanReadableSpent(rowElement.spent, rowElement.amount, rowElement.tokenAddress)}
+
+                          {columnId === SPENDING_LIMIT_TABLE_RESET_TIME_ID && <Text size="lg">{rowElement}</Text>}
+                        </TableCell>
+                      )
+                    })}
+                    <TableCell component="td">
+                      <Row align="end" className={classes.actions}>
+                        {granted && (
+                          <TableActionButton
+                            size="md"
+                            iconType="delete"
+                            color="error"
+                            variant="outlined"
+                            onClick={() => console.log({ row })}
+                            data-testid="remove-action"
+                          >
+                            {null}
+                          </TableActionButton>
+                        )}
+                      </Row>
+                    </TableCell>
+                  </TableRow>
+                ))
+              }
+            </Table>
+          </TableContainer>
         ) : (
           <SpendingLimitSteps />
         )}
diff --git a/src/routes/safe/components/Settings/SpendingLimit/style.ts b/src/routes/safe/components/Settings/SpendingLimit/style.ts
index c098eb109f..35b2f9c20c 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/style.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/style.ts
@@ -30,7 +30,6 @@ export const useStyles = makeStyles(
     actions: {
       justifyContent: 'flex-end',
       visibility: 'hidden',
-      minWidth: '100px',
     },
     noBorderBottom: {
       '& > td': {

From 8df6201a57a03a96c5ed2f19a3fa3c778d253a05 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 17:53:36 -0300
Subject: [PATCH 34/69] cleanup imports

---
 .../Settings/SpendingLimit/Amount.tsx         |  3 +-
 .../SpendingLimit/BeneficiarySelect.tsx       |  3 +-
 .../SpendingLimit/NewSpendingLimit.tsx        | 19 ++++-----
 .../Settings/SpendingLimit/ResetTime.tsx      |  3 +-
 .../SpendingLimit/ReviewSpendingLimit.tsx     | 19 ++++-----
 .../SpendingLimit/SpendingLimitSteps.tsx      |  6 +--
 .../Settings/SpendingLimit/dataFetcher.ts     |  6 ++-
 .../Settings/SpendingLimit/index.tsx          | 39 +++++++------------
 .../Settings/SpendingLimit/utils.ts           | 13 ++++++-
 9 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx b/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx
index 9927cab2eb..aeb1a407ff 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx
@@ -2,11 +2,12 @@ import { TextField as SRCTextField } from '@gnosis.pm/safe-react-components'
 import React from 'react'
 import { useField } from 'react-final-form'
 import { useSelector } from 'react-redux'
+import styled from 'styled-components'
 
 import GnoField from 'src/components/forms/Field'
 import { composeValidators, minValue, mustBeFloat, required } from 'src/components/forms/validator'
 import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
-import styled from 'styled-components'
+
 import { useStyles } from './style'
 
 export const Field = styled(GnoField)`
diff --git a/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx b/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
index b814f366bd..a1346e0f5f 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
@@ -9,7 +9,8 @@ import { getNetwork } from 'src/config'
 import { getAddressBook } from 'src/logic/addressBook/store/selectors'
 import { getNameFromAdbk } from 'src/logic/addressBook/utils'
 import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/screens/AddressBookInput'
-import { KEYCODES } from 'src/routes/safe/components/Settings/SpendingLimit/utils'
+
+import { KEYCODES } from './utils'
 
 const BeneficiaryInput = styled.div`
   grid-area: beneficiaryInput;
diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx
index 71ed700fde..b5276a05a3 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx
@@ -1,19 +1,16 @@
 import { Button, Icon, Text, Title } from '@gnosis.pm/safe-react-components'
 import { Mutator } from 'final-form'
 import React from 'react'
+import styled from 'styled-components'
+
 import GnoForm from 'src/components/forms/GnoForm'
 import GnoButton from 'src/components/layout/Button'
-import { Amount } from 'src/routes/safe/components/Settings/SpendingLimit/Amount'
-import BeneficiarySelect from 'src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect'
-import {
-  TitleSection,
-  StyledButton,
-  FooterSection,
-  FooterWrapper,
-} from 'src/routes/safe/components/Settings/SpendingLimit/index'
-import ResetTime from 'src/routes/safe/components/Settings/SpendingLimit/ResetTime'
-import TokenSelect from 'src/routes/safe/components/Settings/SpendingLimit/TokenSelect'
-import styled from 'styled-components'
+
+import { Amount } from './Amount'
+import BeneficiarySelect from './BeneficiarySelect'
+import { TitleSection, StyledButton, FooterSection, FooterWrapper } from '.'
+import ResetTime from './ResetTime'
+import TokenSelect from './TokenSelect'
 
 const FormContainer = styled.div`
   padding: 24px;
diff --git a/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx b/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx
index 208ee54c32..d436044a8a 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx
@@ -2,9 +2,10 @@ import { RadioButtons, Text } from '@gnosis.pm/safe-react-components'
 import { FormControlLabel, hexToRgb, Switch as SwitchMui } from '@material-ui/core'
 import React from 'react'
 import { useField } from 'react-final-form'
-import { Field } from 'src/routes/safe/components/Settings/SpendingLimit/Amount'
 import styled from 'styled-components'
 
+import { Field } from './Amount'
+
 // TODO: propose refactor in safe-react-components based on this requirements
 const SpendingLimitRadioButtons = styled(RadioButtons)`
   & .MuiRadio-colorPrimary.Mui-checked {
diff --git a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx b/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
index cfd49b619e..9fe9cbfca4 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
@@ -2,6 +2,8 @@ import { Button, EthHashInfo, Icon, IconText, Text, Title } from '@gnosis.pm/saf
 import { Skeleton } from '@material-ui/lab'
 import React from 'react'
 import { useSelector } from 'react-redux'
+import styled from 'styled-components'
+
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
 import Row from 'src/components/layout/Row'
@@ -10,16 +12,11 @@ import { getAddressBook } from 'src/logic/addressBook/store/selectors'
 import { getNameFromAdbk } from 'src/logic/addressBook/utils'
 import { Token } from 'src/logic/tokens/store/model/token'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
-import {
-  FooterSection,
-  FooterWrapper,
-  StyledButton,
-  TitleSection,
-  SpendingLimit,
-} from 'src/routes/safe/components/Settings/SpendingLimit'
-import { RESET_TIME_OPTIONS } from 'src/routes/safe/components/Settings/SpendingLimit/ResetTime'
-import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
-import styled from 'styled-components'
+
+import { FooterSection, FooterWrapper, StyledButton, TitleSection } from '.'
+import { RESET_TIME_OPTIONS } from './ResetTime'
+import { useStyles } from './style'
+import { SpendingLimitRow } from './utils'
 
 const StyledImage = styled.img`
   width: 32px;
@@ -39,7 +36,7 @@ interface ReviewSpendingLimitProps {
   onSubmit: () => void
   txToken: Token | null
   values: Record<string, string>
-  existentSpendingLimit?: SpendingLimit
+  existentSpendingLimit?: SpendingLimitRow
 }
 
 const ReviewSpendingLimit = ({
diff --git a/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps.tsx b/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps.tsx
index 45382385d1..e1372d43c8 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps.tsx
@@ -3,9 +3,9 @@ import React from 'react'
 import styled from 'styled-components'
 
 import Img from 'src/components/layout/Img'
-import AssetAmount from 'src/routes/safe/components/Settings/SpendingLimit/assets/asset-amount.svg'
-import Beneficiary from 'src/routes/safe/components/Settings/SpendingLimit/assets/beneficiary.svg'
-import Time from 'src/routes/safe/components/Settings/SpendingLimit/assets/time.svg'
+import AssetAmount from './assets/asset-amount.svg'
+import Beneficiary from './assets/beneficiary.svg'
+import Time from './assets/time.svg'
 
 const StepWrapper = styled.div`
   display: flex;
diff --git a/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts b/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
index c1a0a36fdb..df32a80df2 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
@@ -1,7 +1,9 @@
 import { formatRelative } from 'date-fns'
 import { List } from 'immutable'
+
 import { TableColumn } from 'src/components/Table/types.d'
-import { SpendingLimit } from '.'
+
+import { SpendingLimitRow } from './utils'
 
 export const SPENDING_LIMIT_TABLE_BENEFICIARY_ID = 'beneficiary'
 export const SPENDING_LIMIT_TABLE_SPENT_ID = 'spent'
@@ -21,7 +23,7 @@ const relativeTime = (baseTimeMin: string, resetTimeMin: string): string => {
   return formatRelative(nextResetTimeMilliseconds, Date.now())
 }
 
-export const getSpendingLimitData = (spendingLimits: SpendingLimit[] | null): SpendingLimitTable[] | undefined => {
+export const getSpendingLimitData = (spendingLimits: SpendingLimitRow[] | null): SpendingLimitTable[] | undefined => {
   return spendingLimits?.map((spendingLimit) => ({
     [SPENDING_LIMIT_TABLE_BENEFICIARY_ID]: spendingLimit.delegate,
     [SPENDING_LIMIT_TABLE_SPENT_ID]: {
diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index cac847c814..bb00cb812c 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -1,12 +1,11 @@
-import { Button, Text, Title } from '@gnosis.pm/safe-react-components'
-import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
 import { Button, EthHashInfo, Text, Title } from '@gnosis.pm/safe-react-components'
 import TableContainer from '@material-ui/core/TableContainer'
-import { BigNumber } from 'bignumber.js'
 import cn from 'classnames'
 import { useSnackbar } from 'notistack'
 import React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
+import styled from 'styled-components'
+
 import { TableCell, TableRow } from 'src/components/layout/Table'
 import Table from 'src/components/Table'
 import { getNetwork } from 'src/config'
@@ -15,7 +14,6 @@ import { getNameFromAdbk } from 'src/logic/addressBook/utils'
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
-import styled from 'styled-components'
 
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
@@ -24,11 +22,14 @@ import GnoModal from 'src/components/Modal'
 import { getGnosisSafeInstanceAt } from 'src/logic/contracts/safeContracts'
 import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
 import { getWeb3 } from 'src/logic/wallets/getWeb3'
-
 import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
-import NewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit'
-import ReviewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit'
-import SpendingLimitSteps from 'src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps'
+import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
+import SpendingLimitModule from 'src/utils/AllowanceModule.json'
+import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
+
+import NewSpendingLimit from './NewSpendingLimit'
+import ReviewSpendingLimit from './ReviewSpendingLimit'
+import SpendingLimitSteps from './SpendingLimitSteps'
 import {
   currentMinutes,
   fromTokenUnit,
@@ -36,11 +37,8 @@ import {
   requestModuleData,
   requestTokensByDelegate,
   toTokenUnit,
-} from 'src/routes/safe/components/Settings/SpendingLimit/utils'
-import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
-import SpendingLimitModule from 'src/utils/AllowanceModule.json'
-import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
-
+  SpendingLimitRow,
+} from './utils'
 import {
   generateColumns,
   getSpendingLimitData,
@@ -50,7 +48,6 @@ import {
   SpendingLimitTable,
 } from './dataFetcher'
 import { useStyles } from './style'
-import SpendingLimitSteps from './SpendingLimitSteps'
 
 const InfoText = styled(Text)`
   margin-top: 16px;
@@ -91,16 +88,6 @@ export const FooterWrapper = styled.div`
   justify-content: space-around;
 `
 
-export interface SpendingLimit {
-  delegate: string
-  token: string
-  amount: string
-  spent: string
-  resetTimeMin: string
-  lastResetMin: string
-  nonce: string
-}
-
 const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boolean }): React.ReactElement => {
   const classes = useStyles()
 
@@ -112,7 +99,7 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
   const [values, setValues] = React.useState()
   const tokens = useSelector(extendedSafeTokensSelector)
   const [txToken, setTxToken] = React.useState(null)
-  const [existentSpendingLimit, setExistentSpendingLimit] = React.useState<SpendingLimit>()
+  const [existentSpendingLimit, setExistentSpendingLimit] = React.useState<SpendingLimitRow>()
 
   const handleReview = async (values) => {
     const selectedToken = tokens.find((token) => token.address === values.token)
@@ -262,7 +249,7 @@ const SpendingLimit = (): React.ReactElement => {
 
   // TODO: Refactor `delegates` for better performance. This is just to verify allowance works
   const safeAddress = useSelector(safeParamAddressFromStateSelector)
-  const [spendingLimits, setSpendingLimits] = React.useState<SpendingLimit[]>()
+  const [spendingLimits, setSpendingLimits] = React.useState<SpendingLimitRow[]>()
   const [spendingLimitData, setSpendingLimitData] = React.useState<SpendingLimitTable[] | undefined>()
   React.useEffect(() => {
     const doRequestData = async () => {
diff --git a/src/routes/safe/components/Settings/SpendingLimit/utils.ts b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
index b5990dc9a4..4a0111d531 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/utils.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
@@ -1,5 +1,6 @@
 import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
 import { BigNumber } from 'bignumber.js'
+
 import generateBatchRequests from 'src/logic/contracts/generateBatchRequests'
 import { SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
 import { web3ReadOnly } from 'src/logic/wallets/getWeb3'
@@ -62,10 +63,20 @@ export const requestTokensByDelegate = async (safeAddress: string, delegates: st
   return Promise.all(whenRequestValues)
 }
 
+export type SpendingLimitRow = {
+  delegate: string
+  token: string
+  amount: string
+  spent: string
+  resetTimeMin: string
+  lastResetMin: string
+  nonce: string
+}
+
 export const requestAllowancesByDelegatesAndTokens = async (
   safeAddress: string,
   tokensByDelegate: [string, string[]][],
-): Promise<any[]> => {
+): Promise<SpendingLimitRow[]> => {
   const batch = new web3ReadOnly.BatchRequest()
 
   let whenRequestValues = []

From 68d81819fec9321d534fe9751063698d6c5e3f5e Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 20:55:15 -0300
Subject: [PATCH 35/69] fix delegates retrieval

- used for..of for better readability
---
 .../Settings/SpendingLimit/utils.ts           | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/utils.ts b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
index b5990dc9a4..aaea6ec1b3 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/utils.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
@@ -68,18 +68,20 @@ export const requestAllowancesByDelegatesAndTokens = async (
 ): Promise<any[]> => {
   const batch = new web3ReadOnly.BatchRequest()
 
-  let whenRequestValues = []
+  const whenRequestValues = []
 
   for (const [delegate, tokens] of tokensByDelegate) {
-    whenRequestValues = tokens.map((token) =>
-      generateBatchRequests({
-        abi: SpendingLimitModule.abi,
-        address: SPENDING_LIMIT_MODULE_ADDRESS,
-        methods: [{ method: 'getTokenAllowance', args: [safeAddress, delegate, token] }],
-        batch,
-        context: { delegate, token },
-      }),
-    )
+    for (const token of tokens) {
+      whenRequestValues.push(
+        generateBatchRequests({
+          abi: SpendingLimitModule.abi,
+          address: SPENDING_LIMIT_MODULE_ADDRESS,
+          methods: [{ method: 'getTokenAllowance', args: [safeAddress, delegate, token] }],
+          batch,
+          context: { delegate, token },
+        }),
+      )
+    }
   }
 
   batch.execute()

From d90b029cc7cbb490fb910dbb52f9081692330804 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 21:00:02 -0300
Subject: [PATCH 36/69] fix logic for one-time allowance

---
 src/routes/safe/components/Settings/SpendingLimit/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index d0b3144f91..039b97d544 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -161,7 +161,7 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
           values.token,
           toTokenUnit(values.amount, txToken.decimals),
           values.withResetTime ? +values.resetTime * 60 * 24 : 0,
-          startTime,
+          values.withResetTime ? startTime : 0,
         )
         .encodeABI(),
     })

From 6661611658bdb3f4ce51dd6a32051d5c5cb47c26 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 19 Aug 2020 21:08:20 -0300
Subject: [PATCH 37/69] set message for one-time 'resetTime'

---
 .../safe/components/Settings/SpendingLimit/dataFetcher.ts    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts b/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
index df32a80df2..25626a5f43 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
@@ -17,9 +17,14 @@ export type SpendingLimitTable = {
 }
 
 const relativeTime = (baseTimeMin: string, resetTimeMin: string): string => {
+  if (resetTimeMin === '0') {
+    return 'One-time'
+  }
+
   const baseTimeSeconds = +baseTimeMin * 60
   const resetTimeSeconds = +resetTimeMin * 60
   const nextResetTimeMilliseconds = (baseTimeSeconds + resetTimeSeconds) * 1000
+
   return formatRelative(nextResetTimeMilliseconds, Date.now())
 }
 

From 72ab5f9d2b1e8b3a5d5ea453e8d178c3aa65512d Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 20 Aug 2020 10:31:02 -0300
Subject: [PATCH 38/69] support ETH Spending Limit

---
 src/routes/safe/components/Settings/SpendingLimit/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 039b97d544..f5e9b5c961 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -9,6 +9,8 @@ import Row from 'src/components/layout/Row'
 import GnoModal from 'src/components/Modal'
 import { getGnosisSafeInstanceAt } from 'src/logic/contracts/safeContracts'
 import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
+import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
+import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
 import { getWeb3 } from 'src/logic/wallets/getWeb3'
 
 import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
@@ -158,7 +160,7 @@ const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boole
       data: spendingLimit.methods
         .setAllowance(
           values.beneficiary,
-          values.token,
+          values.token === ETH_ADDRESS ? ZERO_ADDRESS : values.token,
           toTokenUnit(values.amount, txToken.decimals),
           values.withResetTime ? +values.resetTime * 60 * 24 : 0,
           values.withResetTime ? startTime : 0,

From c49f5f85764e9ff5f0adf39537fb3793eb716c2c Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 20 Aug 2020 11:00:51 -0300
Subject: [PATCH 39/69] display ETH allowance

---
 src/routes/safe/components/Settings/SpendingLimit/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 7d0a66c03c..f7e222f848 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -286,7 +286,8 @@ const SpendingLimit = (): React.ReactElement => {
   }
 
   const humanReadableSpent = (spent: string, amount: string, tokenAddress: string): React.ReactElement => {
-    const token = tokens.find((token) => token.address === tokenAddress)
+    const safeTokenAddress = tokenAddress === ZERO_ADDRESS ? ETH_ADDRESS : tokenAddress
+    const token = tokens.find((token) => token.address === safeTokenAddress)
     const formattedSpent = formatAmount(fromTokenUnit(spent, token.decimals)).toString()
     const formattedAmount = formatAmount(fromTokenUnit(amount, token.decimals)).toString()
 
@@ -309,7 +310,7 @@ const SpendingLimit = (): React.ReactElement => {
           signatures.
         </InfoText>
         {spendingLimits?.length && spendingLimitData?.length ? (
-          <TableContainer style={{ minHeight: '400px' }}>
+          <TableContainer style={{ minHeight: '420px' }}>
             <Table
               columns={columns}
               data={spendingLimitData}

From 20fd94aa1aa95db68ee4c16491de884650294480 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 20 Aug 2020 12:12:50 -0300
Subject: [PATCH 40/69] add back SPENDING_LIMIT_MODULE_ADDRESS default value in
 `constants` file

this is due to the lack of global variable in the build
---
 src/utils/constants.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index e640cfb597..cb84da136b 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -14,4 +14,5 @@ export const OPENSEA_API_KEY = process.env.REACT_APP_OPENSEA_API_KEY || ''
 export const COLLECTIBLES_SOURCE = process.env.REACT_APP_COLLECTIBLES_SOURCE || 'OpenSea'
 export const TIMEOUT = process.env.NODE_ENV === 'test' ? 1500 : 5000
 export const ETHERSCAN_API_KEY = process.env.REACT_APP_ETHERSCAN_API_KEY
-export const SPENDING_LIMIT_MODULE_ADDRESS = process.env.REACT_APP_SPENDING_LIMIT_MODULE_ADDRESS
+export const SPENDING_LIMIT_MODULE_ADDRESS =
+  process.env.REACT_APP_SPENDING_LIMIT_MODULE_ADDRESS || '0x9e9Bf12b5a66c0f0A7435835e0365477E121B110'

From 74761a524ffe5e459bfad8121801e847ad2129f6 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 20 Aug 2020 16:00:44 -0300
Subject: [PATCH 41/69] WIP add "delete" spending limit functionality

---
 .../RemoveSpendingLimitModal.tsx              | 247 ++++++++++++++++++
 .../Settings/SpendingLimit/dataFetcher.ts     |  27 +-
 .../Settings/SpendingLimit/index.tsx          |  80 ++++--
 .../Settings/SpendingLimit/utils.ts           |  30 ++-
 4 files changed, 350 insertions(+), 34 deletions(-)
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/RemoveSpendingLimitModal.tsx

diff --git a/src/routes/safe/components/Settings/SpendingLimit/RemoveSpendingLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/RemoveSpendingLimitModal.tsx
new file mode 100644
index 0000000000..cd5a0c44f7
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/RemoveSpendingLimitModal.tsx
@@ -0,0 +1,247 @@
+import { Button, EthHashInfo, Icon, IconText, Text, Title } from '@gnosis.pm/safe-react-components'
+import { Skeleton } from '@material-ui/lab'
+import { useSnackbar } from 'notistack'
+import React from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import { fromTokenUnit } from 'src/routes/safe/components/Settings/SpendingLimit/utils'
+import styled from 'styled-components'
+
+import Block from 'src/components/layout/Block'
+import Col from 'src/components/layout/Col'
+import Row from 'src/components/layout/Row'
+import Modal from 'src/components/Modal'
+import { getNetwork } from 'src/config'
+import { getAddressBook } from 'src/logic/addressBook/store/selectors'
+import { getNameFromAdbk } from 'src/logic/addressBook/utils'
+import createTransaction from 'src/logic/safe/store/actions/createTransaction'
+import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
+import { TX_NOTIFICATION_TYPES } from 'src/logic/safe/transactions'
+import { Token } from 'src/logic/tokens/store/model/token'
+import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
+import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
+import { getWeb3 } from 'src/logic/wallets/getWeb3'
+import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
+import {
+  FooterSection,
+  FooterWrapper,
+  StyledButton,
+  TitleSection,
+} from 'src/routes/safe/components/Settings/SpendingLimit'
+import { RESET_TIME_OPTIONS } from 'src/routes/safe/components/Settings/SpendingLimit/ResetTime'
+import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
+import SpendingLimitModule from 'src/utils/AllowanceModule.json'
+import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
+import { ResetTimeInfo as ResetTimeInfoType, SpendingLimitTable } from './dataFetcher'
+
+import { useStyles } from './style'
+
+const StyledImage = styled.img`
+  width: 32px;
+  height: 32px;
+  object-fit: contain;
+  margin: 0 8px 0 0;
+`
+
+const StyledImageName = styled.div`
+  display: flex;
+  align-items: center;
+`
+
+interface GenericInfoProps {
+  title?: string
+  children: React.ReactNode
+}
+
+const GenericInfo = ({ title, children }: GenericInfoProps): React.ReactElement => (
+  <>
+    {title && (
+      <Text size="lg" color="secondaryLight">
+        {title}
+      </Text>
+    )}
+    {children ?? <Skeleton animation="wave" variant="rect" />}
+  </>
+)
+
+interface AddressInfoProps {
+  title?: string
+  address: string
+}
+
+const AddressInfo = ({ title, address }: AddressInfoProps): React.ReactElement => {
+  const addressBook = useSelector(getAddressBook)
+
+  return (
+    <GenericInfo title={title}>
+      {addressBook && (
+        <EthHashInfo
+          hash={address}
+          name={addressBook ? getNameFromAdbk(addressBook, address) : ''}
+          showCopyBtn
+          showEtherscanBtn
+          showIdenticon
+          textSize="lg"
+          network={getNetwork()}
+        />
+      )}
+    </GenericInfo>
+  )
+}
+
+interface TokenInfoProps {
+  title?: string
+  amount: string
+  address: string
+}
+
+const TokenInfo = ({ title, amount, address }: TokenInfoProps): React.ReactElement => {
+  const tokens = useSelector(extendedSafeTokensSelector)
+  const [token, setToken] = React.useState<Token | null>()
+
+  React.useEffect(() => {
+    if (tokens) {
+      const tokenAddress = address === ZERO_ADDRESS ? ETH_ADDRESS : address
+      const foundToken = tokens.find((token) => token.address === tokenAddress)
+      setToken(foundToken ?? null)
+    }
+  }, [address, tokens])
+
+  return (
+    <GenericInfo title={title}>
+      {token && (
+        <StyledImageName>
+          <StyledImage alt={token.name} onError={setImageToPlaceholder} src={token.logoUri} />
+          <Text size="lg">
+            {fromTokenUnit(amount, token.decimals)} {token.symbol}
+          </Text>
+        </StyledImageName>
+      )}
+      {token === null && <Text size="lg">No token info</Text>}
+    </GenericInfo>
+  )
+}
+
+interface ResetTimeInfoProps {
+  title?: string
+  resetTime: ResetTimeInfoType
+}
+
+const ResetTimeInfo = ({ title, resetTime }: ResetTimeInfoProps): React.ReactElement => {
+  return (
+    <GenericInfo title={title}>
+      {resetTime.resetTimeMin !== '0' ? (
+        <Row align="center" margin="md">
+          <IconText
+            iconSize="md"
+            iconType="fuelIndicator"
+            text={RESET_TIME_OPTIONS.find(({ value }) => +value === +resetTime.resetTimeMin / 24 / 60).label}
+            textSize="lg"
+          />
+        </Row>
+      ) : (
+        <Row align="center" margin="md">
+          <Text size="lg">One-time spending limit allowance</Text>
+        </Row>
+      )}
+    </GenericInfo>
+  )
+}
+
+interface RemoveSpendingLimitModalProps {
+  onClose: () => void
+  spendingLimit: SpendingLimitTable
+  open: boolean
+}
+
+const RemoveSpendingLimitModal = ({
+  onClose,
+  spendingLimit,
+  open,
+}: RemoveSpendingLimitModalProps): React.ReactElement => {
+  const classes = useStyles()
+
+  const safeAddress = useSelector(safeParamAddressFromStateSelector)
+
+  const { enqueueSnackbar, closeSnackbar } = useSnackbar()
+  const dispatch = useDispatch()
+
+  const removeSelectedSpendingLimit = async (): Promise<void> => {
+    try {
+      const web3 = getWeb3()
+      const spendingLimitContract = new web3.eth.Contract(SpendingLimitModule.abi as any, SPENDING_LIMIT_MODULE_ADDRESS)
+      const {
+        beneficiary,
+        spent: { tokenAddress },
+      } = spendingLimit
+
+      // TODO: replace with a proper way to remove allowances.
+      //  as we don't have a current way to remove an allowance, we tweak it by setting its `amount` and `resetTimeMin` to 0
+      //  This is directly related to `discardZeroAllowance`
+      const txData = spendingLimitContract.methods
+        .setAllowance(beneficiary, tokenAddress === ETH_ADDRESS ? ZERO_ADDRESS : tokenAddress, 0, 0, 0)
+        .encodeABI()
+
+      dispatch(
+        createTransaction({
+          safeAddress,
+          to: SPENDING_LIMIT_MODULE_ADDRESS,
+          valueInWei: '0',
+          txData,
+          notifiedTransaction: TX_NOTIFICATION_TYPES.SETTINGS_CHANGE_TX,
+          enqueueSnackbar,
+          closeSnackbar,
+        }),
+      )
+    } catch (e) {
+      console.error(
+        `failed to remove spending limit ${spendingLimit.beneficiary} -> ${spendingLimit.spent.tokenAddress}`,
+        e.message,
+      )
+    }
+  }
+
+  return (
+    <Modal
+      description="Remove the selected Spending Limit"
+      handleClose={onClose}
+      paperClassName={classes.modal}
+      title="Remove Spending Limit"
+      open={open}
+    >
+      <TitleSection>
+        <Title size="xs" withoutMargin>
+          Remove Spending Limit
+        </Title>
+
+        <StyledButton onClick={onClose}>
+          <Icon size="sm" type="cross" />
+        </StyledButton>
+      </TitleSection>
+
+      <Block className={classes.container}>
+        <Col margin="lg">
+          <AddressInfo title="Beneficiary" address={spendingLimit.beneficiary} />
+        </Col>
+        <Col margin="lg">
+          <TokenInfo title="Amount" amount={spendingLimit.spent.amount} address={spendingLimit.spent.tokenAddress} />
+        </Col>
+        <Col margin="lg">
+          <ResetTimeInfo title="Reset Time" resetTime={spendingLimit.resetTime} />
+        </Col>
+      </Block>
+
+      <FooterSection>
+        <FooterWrapper>
+          <Button size="md" color="secondary" onClick={onClose}>
+            Cancel
+          </Button>
+          <Button color="error" size="md" variant="contained" onClick={removeSelectedSpendingLimit}>
+            Remove
+          </Button>
+        </FooterWrapper>
+      </FooterSection>
+    </Modal>
+  )
+}
+
+export default RemoveSpendingLimitModal
diff --git a/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts b/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
index 25626a5f43..2564289a09 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
@@ -10,10 +10,22 @@ export const SPENDING_LIMIT_TABLE_SPENT_ID = 'spent'
 export const SPENDING_LIMIT_TABLE_RESET_TIME_ID = 'resetTime'
 export const SPENDING_LIMIT_TABLE_ACTION_ID = 'action'
 
+export type SpentTableInfo = {
+  spent: string
+  amount: string
+  tokenAddress: string
+}
+
+export type ResetTimeInfo = {
+  relativeTime: string
+  lastResetMin: string
+  resetTimeMin: string
+}
+
 export type SpendingLimitTable = {
   [SPENDING_LIMIT_TABLE_BENEFICIARY_ID]: string
-  [SPENDING_LIMIT_TABLE_SPENT_ID]: Record<string, string>
-  [SPENDING_LIMIT_TABLE_RESET_TIME_ID]: string
+  [SPENDING_LIMIT_TABLE_SPENT_ID]: SpentTableInfo
+  [SPENDING_LIMIT_TABLE_RESET_TIME_ID]: ResetTimeInfo
 }
 
 const relativeTime = (baseTimeMin: string, resetTimeMin: string): string => {
@@ -28,17 +40,20 @@ const relativeTime = (baseTimeMin: string, resetTimeMin: string): string => {
   return formatRelative(nextResetTimeMilliseconds, Date.now())
 }
 
-export const getSpendingLimitData = (spendingLimits: SpendingLimitRow[] | null): SpendingLimitTable[] | undefined => {
-  return spendingLimits?.map((spendingLimit) => ({
+export const getSpendingLimitData = (spendingLimits: SpendingLimitRow[] | null): SpendingLimitTable[] | undefined =>
+  spendingLimits?.map((spendingLimit) => ({
     [SPENDING_LIMIT_TABLE_BENEFICIARY_ID]: spendingLimit.delegate,
     [SPENDING_LIMIT_TABLE_SPENT_ID]: {
       spent: spendingLimit.spent,
       amount: spendingLimit.amount,
       tokenAddress: spendingLimit.token,
     },
-    [SPENDING_LIMIT_TABLE_RESET_TIME_ID]: relativeTime(spendingLimit.lastResetMin, spendingLimit.resetTimeMin),
+    [SPENDING_LIMIT_TABLE_RESET_TIME_ID]: {
+      relativeTime: relativeTime(spendingLimit.lastResetMin, spendingLimit.resetTimeMin),
+      lastResetMin: spendingLimit.lastResetMin,
+      resetTimeMin: spendingLimit.resetTimeMin,
+    },
   }))
-}
 
 export const generateColumns = (): List<TableColumn> => {
   const beneficiaryColumn: TableColumn = {
diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index f7e222f848..dff3a6fbaf 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -14,6 +14,7 @@ import { getNameFromAdbk } from 'src/logic/addressBook/utils'
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
+import { Token } from 'src/logic/tokens/store/model/token'
 
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
@@ -31,6 +32,7 @@ import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
 import NewSpendingLimit from './NewSpendingLimit'
 import ReviewSpendingLimit from './ReviewSpendingLimit'
+import RemoveSpendingLimitModal from './RemoveSpendingLimitModal'
 import SpendingLimitSteps from './SpendingLimitSteps'
 import {
   currentMinutes,
@@ -242,12 +244,49 @@ const TableActionButton = styled(Button)`
   }
 `
 
+type SpentInfo = {
+  token: Token
+  spent: string
+  amount: string
+}
+
+interface HumanReadableSpentProps {
+  spent: string
+  amount: string
+  tokenAddress: string
+}
+
+const HumanReadableSpent = ({ spent, amount, tokenAddress }: HumanReadableSpentProps): React.ReactElement => {
+  const tokens = useSelector(extendedSafeTokensSelector)
+  const { width } = useWindowDimensions()
+  const [spentInfo, setSpentInfo] = React.useState<SpentInfo>()
+
+  React.useEffect(() => {
+    if (tokens) {
+      const safeTokenAddress = tokenAddress === ZERO_ADDRESS ? ETH_ADDRESS : tokenAddress
+      const token = tokens.find((token) => token.address === safeTokenAddress)
+      const formattedSpent = formatAmount(fromTokenUnit(spent, token.decimals)).toString()
+      const formattedAmount = formatAmount(fromTokenUnit(amount, token.decimals)).toString()
+
+      setSpentInfo({ token, spent: formattedSpent, amount: formattedAmount })
+    }
+  }, [amount, spent, tokenAddress, tokens])
+
+  return spentInfo ? (
+    <StyledImageName>
+      {width > 1024 && (
+        <StyledImage alt={spentInfo.token.name} onError={setImageToPlaceholder} src={spentInfo.token.logoUri} />
+      )}
+      <Text size="lg">{`${spentInfo.spent} of ${spentInfo.amount} ${spentInfo.token.symbol}`}</Text>
+    </StyledImageName>
+  ) : null
+}
+
 const SpendingLimit = (): React.ReactElement => {
   const classes = useStyles()
   const granted = useSelector(grantedSelector)
   const tokens = useSelector(extendedSafeTokensSelector)
   const addressBook = useSelector(getAddressBook)
-  const [showNewSpendingLimitModal, setShowNewSpendingLimitModal] = React.useState(false)
 
   // TODO: Refactor `delegates` for better performance. This is just to verify allowance works
   const safeAddress = useSelector(safeParamAddressFromStateSelector)
@@ -277,26 +316,26 @@ const SpendingLimit = (): React.ReactElement => {
   const columns = generateColumns()
   const autoColumns = columns.filter(({ custom }) => !custom)
 
+  const [showNewSpendingLimitModal, setShowNewSpendingLimitModal] = React.useState(false)
   const openNewSpendingLimitModal = () => {
     setShowNewSpendingLimitModal(true)
   }
-
   const closeNewSpendingLimitModal = () => {
     setShowNewSpendingLimitModal(false)
   }
 
-  const humanReadableSpent = (spent: string, amount: string, tokenAddress: string): React.ReactElement => {
-    const safeTokenAddress = tokenAddress === ZERO_ADDRESS ? ETH_ADDRESS : tokenAddress
-    const token = tokens.find((token) => token.address === safeTokenAddress)
-    const formattedSpent = formatAmount(fromTokenUnit(spent, token.decimals)).toString()
-    const formattedAmount = formatAmount(fromTokenUnit(amount, token.decimals)).toString()
-
-    return (
-      <StyledImageName>
-        {width > 1024 && <StyledImage alt={token.name} onError={setImageToPlaceholder} src={token.logoUri} />}
-        <Text size="lg">{`${formattedSpent} of ${formattedAmount} ${token.symbol}`}</Text>
-      </StyledImageName>
-    )
+  const [showRemoveSpendingLimitModal, setShowRemoveSpendingLimitModal] = React.useState(false)
+  const [selectedRow, setSelectedRow] = React.useState<SpendingLimitTable>(null)
+  const openRemoveSpendingLimitModal = (row: SpendingLimitTable) => {
+    setSelectedRow(row)
+    setShowRemoveSpendingLimitModal(true)
+  }
+  const closeRemoveSpendingLimitModal = () => {
+    setShowRemoveSpendingLimitModal(false)
+    setSelectedRow(null)
+  }
+  const handleDeleteSpendingLimit = (row: SpendingLimitTable): void => {
+    openRemoveSpendingLimitModal(row)
   }
 
   return (
@@ -348,10 +387,10 @@ const SpendingLimit = (): React.ReactElement => {
                             />
                           )}
 
-                          {columnId === SPENDING_LIMIT_TABLE_SPENT_ID &&
-                            humanReadableSpent(rowElement.spent, rowElement.amount, rowElement.tokenAddress)}
-
-                          {columnId === SPENDING_LIMIT_TABLE_RESET_TIME_ID && <Text size="lg">{rowElement}</Text>}
+                          {columnId === SPENDING_LIMIT_TABLE_SPENT_ID && <HumanReadableSpent {...rowElement} />}
+                          {columnId === SPENDING_LIMIT_TABLE_RESET_TIME_ID && (
+                            <Text size="lg">{rowElement.relativeTime}</Text>
+                          )}
                         </TableCell>
                       )
                     })}
@@ -363,7 +402,7 @@ const SpendingLimit = (): React.ReactElement => {
                             iconType="delete"
                             color="error"
                             variant="outlined"
-                            onClick={() => console.log({ row })}
+                            onClick={() => handleDeleteSpendingLimit(row)}
                             data-testid="remove-action"
                           >
                             {null}
@@ -396,6 +435,9 @@ const SpendingLimit = (): React.ReactElement => {
         </Col>
       </Row>
       {showNewSpendingLimitModal && <NewSpendingLimitModal close={closeNewSpendingLimitModal} open={true} />}
+      {showRemoveSpendingLimitModal && (
+        <RemoveSpendingLimitModal onClose={closeRemoveSpendingLimitModal} spendingLimit={selectedRow} open={true} />
+      )}
     </>
   )
 }
diff --git a/src/routes/safe/components/Settings/SpendingLimit/utils.ts b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
index 02673ca48f..811a49b437 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/utils.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
@@ -73,6 +73,16 @@ export type SpendingLimitRow = {
   nonce: string
 }
 
+/**
+ * TODO: This is helpfully a temp function that attempts to filter out "deleted" allowances
+ * As there's no way to remove an Allowance with the current code, it's "deleted" by setting its `amount` to 0
+ * along with `resetTimeMin` to 0 as well
+ * @param {SpendingLimitRow} allowance
+ * @returns boolean
+ */
+const discardZeroAllowance = ({ amount, resetTimeMin }: SpendingLimitRow): boolean =>
+  !(amount === '0' && resetTimeMin === '0')
+
 export const requestAllowancesByDelegatesAndTokens = async (
   safeAddress: string,
   tokensByDelegate: [string, string[]][],
@@ -98,14 +108,16 @@ export const requestAllowancesByDelegatesAndTokens = async (
   batch.execute()
 
   return Promise.all(whenRequestValues).then((allowances) =>
-    allowances.map(([{ delegate, token }, [amount, spent, resetTimeMin, lastResetMin, nonce]]) => ({
-      delegate,
-      token,
-      amount,
-      spent,
-      resetTimeMin,
-      lastResetMin,
-      nonce,
-    })),
+    allowances
+      .map(([{ delegate, token }, [amount, spent, resetTimeMin, lastResetMin, nonce]]) => ({
+        delegate,
+        token,
+        amount,
+        spent,
+        resetTimeMin,
+        lastResetMin,
+        nonce,
+      }))
+      .filter(discardZeroAllowance),
   )
 }

From 8be577d167790069382fbf65c488878665676ff2 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 20 Aug 2020 22:16:48 -0300
Subject: [PATCH 42/69] refactor: store SpendingLimit in the store

- also, refactored components for better readability
---
 src/logic/contracts/safeContracts.ts          |   8 +
 src/logic/safe/store/actions/fetchSafe.ts     |  41 ++-
 src/logic/safe/store/models/safe.ts           |  12 +
 src/logic/safe/store/selectors/index.ts       |   2 +
 .../SpendingLimit/ReviewSpendingLimit.tsx     | 262 +++++++++++++-----
 .../SpendingLimit/SpendingLimitModal.tsx      |  86 ++++++
 .../Settings/SpendingLimit/index.tsx          | 199 ++-----------
 .../Settings/SpendingLimit/utils.ts           |   3 +-
 src/routes/safe/components/Settings/index.tsx |   4 +-
 9 files changed, 371 insertions(+), 246 deletions(-)
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/SpendingLimitModal.tsx

diff --git a/src/logic/contracts/safeContracts.ts b/src/logic/contracts/safeContracts.ts
index d2992add06..b533212044 100644
--- a/src/logic/contracts/safeContracts.ts
+++ b/src/logic/contracts/safeContracts.ts
@@ -1,9 +1,11 @@
+import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 import { AbiItem } from 'web3-utils'
 import contract from 'truffle-contract'
 import Web3 from 'web3'
 import ProxyFactorySol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafeProxyFactory.json'
 import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
 import SafeProxy from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafeProxy.json'
+import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import { ensureOnce } from 'src/utils/singleton'
 import memoize from 'lodash.memoize'
 import { getWeb3, getNetworkIdFrom } from 'src/logic/wallets/getWeb3'
@@ -37,7 +39,13 @@ const createProxyFactoryContract = (web3: Web3, networkId: number): GnosisSafePr
   return proxyFactory
 }
 
+const createSpendingLimitContract = () => {
+  const web3 = getWeb3()
+  return new web3.eth.Contract(SpendingLimitModule.abi as AbiItem[], SPENDING_LIMIT_MODULE_ADDRESS)
+}
+
 export const getGnosisSafeContract = memoize(createGnosisSafeContract)
+export const getSpendingLimitContract = memoize(createSpendingLimitContract)
 const getCreateProxyFactoryContract = memoize(createProxyFactoryContract)
 
 const instantiateMasterCopies = async () => {
diff --git a/src/logic/safe/store/actions/fetchSafe.ts b/src/logic/safe/store/actions/fetchSafe.ts
index 2a7c82ef6f..41682910ee 100644
--- a/src/logic/safe/store/actions/fetchSafe.ts
+++ b/src/logic/safe/store/actions/fetchSafe.ts
@@ -11,11 +11,17 @@ import addSafeOwner from 'src/logic/safe/store/actions/addSafeOwner'
 import removeSafeOwner from 'src/logic/safe/store/actions/removeSafeOwner'
 import updateSafe from 'src/logic/safe/store/actions/updateSafe'
 import { makeOwner } from 'src/logic/safe/store/models/owner'
+import {
+  requestAllowancesByDelegatesAndTokens,
+  requestTokensByDelegate,
+} from 'src/routes/safe/components/Settings/SpendingLimit/utils'
 
 import { checksumAddress } from 'src/utils/checksumAddress'
-import { ModulePair, SafeOwner } from 'src/logic/safe/store/models/safe'
+import { ModulePair, SafeOwner, SpendingLimit } from 'src/logic/safe/store/models/safe'
 import { Dispatch } from 'redux'
-import { SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
+
+import { getSpendingLimitContract, SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
+import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
 const buildOwnersFrom = (
   safeOwners,
@@ -83,8 +89,22 @@ export const buildSafe = async (safeAdd: string, safeName: string, latestMasterC
   return safe
 }
 
+const getSpendingLimits = async (modules, safeAddress: string): Promise<SpendingLimit[] | null> => {
+  const isSpendingLimitEnabled =
+    modules?.array?.some((module) => module.toLowerCase() === SPENDING_LIMIT_MODULE_ADDRESS.toLowerCase()) ?? false
+
+  if (isSpendingLimitEnabled) {
+    const delegates = await getSpendingLimitContract().methods.getDelegates(safeAddress, 0, 100).call()
+    const tokensByDelegate = await requestTokensByDelegate(safeAddress, delegates.results)
+    return requestAllowancesByDelegatesAndTokens(safeAddress, tokensByDelegate)
+  }
+
+  return null
+}
+
 export const checkAndUpdateSafe = (safeAdd: string) => async (dispatch: Dispatch): Promise<void> => {
   const safeAddress = checksumAddress(safeAdd)
+
   // Check if the owner's safe did change and update them
   const safeParams = [
     'getThreshold',
@@ -93,15 +113,21 @@ export const checkAndUpdateSafe = (safeAdd: string) => async (dispatch: Dispatch
     // TODO: 100 is an arbitrary large number, to avoid the need for pagination. But pagination must be properly handled
     { method: 'getModulesPaginated', args: [SENTINEL_ADDRESS, 100] },
   ]
+
+  const safeInfo = generateBatchRequests({
+    abi: GnosisSafeSol.abi,
+    address: safeAddress,
+    methods: safeParams,
+  } as any)
+
   const [[remoteThreshold, remoteNonce, remoteOwners, modules], localSafe] = await Promise.all([
-    generateBatchRequests({
-      abi: GnosisSafeSol.abi,
-      address: safeAddress,
-      methods: safeParams,
-    } as any),
+    safeInfo,
     getLocalSafe(safeAddress),
   ])
 
+  // request SpendingLimit info
+  const spendingLimits = await getSpendingLimits(modules, safeAddress)
+
   // Converts from [ { address, ownerName} ] to address array
   const localOwners = localSafe ? localSafe.owners.map((localOwner) => localOwner.address) : undefined
 
@@ -109,6 +135,7 @@ export const checkAndUpdateSafe = (safeAdd: string) => async (dispatch: Dispatch
     updateSafe({
       address: safeAddress,
       modules: buildModulesLinkedList(modules?.array, modules?.next),
+      spendingLimits,
       nonce: Number(remoteNonce),
       threshold: Number(remoteThreshold),
     }),
diff --git a/src/logic/safe/store/models/safe.ts b/src/logic/safe/store/models/safe.ts
index 0311d3be2c..d8296329ba 100644
--- a/src/logic/safe/store/models/safe.ts
+++ b/src/logic/safe/store/models/safe.ts
@@ -7,6 +7,16 @@ export type SafeOwner = {
 
 export type ModulePair = [string, string]
 
+export type SpendingLimit = {
+  delegate: string
+  token: string
+  amount: string
+  spent: string
+  resetTimeMin: string
+  lastResetMin: string
+  nonce: string
+}
+
 export type SafeRecordProps = {
   name: string
   address: string
@@ -14,6 +24,7 @@ export type SafeRecordProps = {
   ethBalance: string
   owners: List<SafeOwner>
   modules: ModulePair[] | null
+  spendingLimits: SpendingLimit[] | null
   activeTokens: Set<string>
   activeAssets: Set<string>
   blacklistedTokens: Set<string>
@@ -34,6 +45,7 @@ const makeSafe = Record<SafeRecordProps>({
   ethBalance: '0',
   owners: List([]),
   modules: [],
+  spendingLimits: [],
   activeTokens: Set(),
   activeAssets: Set(),
   blacklistedTokens: Set(),
diff --git a/src/logic/safe/store/selectors/index.ts b/src/logic/safe/store/selectors/index.ts
index 9c6d3f9c59..f133288d46 100644
--- a/src/logic/safe/store/selectors/index.ts
+++ b/src/logic/safe/store/selectors/index.ts
@@ -208,6 +208,8 @@ export const safeModulesSelector = createSelector(safeSelector, safeFieldSelecto
 
 export const safeFeaturesEnabledSelector = createSelector(safeSelector, safeFieldSelector('featuresEnabled'))
 
+export const safeSpendingLimitsSelector = createSelector(safeSelector, safeFieldSelector('spendingLimits'))
+
 export const getActiveTokensAddressesForAllSafes = createSelector(safesListSelector, (safes) => {
   const addresses = Set().withMutations((set) => {
     safes.forEach((safe) => {
diff --git a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx b/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
index 2ffeb2bcb0..6454e5d1e2 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
@@ -1,14 +1,20 @@
 import { Button, EthHashInfo, Icon, IconText, Text, Title } from '@gnosis.pm/safe-react-components'
-import { Skeleton } from '@material-ui/lab'
+import { useSnackbar } from 'notistack'
 import React from 'react'
-import { useSelector } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
 import Row from 'src/components/layout/Row'
 import { getNetwork } from 'src/config'
 import { getAddressBook } from 'src/logic/addressBook/store/selectors'
 import { getNameFromAdbk } from 'src/logic/addressBook/utils'
+import { getGnosisSafeInstanceAt, getSpendingLimitContract } from 'src/logic/contracts/safeContracts'
+import { SpendingLimit } from 'src/logic/safe/store/models/safe'
+import { safeParamAddressFromStateSelector, safeSpendingLimitsSelector } from 'src/logic/safe/store/selectors'
 import { Token } from 'src/logic/tokens/store/model/token'
+import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
+import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
+import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 import {
   FooterSection,
@@ -18,6 +24,8 @@ import {
 } from 'src/routes/safe/components/Settings/SpendingLimit/index'
 import { RESET_TIME_OPTIONS } from 'src/routes/safe/components/Settings/SpendingLimit/ResetTime'
 import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
+import { currentMinutes, fromTokenUnit, toTokenUnit } from 'src/routes/safe/components/Settings/SpendingLimit/utils'
+import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 import styled from 'styled-components'
 
 const StyledImage = styled.img`
@@ -35,23 +43,187 @@ const StyledImageName = styled.div`
 interface ReviewSpendingLimitProps {
   onBack: () => void
   onClose: () => void
-  onSubmit: () => void
   txToken: Token | null
   values: Record<string, string>
   existentSpendingLimit?: Record<string, string>
 }
 
-const ReviewSpendingLimit = ({
-  onBack,
-  onClose,
-  onSubmit,
-  txToken,
-  values,
-  existentSpendingLimit,
-}: ReviewSpendingLimitProps): React.ReactElement => {
-  const classes = useStyles()
+interface GenericInfoProps {
+  title?: string
+  children: React.ReactNode
+}
+const GenericInfo = ({ title, children }: GenericInfoProps): React.ReactElement => (
+  <>
+    {title && (
+      <Text size="lg" color="secondaryLight">
+        {title}
+      </Text>
+    )}
+    {children}
+  </>
+)
+
+interface AddressInfoProps {
+  address: string
+  title?: string
+}
+const AddressInfo = ({ address, title }: AddressInfoProps): React.ReactElement => {
   const addressBook = useSelector(getAddressBook)
 
+  return (
+    <GenericInfo title={title}>
+      <EthHashInfo
+        hash={address}
+        name={addressBook ? getNameFromAdbk(addressBook, address) : ''}
+        showCopyBtn
+        showEtherscanBtn
+        showIdenticon
+        textSize="lg"
+        network={getNetwork()}
+      />
+    </GenericInfo>
+  )
+}
+
+interface TokenInfoProps {
+  amount: string
+  title?: string
+  token: Token
+}
+const TokenInfo = ({ amount, title, token }: TokenInfoProps): React.ReactElement => {
+  return (
+    <GenericInfo title={title}>
+      <StyledImageName>
+        <StyledImage alt={token.name} onError={setImageToPlaceholder} src={token.logoUri} />
+        <Text size="lg">
+          {amount} {token.symbol}
+        </Text>
+      </StyledImageName>
+    </GenericInfo>
+  )
+}
+
+interface ResetTimeInfoProps {
+  title?: string
+  label?: string
+}
+const ResetTimeInfo = ({ title, label }: ResetTimeInfoProps): React.ReactElement => {
+  return (
+    <GenericInfo title={title}>
+      {label ? (
+        <Row align="center" margin="md">
+          <IconText iconSize="md" iconType="fuelIndicator" text={label} textSize="lg" />
+        </Row>
+      ) : (
+        <Row align="center" margin="md">
+          <Text size="lg">
+            {/* TODO: review message */}
+            One-time spending limit allowance
+          </Text>
+        </Row>
+      )}
+    </GenericInfo>
+  )
+}
+
+const ReviewSpendingLimit = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps): React.ReactElement => {
+  const classes = useStyles()
+
+  const { enqueueSnackbar, closeSnackbar } = useSnackbar()
+  const dispatch = useDispatch()
+
+  const safeAddress = useSelector(safeParamAddressFromStateSelector)
+  const spendingLimits = useSelector(safeSpendingLimitsSelector)
+
+  // undefined: before setting a value
+  // null: if no previous value
+  // SpendingLimit: if previous value exists
+  const [existentSpendingLimit, setExistentSpendingLimit] = React.useState<SpendingLimit>()
+  React.useEffect(() => {
+    const checkExistence = async () => {
+      // if `delegate` already exist, check what tokens were delegated to the _beneficiary_ `getTokens(safe, delegate)`
+      const currentDelegate = spendingLimits.find(
+        ({ delegate, token }) =>
+          delegate.toLowerCase() === values.beneficiary.toLowerCase() &&
+          token.toLowerCase() === values.token.toLowerCase(),
+      )
+
+      // let the user know that is about to replace an existent allowance
+      if (currentDelegate !== undefined) {
+        setExistentSpendingLimit({
+          ...currentDelegate,
+          amount: fromTokenUnit(currentDelegate.amount, txToken.decimals),
+        })
+      } else {
+        setExistentSpendingLimit(null)
+      }
+    }
+
+    checkExistence()
+  }, [spendingLimits, txToken.decimals, values.beneficiary, values.token])
+
+  const handleSubmit = async () => {
+    const spendingLimitContract = getSpendingLimitContract()
+    const isSpendingLimitEnabled = spendingLimits !== null
+
+    const transactions = []
+
+    // is spendingLimit module enabled? -> if not, create the tx to enable it, and encode it
+    if (!isSpendingLimitEnabled) {
+      const safeInstance = await getGnosisSafeInstanceAt(safeAddress)
+      transactions.push({
+        to: safeAddress,
+        value: 0,
+        data: safeInstance.methods.enableModule(SPENDING_LIMIT_MODULE_ADDRESS).encodeABI(),
+      })
+    }
+
+    // does `delegate` already exist? (`getDelegates`, previously queried to build the table with allowances (??))
+    //                                  ^ - shall we rely on this or query the list of delegates once again?
+    const isDelegateAlreadyAdded =
+      spendingLimits.some(({ delegate }) => delegate.toLowerCase() === values?.beneficiary.toLowerCase()) ?? false
+
+    // if `delegate` does not exist, add it by calling `addDelegate(beneficiary)`
+    if (!isDelegateAlreadyAdded && values?.beneficiary) {
+      transactions.push({
+        to: SPENDING_LIMIT_MODULE_ADDRESS,
+        value: 0,
+        data: spendingLimitContract.methods.addDelegate(values?.beneficiary).encodeABI(),
+      })
+    }
+
+    // prepare the setAllowance tx
+    const startTime = currentMinutes() - 30
+    transactions.push({
+      to: SPENDING_LIMIT_MODULE_ADDRESS,
+      value: 0,
+      data: spendingLimitContract.methods
+        .setAllowance(
+          values.beneficiary,
+          values.token === ETH_ADDRESS ? ZERO_ADDRESS : values.token,
+          toTokenUnit(values.amount, txToken.decimals),
+          values.withResetTime ? +values.resetTime * 60 * 24 : 0,
+          values.withResetTime ? startTime : 0,
+        )
+        .encodeABI(),
+    })
+
+    await sendTransactions(
+      dispatch,
+      safeAddress,
+      transactions,
+      enqueueSnackbar,
+      closeSnackbar,
+      JSON.stringify({ name: 'Spending Limit', message: 'New Allowance' }),
+    )
+      .then(onClose)
+      .catch(console.error)
+  }
+
+  const resetTimeLabel = values.withResetTime
+    ? RESET_TIME_OPTIONS.find(({ value }) => value === values.resetTime).label
+    : ''
+
   return (
     <>
       <TitleSection>
@@ -69,62 +241,18 @@ const ReviewSpendingLimit = ({
 
       <Block className={classes.container}>
         <Col margin="lg">
-          <Text size="lg" color="secondaryLight">
-            Beneficiary
-          </Text>
-          <EthHashInfo
-            hash={values.beneficiary}
-            name={addressBook ? getNameFromAdbk(addressBook, values.beneficiary) : ''}
-            showCopyBtn
-            showEtherscanBtn
-            showIdenticon
-            textSize="lg"
-            network={getNetwork()}
-          />
+          <AddressInfo address={values.beneficiary} title="Beneficiary" />
         </Col>
         <Col margin="lg">
-          <Text size="lg" color="secondaryLight">
-            Amount
-          </Text>
-          {txToken !== null ? (
-            <>
-              <StyledImageName>
-                <StyledImage alt={txToken.name} onError={setImageToPlaceholder} src={txToken.logoUri} />
-                <Text size="lg">
-                  {values.amount} {txToken.symbol}
-                </Text>
-              </StyledImageName>
-              {existentSpendingLimit && (
-                <Text size="lg" color="error">
-                  Previous Amount: {existentSpendingLimit.amount}
-                </Text>
-              )}
-            </>
-          ) : (
-            <Skeleton animation="wave" variant="text" />
+          <TokenInfo amount={values.amount} title="Amount" token={txToken} />
+          {existentSpendingLimit && (
+            <Text size="lg" color="error">
+              Previous Amount: {existentSpendingLimit.amount}
+            </Text>
           )}
         </Col>
         <Col margin="lg">
-          <Text size="lg" color="secondaryLight">
-            Reset Time
-          </Text>
-          {values.withResetTime ? (
-            <Row align="center" margin="md">
-              <IconText
-                iconSize="md"
-                iconType="fuelIndicator"
-                text={RESET_TIME_OPTIONS.find(({ value }) => value === values.resetTime).label}
-                textSize="lg"
-              />
-            </Row>
-          ) : (
-            <Row align="center" margin="md">
-              <Text size="lg">
-                {/* TODO: review message */}
-                One-time spending limit allowance
-              </Text>
-            </Row>
-          )}
+          <ResetTimeInfo title="Reset Time" label={resetTimeLabel} />
           {existentSpendingLimit && (
             <Row align="center" margin="md">
               <Text size="lg" color="error">
@@ -150,7 +278,13 @@ const ReviewSpendingLimit = ({
             Back
           </Button>
 
-          <Button color="primary" size="md" variant="contained" onClick={onSubmit}>
+          <Button
+            color="primary"
+            size="md"
+            variant="contained"
+            onClick={handleSubmit}
+            disabled={existentSpendingLimit === undefined}
+          >
             Submit
           </Button>
         </FooterWrapper>
diff --git a/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitModal.tsx
new file mode 100644
index 0000000000..05a765ffb6
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitModal.tsx
@@ -0,0 +1,86 @@
+import React from 'react'
+import { useSelector } from 'react-redux'
+import GnoModal from 'src/components/Modal'
+import { Token } from 'src/logic/tokens/store/model/token'
+import NewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit'
+import ReviewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit'
+import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
+import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
+
+const CREATE = 'CREATE' as const
+const REVIEW = 'REVIEW' as const
+
+type Step = typeof CREATE | typeof REVIEW
+
+type SpendingLimitModalReducerState = {
+  step: Step
+  values: Record<string, string> | null
+  txToken: Token | null
+}
+
+const newSpendingLimitReducer = (state: SpendingLimitModalReducerState, action) => {
+  const { type, newState } = action
+
+  switch (type) {
+    case CREATE: {
+      return {
+        ...state,
+        step: CREATE,
+      }
+    }
+
+    case REVIEW: {
+      return {
+        ...newState,
+        step: REVIEW,
+      }
+    }
+  }
+}
+
+const useSpendingLimit = (initialStep: Step) => {
+  const [state, dispatch] = React.useReducer(newSpendingLimitReducer, {
+    step: initialStep,
+    values: null,
+    txToken: null,
+  })
+
+  const create = React.useCallback(() => dispatch({ type: CREATE }), [])
+  const review = React.useCallback((newState) => dispatch({ type: REVIEW, newState }), [])
+
+  return [state, { create, review }]
+}
+
+interface SpendingLimitModalProps {
+  close: () => void
+  open: boolean
+}
+
+const SpendingLimitModal = ({ close, open }: SpendingLimitModalProps): React.ReactElement => {
+  const classes = useStyles()
+
+  const tokens = useSelector(extendedSafeTokensSelector)
+  const [{ step, txToken, values }, { create, review }] = useSpendingLimit(CREATE)
+
+  const handleReview = async (values) => {
+    review({
+      values,
+      txToken: tokens.find((token) => token.address === values.token),
+    })
+  }
+
+  return (
+    <GnoModal
+      handleClose={close}
+      open={open}
+      title="New Spending Limit"
+      description="set rules for specific beneficiaries to access funds from this Safe without having to collect all signatures"
+      paperClassName={classes.modal}
+    >
+      {step === CREATE && <NewSpendingLimit initialValues={values} onCancel={close} onReview={handleReview} />}
+      {step === REVIEW && <ReviewSpendingLimit onBack={create} onClose={close} txToken={txToken} values={values} />}
+    </GnoModal>
+  )
+}
+
+export default SpendingLimitModal
diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index f5e9b5c961..fc2b07df91 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -1,33 +1,15 @@
 import { Button, Text, Title } from '@gnosis.pm/safe-react-components'
-import { useSnackbar } from 'notistack'
 import React from 'react'
-import { useDispatch, useSelector } from 'react-redux'
+import { useSelector } from 'react-redux'
 
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
 import Row from 'src/components/layout/Row'
-import GnoModal from 'src/components/Modal'
-import { getGnosisSafeInstanceAt } from 'src/logic/contracts/safeContracts'
 import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
-import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
-import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
-import { getWeb3 } from 'src/logic/wallets/getWeb3'
-
-import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
-import NewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit'
-import ReviewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit'
-import SpendingLimitSteps from 'src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps'
-import {
-  currentMinutes,
-  fromTokenUnit,
-  requestAllowancesByDelegatesAndTokens,
-  requestModuleData,
-  requestTokensByDelegate,
-  toTokenUnit,
-} from 'src/routes/safe/components/Settings/SpendingLimit/utils'
-import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
-import SpendingLimitModule from 'src/utils/AllowanceModule.json'
-import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
+import SpendingLimitModal from './SpendingLimitModal'
+import SpendingLimitSteps from './SpendingLimitSteps'
+import { requestModuleData } from './utils'
+import { grantedSelector } from 'src/routes/safe/container/selector'
 import styled from 'styled-components'
 
 import { useStyles } from './style'
@@ -71,138 +53,7 @@ export const FooterWrapper = styled.div`
   justify-content: space-around;
 `
 
-const NewSpendingLimitModal = ({ close, open }: { close: () => void; open: boolean }): React.ReactElement => {
-  const classes = useStyles()
-
-  const safeAddress = useSelector(safeParamAddressFromStateSelector)
-  const { enqueueSnackbar, closeSnackbar } = useSnackbar()
-  const dispatch = useDispatch()
-
-  const [step, setStep] = React.useState<'create' | 'review'>('create')
-  const [values, setValues] = React.useState()
-  const tokens = useSelector(extendedSafeTokensSelector)
-  const [txToken, setTxToken] = React.useState(null)
-  const [existentSpendingLimit, setExistentSpendingLimit] = React.useState()
-
-  const handleReview = async (values) => {
-    const selectedToken = tokens.find((token) => token.address === values.token)
-
-    setValues(values)
-    setTxToken(selectedToken)
-
-    const checkExistence = async () => {
-      const [, delegates] = await requestModuleData(safeAddress)
-      const tokensByDelegate = await requestTokensByDelegate(safeAddress, delegates.results)
-      const allowances = await requestAllowancesByDelegatesAndTokens(safeAddress, tokensByDelegate)
-
-      // if `delegate` already exist, check what tokens were delegated to the _beneficiary_ `getTokens(safe, delegate)`
-      const currentDelegate = allowances.find(
-        ({ delegate, token }) =>
-          delegate.toLowerCase() === values.beneficiary.toLowerCase() &&
-          token.toLowerCase() === values.token.toLowerCase(),
-      )
-
-      // let the user know that is about to replace an existent allowance
-      if (currentDelegate !== undefined) {
-        setExistentSpendingLimit({
-          ...currentDelegate,
-          amount: fromTokenUnit(currentDelegate.amount, selectedToken.decimals),
-        })
-      } else {
-        setExistentSpendingLimit(undefined)
-      }
-    }
-
-    await checkExistence()
-    setStep('review')
-  }
-
-  const handleSubmit = async (values: Record<string, string>) => {
-    const [enabledModules, delegates] = await requestModuleData(safeAddress)
-    const isSpendingLimitEnabled =
-      enabledModules?.array?.some((module) => module.toLowerCase() === SPENDING_LIMIT_MODULE_ADDRESS.toLowerCase()) ??
-      false
-    const transactions = []
-
-    // is spendingLimit module enabled? -> if not, create the tx to enable it, and encode it
-    if (!isSpendingLimitEnabled) {
-      const safeInstance = await getGnosisSafeInstanceAt(safeAddress)
-      transactions.push({
-        to: safeAddress,
-        value: 0,
-        data: safeInstance.methods.enableModule(SPENDING_LIMIT_MODULE_ADDRESS).encodeABI(),
-      })
-    }
-
-    // does `delegate` already exist? (`getDelegates`, previously queried to build the table with allowances (??))
-    //                                  ^ - shall we rely on this or query the list of delegates once again?
-    const isDelegateAlreadyAdded =
-      delegates.results.some((delegate) => delegate.toLowerCase() === values?.beneficiary.toLowerCase()) ?? false
-
-    // if `delegate` does not exist, add it by calling `addDelegate(beneficiary)`
-    if (!isDelegateAlreadyAdded) {
-      const web3 = getWeb3()
-      const spendingLimit = new web3.eth.Contract(SpendingLimitModule.abi as any, SPENDING_LIMIT_MODULE_ADDRESS)
-      transactions.push({
-        to: SPENDING_LIMIT_MODULE_ADDRESS,
-        value: 0,
-        data: spendingLimit.methods.addDelegate(values?.beneficiary).encodeABI(),
-      })
-    }
-
-    // prepare the setAllowance tx
-    const web3 = getWeb3()
-    const spendingLimit = new web3.eth.Contract(SpendingLimitModule.abi as any, SPENDING_LIMIT_MODULE_ADDRESS)
-    const startTime = currentMinutes() - 30
-    transactions.push({
-      to: SPENDING_LIMIT_MODULE_ADDRESS,
-      value: 0,
-      data: spendingLimit.methods
-        .setAllowance(
-          values.beneficiary,
-          values.token === ETH_ADDRESS ? ZERO_ADDRESS : values.token,
-          toTokenUnit(values.amount, txToken.decimals),
-          values.withResetTime ? +values.resetTime * 60 * 24 : 0,
-          values.withResetTime ? startTime : 0,
-        )
-        .encodeABI(),
-    })
-
-    await sendTransactions(
-      dispatch,
-      safeAddress,
-      transactions,
-      enqueueSnackbar,
-      closeSnackbar,
-      JSON.stringify({ name: 'Spending Limit', message: 'New Allowance' }),
-    )
-      .then(close)
-      .catch(console.error)
-  }
-  return (
-    <GnoModal
-      handleClose={close}
-      open={open}
-      title="New Spending Limit"
-      description="set rules for specific beneficiaries to access funds from this Safe without having to collect all signatures"
-      paperClassName={classes.modal}
-    >
-      {step === 'create' && <NewSpendingLimit initialValues={values} onCancel={close} onReview={handleReview} />}
-      {step === 'review' && (
-        <ReviewSpendingLimit
-          onBack={() => setStep('create')}
-          onClose={close}
-          onSubmit={() => handleSubmit(values)}
-          txToken={txToken}
-          values={values}
-          existentSpendingLimit={existentSpendingLimit}
-        />
-      )}
-    </GnoModal>
-  )
-}
-
-const SpendingLimit = (): React.ReactElement => {
+const SpendingLimitSettings = (): React.ReactElement => {
   const classes = useStyles()
   const granted = useSelector(grantedSelector)
   const [showNewSpendingLimitModal, setShowNewSpendingLimitModal] = React.useState(false)
@@ -242,24 +93,28 @@ const SpendingLimit = (): React.ReactElement => {
           <SpendingLimitSteps />
         )}
       </Block>
-      <Row align="end" className={classes.buttonRow} grow>
-        <Col end="xs">
-          <Button
-            className={classes.actionButton}
-            color="primary"
-            disabled={!granted}
-            size="md"
-            data-testid="new-spending-limit-button"
-            onClick={openNewSpendingLimitModal}
-            variant="contained"
-          >
-            New spending limit
-          </Button>
-        </Col>
-      </Row>
-      {showNewSpendingLimitModal && <NewSpendingLimitModal close={closeNewSpendingLimitModal} open={true} />}
+
+      {granted && (
+        <>
+          <Row align="end" className={classes.buttonRow} grow>
+            <Col end="xs">
+              <Button
+                className={classes.actionButton}
+                color="primary"
+                size="md"
+                data-testid="new-spending-limit-button"
+                onClick={openNewSpendingLimitModal}
+                variant="contained"
+              >
+                New spending limit
+              </Button>
+            </Col>
+          </Row>
+          {showNewSpendingLimitModal && <SpendingLimitModal close={closeNewSpendingLimitModal} open={true} />}
+        </>
+      )}
     </>
   )
 }
 
-export default SpendingLimit
+export default SpendingLimitSettings
diff --git a/src/routes/safe/components/Settings/SpendingLimit/utils.ts b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
index aaea6ec1b3..bd83cacac7 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/utils.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
@@ -2,6 +2,7 @@ import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.
 import { BigNumber } from 'bignumber.js'
 import generateBatchRequests from 'src/logic/contracts/generateBatchRequests'
 import { SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
+import { SpendingLimit } from 'src/logic/safe/store/models/safe'
 import { web3ReadOnly } from 'src/logic/wallets/getWeb3'
 import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
@@ -65,7 +66,7 @@ export const requestTokensByDelegate = async (safeAddress: string, delegates: st
 export const requestAllowancesByDelegatesAndTokens = async (
   safeAddress: string,
   tokensByDelegate: [string, string[]][],
-): Promise<any[]> => {
+): Promise<SpendingLimit[]> => {
   const batch = new web3ReadOnly.BatchRequest()
 
   const whenRequestValues = []
diff --git a/src/routes/safe/components/Settings/index.tsx b/src/routes/safe/components/Settings/index.tsx
index 6745b9fb31..1046f90a32 100644
--- a/src/routes/safe/components/Settings/index.tsx
+++ b/src/routes/safe/components/Settings/index.tsx
@@ -7,7 +7,7 @@ import { useState } from 'react'
 import { useSelector } from 'react-redux'
 
 import Advanced from './Advanced'
-import SpendingLimit from './SpendingLimit'
+import SpendingLimitSettings from './SpendingLimit'
 import ManageOwners from './ManageOwners'
 import { RemoveSafeModal } from './RemoveSafeModal'
 import SafeDetails from './SafeDetails'
@@ -145,7 +145,7 @@ const Settings: React.FC = () => {
             {menuOptionIndex === 1 && <SafeDetails />}
             {menuOptionIndex === 2 && <ManageOwners addressBook={addressBook} granted={granted} owners={owners} />}
             {menuOptionIndex === 3 && <ThresholdSettings />}
-            {menuOptionIndex === 4 && <SpendingLimit />}
+            {menuOptionIndex === 4 && <SpendingLimitSettings />}
             {menuOptionIndex === 5 && <Advanced />}
           </Block>
         </Col>

From 157f539e1585e32401a10b5ab5d9f1e39274f04a Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Thu, 20 Aug 2020 22:19:08 -0300
Subject: [PATCH 43/69] refactor: convert `scannedAddress` to a oneliner

---
 .../Settings/SpendingLimit/BeneficiarySelect.tsx           | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx b/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
index b814f366bd..d78c49a15e 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
@@ -43,12 +43,7 @@ const BeneficiarySelect = (): React.ReactElement => {
   const addressBook = useSelector(getAddressBook)
 
   const handleScan = (value, closeQrModal) => {
-    let scannedAddress = value
-
-    if (scannedAddress.startsWith('ethereum:')) {
-      scannedAddress = scannedAddress.replace('ethereum:', '')
-    }
-
+    const scannedAddress = value.startsWith('ethereum:') ? value.replace('ethereum:', '') : value
     const scannedName = addressBook ? getNameFromAdbk(addressBook, scannedAddress) : ''
 
     mutators?.setBeneficiary?.(scannedAddress)

From f3e74a779e351ebf3b119c48e439e54496b30eb1 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 09:07:07 -0300
Subject: [PATCH 44/69] fix typo

---
 src/routes/safe/components/Settings/SpendingLimit/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/utils.ts b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
index 811a49b437..3bb5b824fd 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/utils.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
@@ -74,7 +74,7 @@ export type SpendingLimitRow = {
 }
 
 /**
- * TODO: This is helpfully a temp function that attempts to filter out "deleted" allowances
+ * TODO: This is hopefully a temp function that attempts to filter out "deleted" allowances
  * As there's no way to remove an Allowance with the current code, it's "deleted" by setting its `amount` to 0
  * along with `resetTimeMin` to 0 as well
  * @param {SpendingLimitRow} allowance

From 0335f5f6eceff02426bff22e8b17d757f7bf6159 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 09:34:24 -0300
Subject: [PATCH 45/69] refactor: extract common data display components

---
 .../Settings/SpendingLimit/AddressInfo.tsx    |  34 ++++++
 .../Settings/SpendingLimit/DataDisplay.tsx    |  20 ++++
 .../Settings/SpendingLimit/ResetTimeInfo.tsx  |  32 +++++
 .../SpendingLimit/ReviewSpendingLimit.tsx     | 109 ++----------------
 .../Settings/SpendingLimit/TokenInfo.tsx      |  40 +++++++
 5 files changed, 135 insertions(+), 100 deletions(-)
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/AddressInfo.tsx
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/DataDisplay.tsx
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/ResetTimeInfo.tsx
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/TokenInfo.tsx

diff --git a/src/routes/safe/components/Settings/SpendingLimit/AddressInfo.tsx b/src/routes/safe/components/Settings/SpendingLimit/AddressInfo.tsx
new file mode 100644
index 0000000000..ce69009819
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/AddressInfo.tsx
@@ -0,0 +1,34 @@
+import { EthHashInfo } from '@gnosis.pm/safe-react-components'
+import React from 'react'
+import { useSelector } from 'react-redux'
+
+import { getNetwork } from 'src/config'
+import { getAddressBook } from 'src/logic/addressBook/store/selectors'
+import { getNameFromAdbk } from 'src/logic/addressBook/utils'
+
+import DataDisplay from './DataDisplay'
+
+interface AddressInfoProps {
+  address: string
+  title?: string
+}
+
+const AddressInfo = ({ address, title }: AddressInfoProps): React.ReactElement => {
+  const addressBook = useSelector(getAddressBook)
+
+  return (
+    <DataDisplay title={title}>
+      <EthHashInfo
+        hash={address}
+        name={addressBook ? getNameFromAdbk(addressBook, address) : ''}
+        showCopyBtn
+        showEtherscanBtn
+        showIdenticon
+        textSize="lg"
+        network={getNetwork()}
+      />
+    </DataDisplay>
+  )
+}
+
+export default AddressInfo
diff --git a/src/routes/safe/components/Settings/SpendingLimit/DataDisplay.tsx b/src/routes/safe/components/Settings/SpendingLimit/DataDisplay.tsx
new file mode 100644
index 0000000000..669ea560b4
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/DataDisplay.tsx
@@ -0,0 +1,20 @@
+import { Text } from '@gnosis.pm/safe-react-components'
+import React from 'react'
+
+interface GenericInfoProps {
+  title?: string
+  children: React.ReactNode
+}
+
+const DataDisplay = ({ title, children }: GenericInfoProps): React.ReactElement => (
+  <>
+    {title && (
+      <Text size="lg" color="secondaryLight">
+        {title}
+      </Text>
+    )}
+    {children}
+  </>
+)
+
+export default DataDisplay
diff --git a/src/routes/safe/components/Settings/SpendingLimit/ResetTimeInfo.tsx b/src/routes/safe/components/Settings/SpendingLimit/ResetTimeInfo.tsx
new file mode 100644
index 0000000000..3629cf87db
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/ResetTimeInfo.tsx
@@ -0,0 +1,32 @@
+import { IconText, Text } from '@gnosis.pm/safe-react-components'
+import React from 'react'
+
+import Row from 'src/components/layout/Row'
+
+import DataDisplay from './DataDisplay'
+
+interface ResetTimeInfoProps {
+  title?: string
+  label?: string
+}
+
+const ResetTimeInfo = ({ title, label }: ResetTimeInfoProps): React.ReactElement => {
+  return (
+    <DataDisplay title={title}>
+      {label ? (
+        <Row align="center" margin="md">
+          <IconText iconSize="md" iconType="fuelIndicator" text={label} textSize="lg" />
+        </Row>
+      ) : (
+        <Row align="center" margin="md">
+          <Text size="lg">
+            {/* TODO: review message */}
+            One-time spending limit allowance
+          </Text>
+        </Row>
+      )}
+    </DataDisplay>
+  )
+}
+
+export default ResetTimeInfo
diff --git a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx b/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
index 70d9d73de6..908bc4676a 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
@@ -1,15 +1,11 @@
-import { Button, EthHashInfo, Icon, IconText, Text, Title } from '@gnosis.pm/safe-react-components'
+import { Button, Icon, Text, Title } from '@gnosis.pm/safe-react-components'
 import { useSnackbar } from 'notistack'
 import React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import styled from 'styled-components'
 
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
 import Row from 'src/components/layout/Row'
-import { getNetwork } from 'src/config'
-import { getAddressBook } from 'src/logic/addressBook/store/selectors'
-import { getNameFromAdbk } from 'src/logic/addressBook/utils'
 import { getGnosisSafeInstanceAt, getSpendingLimitContract } from 'src/logic/contracts/safeContracts'
 import { SpendingLimit } from 'src/logic/safe/store/models/safe'
 import { safeParamAddressFromStateSelector, safeSpendingLimitsSelector } from 'src/logic/safe/store/selectors'
@@ -17,26 +13,16 @@ import { Token } from 'src/logic/tokens/store/model/token'
 import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
 import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
 import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
-import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
 import { FooterSection, FooterWrapper, StyledButton, TitleSection } from '.'
+import AddressInfo from './AddressInfo'
 import { RESET_TIME_OPTIONS } from './ResetTime'
+import ResetTimeInfo from './ResetTimeInfo'
 import { useStyles } from './style'
+import TokenInfo from './TokenInfo'
 import { currentMinutes, fromTokenUnit, SpendingLimitRow, toTokenUnit } from './utils'
 
-const StyledImage = styled.img`
-  width: 32px;
-  height: 32px;
-  object-fit: contain;
-  margin: 0 8px 0 0;
-`
-
-const StyledImageName = styled.div`
-  display: flex;
-  align-items: center;
-`
-
 interface ReviewSpendingLimitProps {
   onBack: () => void
   onClose: () => void
@@ -45,84 +31,6 @@ interface ReviewSpendingLimitProps {
   existentSpendingLimit?: SpendingLimitRow
 }
 
-interface GenericInfoProps {
-  title?: string
-  children: React.ReactNode
-}
-const GenericInfo = ({ title, children }: GenericInfoProps): React.ReactElement => (
-  <>
-    {title && (
-      <Text size="lg" color="secondaryLight">
-        {title}
-      </Text>
-    )}
-    {children}
-  </>
-)
-
-interface AddressInfoProps {
-  address: string
-  title?: string
-}
-const AddressInfo = ({ address, title }: AddressInfoProps): React.ReactElement => {
-  const addressBook = useSelector(getAddressBook)
-
-  return (
-    <GenericInfo title={title}>
-      <EthHashInfo
-        hash={address}
-        name={addressBook ? getNameFromAdbk(addressBook, address) : ''}
-        showCopyBtn
-        showEtherscanBtn
-        showIdenticon
-        textSize="lg"
-        network={getNetwork()}
-      />
-    </GenericInfo>
-  )
-}
-
-interface TokenInfoProps {
-  amount: string
-  title?: string
-  token: Token
-}
-const TokenInfo = ({ amount, title, token }: TokenInfoProps): React.ReactElement => {
-  return (
-    <GenericInfo title={title}>
-      <StyledImageName>
-        <StyledImage alt={token.name} onError={setImageToPlaceholder} src={token.logoUri} />
-        <Text size="lg">
-          {amount} {token.symbol}
-        </Text>
-      </StyledImageName>
-    </GenericInfo>
-  )
-}
-
-interface ResetTimeInfoProps {
-  title?: string
-  label?: string
-}
-const ResetTimeInfo = ({ title, label }: ResetTimeInfoProps): React.ReactElement => {
-  return (
-    <GenericInfo title={title}>
-      {label ? (
-        <Row align="center" margin="md">
-          <IconText iconSize="md" iconType="fuelIndicator" text={label} textSize="lg" />
-        </Row>
-      ) : (
-        <Row align="center" margin="md">
-          <Text size="lg">
-            {/* TODO: review message */}
-            One-time spending limit allowance
-          </Text>
-        </Row>
-      )}
-    </GenericInfo>
-  )
-}
-
 const ReviewSpendingLimit = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps): React.ReactElement => {
   const classes = useStyles()
 
@@ -221,6 +129,10 @@ const ReviewSpendingLimit = ({ onBack, onClose, txToken, values }: ReviewSpendin
     ? RESET_TIME_OPTIONS.find(({ value }) => value === values.resetTime).label
     : ''
 
+  const previousResetTime = (previousSpendingLimit: SpendingLimit) =>
+    RESET_TIME_OPTIONS.find(({ value }) => value === (+previousSpendingLimit.resetTimeMin / 60 / 24).toString())
+      ?.label ?? 'One-time spending limit allowance'
+
   return (
     <>
       <TitleSection>
@@ -253,10 +165,7 @@ const ReviewSpendingLimit = ({ onBack, onClose, txToken, values }: ReviewSpendin
           {existentSpendingLimit && (
             <Row align="center" margin="md">
               <Text size="lg" color="error">
-                Previous Reset Time:{' '}
-                {RESET_TIME_OPTIONS.find(
-                  ({ value }) => value === (+existentSpendingLimit.resetTimeMin / 60 / 24).toString(),
-                )?.label ?? 'One-time spending limit allowance'}
+                Previous Reset Time: {previousResetTime(existentSpendingLimit)}
               </Text>
             </Row>
           )}
diff --git a/src/routes/safe/components/Settings/SpendingLimit/TokenInfo.tsx b/src/routes/safe/components/Settings/SpendingLimit/TokenInfo.tsx
new file mode 100644
index 0000000000..14d5e93e21
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/TokenInfo.tsx
@@ -0,0 +1,40 @@
+import { Text } from '@gnosis.pm/safe-react-components'
+import React from 'react'
+import styled from 'styled-components'
+
+import { Token } from 'src/logic/tokens/store/model/token'
+import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
+
+import DataDisplay from './DataDisplay'
+
+const StyledImage = styled.img`
+  width: 32px;
+  height: 32px;
+  object-fit: contain;
+  margin: 0 8px 0 0;
+`
+const StyledImageName = styled.div`
+  display: flex;
+  align-items: center;
+`
+
+interface TokenInfoProps {
+  amount: string
+  title?: string
+  token: Token
+}
+
+const TokenInfo = ({ amount, title, token }: TokenInfoProps): React.ReactElement => {
+  return (
+    <DataDisplay title={title}>
+      <StyledImageName>
+        <StyledImage alt={token.name} onError={setImageToPlaceholder} src={token.logoUri} />
+        <Text size="lg">
+          {amount} {token.symbol}
+        </Text>
+      </StyledImageName>
+    </DataDisplay>
+  )
+}
+
+export default TokenInfo

From 69d035c3f3349119e0fae9a38909d6f0dd2e3f61 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 09:34:48 -0300
Subject: [PATCH 46/69] refactor: extract spending limit table

---
 .../Settings/SpendingLimit/LimitsTable.tsx    | 200 ++++++++++++++++++
 .../Settings/SpendingLimit/index.tsx          | 199 +----------------
 2 files changed, 206 insertions(+), 193 deletions(-)
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx

diff --git a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx
new file mode 100644
index 0000000000..778e96002b
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx
@@ -0,0 +1,200 @@
+import { Button, EthHashInfo, Text } from '@gnosis.pm/safe-react-components'
+import TableContainer from '@material-ui/core/TableContainer'
+import cn from 'classnames'
+import React from 'react'
+import { useSelector } from 'react-redux'
+import styled from 'styled-components'
+
+import Row from 'src/components/layout/Row'
+import { TableCell, TableRow } from 'src/components/layout/Table'
+import Table from 'src/components/Table'
+import { getNetwork } from 'src/config'
+import { getAddressBook } from 'src/logic/addressBook/store/selectors'
+import { getNameFromAdbk } from 'src/logic/addressBook/utils'
+import { Token } from 'src/logic/tokens/store/model/token'
+import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
+import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
+import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
+import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
+import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
+import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
+
+import {
+  generateColumns,
+  SPENDING_LIMIT_TABLE_BENEFICIARY_ID,
+  SPENDING_LIMIT_TABLE_RESET_TIME_ID,
+  SPENDING_LIMIT_TABLE_SPENT_ID,
+  SpendingLimitTable,
+} from './dataFetcher'
+import RemoveSpendingLimitModal from './RemoveSpendingLimitModal'
+import { useStyles } from './style'
+import { fromTokenUnit } from './utils'
+
+const StyledImage = styled.img`
+  width: 32px;
+  height: 32px;
+  object-fit: contain;
+  margin: 0 8px 0 0;
+`
+const StyledImageName = styled.div`
+  display: flex;
+  align-items: center;
+`
+const TableActionButton = styled(Button)`
+  background-color: transparent;
+  padding: 0;
+
+  &:hover {
+    background-color: transparent;
+  }
+`
+type SpentInfo = {
+  token: Token
+  spent: string
+  amount: string
+}
+
+interface HumanReadableSpentProps {
+  spent: string
+  amount: string
+  tokenAddress: string
+}
+
+const HumanReadableSpent = ({ spent, amount, tokenAddress }: HumanReadableSpentProps): React.ReactElement => {
+  const tokens = useSelector(extendedSafeTokensSelector)
+  const { width } = useWindowDimensions()
+  const [spentInfo, setSpentInfo] = React.useState<SpentInfo>()
+
+  React.useEffect(() => {
+    if (tokens) {
+      const safeTokenAddress = tokenAddress === ZERO_ADDRESS ? ETH_ADDRESS : tokenAddress
+      const token = tokens.find((token) => token.address === safeTokenAddress)
+      const formattedSpent = formatAmount(fromTokenUnit(spent, token.decimals)).toString()
+      const formattedAmount = formatAmount(fromTokenUnit(amount, token.decimals)).toString()
+
+      setSpentInfo({ token, spent: formattedSpent, amount: formattedAmount })
+    }
+  }, [amount, spent, tokenAddress, tokens])
+
+  return spentInfo ? (
+    <StyledImageName>
+      {width > 1024 && (
+        <StyledImage alt={spentInfo.token.name} onError={setImageToPlaceholder} src={spentInfo.token.logoUri} />
+      )}
+      <Text size="lg">{`${spentInfo.spent} of ${spentInfo.amount} ${spentInfo.token.symbol}`}</Text>
+    </StyledImageName>
+  ) : null
+}
+
+interface SpendingLimitTableProps {
+  data?: SpendingLimitTable[]
+}
+
+const LimitsTable = ({ data }: SpendingLimitTableProps): React.ReactElement => {
+  const classes = useStyles()
+  const granted = useSelector(grantedSelector)
+  const addressBook = useSelector(getAddressBook)
+
+  const columns = generateColumns()
+  const autoColumns = columns.filter(({ custom }) => !custom)
+
+  const [cut, setCut] = React.useState(undefined)
+  const { width } = useWindowDimensions()
+  React.useEffect(() => {
+    if (width <= 1024) {
+      setCut(4)
+    } else {
+      setCut(8)
+    }
+  }, [width])
+
+  const [showRemoveSpendingLimitModal, setShowRemoveSpendingLimitModal] = React.useState(false)
+  const [selectedRow, setSelectedRow] = React.useState<SpendingLimitTable>(null)
+  const openRemoveSpendingLimitModal = (row: SpendingLimitTable) => {
+    setSelectedRow(row)
+    setShowRemoveSpendingLimitModal(true)
+  }
+  const closeRemoveSpendingLimitModal = () => {
+    setShowRemoveSpendingLimitModal(false)
+    setSelectedRow(null)
+  }
+  const handleDeleteSpendingLimit = (row: SpendingLimitTable): void => {
+    openRemoveSpendingLimitModal(row)
+  }
+
+  return (
+    <>
+      <TableContainer style={{ minHeight: '420px' }}>
+        <Table
+          columns={columns}
+          data={data}
+          defaultFixed
+          defaultOrderBy={SPENDING_LIMIT_TABLE_BENEFICIARY_ID}
+          defaultRowsPerPage={5}
+          label="Spending Limits"
+          noBorder
+          size={data.length}
+        >
+          {(sortedData) =>
+            sortedData.map((row, index) => (
+              <TableRow
+                className={cn(classes.hide, index >= 3 && index === sortedData.size - 1 && classes.noBorderBottom)}
+                data-testid="spending-limit-table-row"
+                key={index}
+                tabIndex={-1}
+              >
+                {autoColumns.map((column, index) => {
+                  const columnId = column.id
+                  const rowElement = row[columnId]
+
+                  return (
+                    <TableCell align={column.align} component="td" key={`${columnId}-${index}`}>
+                      {columnId === SPENDING_LIMIT_TABLE_BENEFICIARY_ID && (
+                        <EthHashInfo
+                          hash={rowElement}
+                          name={addressBook ? getNameFromAdbk(addressBook, rowElement) : ''}
+                          showCopyBtn
+                          showEtherscanBtn
+                          showIdenticon
+                          textSize="lg"
+                          shortenHash={cut}
+                          network={getNetwork()}
+                        />
+                      )}
+
+                      {columnId === SPENDING_LIMIT_TABLE_SPENT_ID && <HumanReadableSpent {...rowElement} />}
+                      {columnId === SPENDING_LIMIT_TABLE_RESET_TIME_ID && (
+                        <Text size="lg">{rowElement.relativeTime}</Text>
+                      )}
+                    </TableCell>
+                  )
+                })}
+                <TableCell component="td">
+                  <Row align="end" className={classes.actions}>
+                    {granted && (
+                      <TableActionButton
+                        size="md"
+                        iconType="delete"
+                        color="error"
+                        variant="outlined"
+                        onClick={() => handleDeleteSpendingLimit(row)}
+                        data-testid="remove-action"
+                      >
+                        {null}
+                      </TableActionButton>
+                    )}
+                  </Row>
+                </TableCell>
+              </TableRow>
+            ))
+          }
+        </Table>
+      </TableContainer>
+      {showRemoveSpendingLimitModal && (
+        <RemoveSpendingLimitModal onClose={closeRemoveSpendingLimitModal} spendingLimit={selectedRow} open={true} />
+      )}
+    </>
+  )
+}
+
+export default LimitsTable
diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 744930b328..312e77e2e3 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -1,6 +1,4 @@
-import { Button, EthHashInfo, Text, Title } from '@gnosis.pm/safe-react-components'
-import TableContainer from '@material-ui/core/TableContainer'
-import cn from 'classnames'
+import { Button, Text, Title } from '@gnosis.pm/safe-react-components'
 import React from 'react'
 import { useSelector } from 'react-redux'
 import styled from 'styled-components'
@@ -8,39 +6,15 @@ import styled from 'styled-components'
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
 import Row from 'src/components/layout/Row'
-import { TableCell, TableRow } from 'src/components/layout/Table'
-import Table from 'src/components/Table'
-import { getNetwork } from 'src/config'
-import { getAddressBook } from 'src/logic/addressBook/store/selectors'
-import { getNameFromAdbk } from 'src/logic/addressBook/utils'
 import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
-import { Token } from 'src/logic/tokens/store/model/token'
-import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
-import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
-import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
-import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
 import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
-import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 
-import {
-  generateColumns,
-  getSpendingLimitData,
-  SPENDING_LIMIT_TABLE_BENEFICIARY_ID,
-  SPENDING_LIMIT_TABLE_RESET_TIME_ID,
-  SPENDING_LIMIT_TABLE_SPENT_ID,
-  SpendingLimitTable,
-} from './dataFetcher'
-import RemoveSpendingLimitModal from './RemoveSpendingLimitModal'
+import { getSpendingLimitData, SpendingLimitTable } from './dataFetcher'
+import LimitsTable from './LimitsTable'
 import SpendingLimitModal from './SpendingLimitModal'
 import SpendingLimitSteps from './SpendingLimitSteps'
 import { useStyles } from './style'
-import {
-  fromTokenUnit,
-  requestAllowancesByDelegatesAndTokens,
-  requestModuleData,
-  requestTokensByDelegate,
-  SpendingLimitRow,
-} from './utils'
+import { requestAllowancesByDelegatesAndTokens, requestModuleData, requestTokensByDelegate } from './utils'
 
 const InfoText = styled(Text)`
   margin-top: 16px;
@@ -81,99 +55,24 @@ export const FooterWrapper = styled.div`
   justify-content: space-around;
 `
 
-const StyledImage = styled.img`
-  width: 32px;
-  height: 32px;
-  object-fit: contain;
-  margin: 0 8px 0 0;
-`
-
-const StyledImageName = styled.div`
-  display: flex;
-  align-items: center;
-`
-
-const TableActionButton = styled(Button)`
-  background-color: transparent;
-  padding: 0;
-
-  &:hover {
-    background-color: transparent;
-  }
-`
-
-type SpentInfo = {
-  token: Token
-  spent: string
-  amount: string
-}
-
-interface HumanReadableSpentProps {
-  spent: string
-  amount: string
-  tokenAddress: string
-}
-
-const HumanReadableSpent = ({ spent, amount, tokenAddress }: HumanReadableSpentProps): React.ReactElement => {
-  const tokens = useSelector(extendedSafeTokensSelector)
-  const { width } = useWindowDimensions()
-  const [spentInfo, setSpentInfo] = React.useState<SpentInfo>()
-
-  React.useEffect(() => {
-    if (tokens) {
-      const safeTokenAddress = tokenAddress === ZERO_ADDRESS ? ETH_ADDRESS : tokenAddress
-      const token = tokens.find((token) => token.address === safeTokenAddress)
-      const formattedSpent = formatAmount(fromTokenUnit(spent, token.decimals)).toString()
-      const formattedAmount = formatAmount(fromTokenUnit(amount, token.decimals)).toString()
-
-      setSpentInfo({ token, spent: formattedSpent, amount: formattedAmount })
-    }
-  }, [amount, spent, tokenAddress, tokens])
-
-  return spentInfo ? (
-    <StyledImageName>
-      {width > 1024 && (
-        <StyledImage alt={spentInfo.token.name} onError={setImageToPlaceholder} src={spentInfo.token.logoUri} />
-      )}
-      <Text size="lg">{`${spentInfo.spent} of ${spentInfo.amount} ${spentInfo.token.symbol}`}</Text>
-    </StyledImageName>
-  ) : null
-}
-
 const SpendingLimitSettings = (): React.ReactElement => {
   const classes = useStyles()
   const granted = useSelector(grantedSelector)
   const tokens = useSelector(extendedSafeTokensSelector)
-  const addressBook = useSelector(getAddressBook)
 
   // TODO: Refactor `delegates` for better performance. This is just to verify allowance works
   const safeAddress = useSelector(safeParamAddressFromStateSelector)
-  const [spendingLimits, setSpendingLimits] = React.useState<SpendingLimitRow[]>()
-  const [spendingLimitData, setSpendingLimitData] = React.useState<SpendingLimitTable[] | undefined>()
+  const [spendingLimitData, setSpendingLimitData] = React.useState<SpendingLimitTable[]>()
   React.useEffect(() => {
     const doRequestData = async () => {
       const [, delegates] = await requestModuleData(safeAddress)
       const tokensByDelegate = await requestTokensByDelegate(safeAddress, delegates.results)
       const allowances = await requestAllowancesByDelegatesAndTokens(safeAddress, tokensByDelegate)
-      setSpendingLimits(allowances)
       setSpendingLimitData(getSpendingLimitData(allowances))
     }
     doRequestData()
   }, [safeAddress, tokens])
 
-  const [cut, setCut] = React.useState(undefined)
-  const { width } = useWindowDimensions()
-  React.useEffect(() => {
-    if (width <= 1024) {
-      setCut(4)
-    } else {
-      setCut(8)
-    }
-  }, [width])
-
-  const columns = generateColumns()
-  const autoColumns = columns.filter(({ custom }) => !custom)
-
   const [showNewSpendingLimitModal, setShowNewSpendingLimitModal] = React.useState(false)
   const openNewSpendingLimitModal = () => {
     setShowNewSpendingLimitModal(true)
@@ -182,20 +81,6 @@ const SpendingLimitSettings = (): React.ReactElement => {
     setShowNewSpendingLimitModal(false)
   }
 
-  const [showRemoveSpendingLimitModal, setShowRemoveSpendingLimitModal] = React.useState(false)
-  const [selectedRow, setSelectedRow] = React.useState<SpendingLimitTable>(null)
-  const openRemoveSpendingLimitModal = (row: SpendingLimitTable) => {
-    setSelectedRow(row)
-    setShowRemoveSpendingLimitModal(true)
-  }
-  const closeRemoveSpendingLimitModal = () => {
-    setShowRemoveSpendingLimitModal(false)
-    setSelectedRow(null)
-  }
-  const handleDeleteSpendingLimit = (row: SpendingLimitTable): void => {
-    openRemoveSpendingLimitModal(row)
-  }
-
   return (
     <>
       <Block className={classes.container}>
@@ -206,76 +91,7 @@ const SpendingLimitSettings = (): React.ReactElement => {
           You can set rules for specific beneficiaries to access funds from this Safe without having to collect all
           signatures.
         </InfoText>
-        {spendingLimits?.length && spendingLimitData?.length ? (
-          <TableContainer style={{ minHeight: '420px' }}>
-            <Table
-              columns={columns}
-              data={spendingLimitData}
-              defaultFixed
-              defaultOrderBy={SPENDING_LIMIT_TABLE_BENEFICIARY_ID}
-              defaultRowsPerPage={5}
-              label="Spending Limits"
-              noBorder
-              size={spendingLimitData.length}
-            >
-              {(sortedData) =>
-                sortedData.map((row, index) => (
-                  <TableRow
-                    className={cn(classes.hide, index >= 3 && index === sortedData.size - 1 && classes.noBorderBottom)}
-                    data-testid="spending-limit-table-row"
-                    key={index}
-                    tabIndex={-1}
-                  >
-                    {autoColumns.map((column, index) => {
-                      const columnId = column.id
-                      const rowElement = row[columnId]
-
-                      return (
-                        <TableCell align={column.align} component="td" key={`${columnId}-${index}`}>
-                          {columnId === SPENDING_LIMIT_TABLE_BENEFICIARY_ID && (
-                            <EthHashInfo
-                              hash={rowElement}
-                              name={addressBook ? getNameFromAdbk(addressBook, rowElement) : ''}
-                              showCopyBtn
-                              showEtherscanBtn
-                              showIdenticon
-                              textSize="lg"
-                              shortenHash={cut}
-                              network={getNetwork()}
-                            />
-                          )}
-
-                          {columnId === SPENDING_LIMIT_TABLE_SPENT_ID && <HumanReadableSpent {...rowElement} />}
-                          {columnId === SPENDING_LIMIT_TABLE_RESET_TIME_ID && (
-                            <Text size="lg">{rowElement.relativeTime}</Text>
-                          )}
-                        </TableCell>
-                      )
-                    })}
-                    <TableCell component="td">
-                      <Row align="end" className={classes.actions}>
-                        {granted && (
-                          <TableActionButton
-                            size="md"
-                            iconType="delete"
-                            color="error"
-                            variant="outlined"
-                            onClick={() => handleDeleteSpendingLimit(row)}
-                            data-testid="remove-action"
-                          >
-                            {null}
-                          </TableActionButton>
-                        )}
-                      </Row>
-                    </TableCell>
-                  </TableRow>
-                ))
-              }
-            </Table>
-          </TableContainer>
-        ) : (
-          <SpendingLimitSteps />
-        )}
+        {spendingLimitData?.length ? <LimitsTable data={spendingLimitData} /> : <SpendingLimitSteps />}
       </Block>
 
       {granted && (
@@ -297,9 +113,6 @@ const SpendingLimitSettings = (): React.ReactElement => {
           {showNewSpendingLimitModal && <SpendingLimitModal close={closeNewSpendingLimitModal} open={true} />}
         </>
       )}
-      {showRemoveSpendingLimitModal && (
-        <RemoveSpendingLimitModal onClose={closeRemoveSpendingLimitModal} spendingLimit={selectedRow} open={true} />
-      )}
     </>
   )
 }

From ed87c7e96b2f3c6609ef0ab0a5c72afd149690f6 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 09:57:07 -0300
Subject: [PATCH 47/69] refactor: use common data display components

---
 .../RemoveSpendingLimitModal.tsx              | 162 ++++--------------
 .../SpendingLimit/ReviewSpendingLimit.tsx     |   2 +-
 2 files changed, 31 insertions(+), 133 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/RemoveSpendingLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/RemoveSpendingLimitModal.tsx
index cd5a0c44f7..0eea238393 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/RemoveSpendingLimitModal.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/RemoveSpendingLimitModal.tsx
@@ -1,18 +1,11 @@
-import { Button, EthHashInfo, Icon, IconText, Text, Title } from '@gnosis.pm/safe-react-components'
-import { Skeleton } from '@material-ui/lab'
+import { Button, Icon, Title } from '@gnosis.pm/safe-react-components'
 import { useSnackbar } from 'notistack'
 import React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import { fromTokenUnit } from 'src/routes/safe/components/Settings/SpendingLimit/utils'
-import styled from 'styled-components'
 
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
-import Row from 'src/components/layout/Row'
 import Modal from 'src/components/Modal'
-import { getNetwork } from 'src/config'
-import { getAddressBook } from 'src/logic/addressBook/store/selectors'
-import { getNameFromAdbk } from 'src/logic/addressBook/utils'
 import createTransaction from 'src/logic/safe/store/actions/createTransaction'
 import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
 import { TX_NOTIFICATION_TYPES } from 'src/logic/safe/transactions'
@@ -20,132 +13,18 @@ import { Token } from 'src/logic/tokens/store/model/token'
 import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
 import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
 import { getWeb3 } from 'src/logic/wallets/getWeb3'
-import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
-import {
-  FooterSection,
-  FooterWrapper,
-  StyledButton,
-  TitleSection,
-} from 'src/routes/safe/components/Settings/SpendingLimit'
-import { RESET_TIME_OPTIONS } from 'src/routes/safe/components/Settings/SpendingLimit/ResetTime'
 import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
 import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
-import { ResetTimeInfo as ResetTimeInfoType, SpendingLimitTable } from './dataFetcher'
 
+import { FooterSection, FooterWrapper, StyledButton, TitleSection } from '.'
+import AddressInfo from './AddressInfo'
+import { SpendingLimitTable } from './dataFetcher'
+import { RESET_TIME_OPTIONS } from './ResetTime'
+import ResetTimeInfo from './ResetTimeInfo'
 import { useStyles } from './style'
-
-const StyledImage = styled.img`
-  width: 32px;
-  height: 32px;
-  object-fit: contain;
-  margin: 0 8px 0 0;
-`
-
-const StyledImageName = styled.div`
-  display: flex;
-  align-items: center;
-`
-
-interface GenericInfoProps {
-  title?: string
-  children: React.ReactNode
-}
-
-const GenericInfo = ({ title, children }: GenericInfoProps): React.ReactElement => (
-  <>
-    {title && (
-      <Text size="lg" color="secondaryLight">
-        {title}
-      </Text>
-    )}
-    {children ?? <Skeleton animation="wave" variant="rect" />}
-  </>
-)
-
-interface AddressInfoProps {
-  title?: string
-  address: string
-}
-
-const AddressInfo = ({ title, address }: AddressInfoProps): React.ReactElement => {
-  const addressBook = useSelector(getAddressBook)
-
-  return (
-    <GenericInfo title={title}>
-      {addressBook && (
-        <EthHashInfo
-          hash={address}
-          name={addressBook ? getNameFromAdbk(addressBook, address) : ''}
-          showCopyBtn
-          showEtherscanBtn
-          showIdenticon
-          textSize="lg"
-          network={getNetwork()}
-        />
-      )}
-    </GenericInfo>
-  )
-}
-
-interface TokenInfoProps {
-  title?: string
-  amount: string
-  address: string
-}
-
-const TokenInfo = ({ title, amount, address }: TokenInfoProps): React.ReactElement => {
-  const tokens = useSelector(extendedSafeTokensSelector)
-  const [token, setToken] = React.useState<Token | null>()
-
-  React.useEffect(() => {
-    if (tokens) {
-      const tokenAddress = address === ZERO_ADDRESS ? ETH_ADDRESS : address
-      const foundToken = tokens.find((token) => token.address === tokenAddress)
-      setToken(foundToken ?? null)
-    }
-  }, [address, tokens])
-
-  return (
-    <GenericInfo title={title}>
-      {token && (
-        <StyledImageName>
-          <StyledImage alt={token.name} onError={setImageToPlaceholder} src={token.logoUri} />
-          <Text size="lg">
-            {fromTokenUnit(amount, token.decimals)} {token.symbol}
-          </Text>
-        </StyledImageName>
-      )}
-      {token === null && <Text size="lg">No token info</Text>}
-    </GenericInfo>
-  )
-}
-
-interface ResetTimeInfoProps {
-  title?: string
-  resetTime: ResetTimeInfoType
-}
-
-const ResetTimeInfo = ({ title, resetTime }: ResetTimeInfoProps): React.ReactElement => {
-  return (
-    <GenericInfo title={title}>
-      {resetTime.resetTimeMin !== '0' ? (
-        <Row align="center" margin="md">
-          <IconText
-            iconSize="md"
-            iconType="fuelIndicator"
-            text={RESET_TIME_OPTIONS.find(({ value }) => +value === +resetTime.resetTimeMin / 24 / 60).label}
-            textSize="lg"
-          />
-        </Row>
-      ) : (
-        <Row align="center" margin="md">
-          <Text size="lg">One-time spending limit allowance</Text>
-        </Row>
-      )}
-    </GenericInfo>
-  )
-}
+import TokenInfo from './TokenInfo'
+import { fromTokenUnit } from './utils'
 
 interface RemoveSpendingLimitModalProps {
   onClose: () => void
@@ -160,8 +39,18 @@ const RemoveSpendingLimitModal = ({
 }: RemoveSpendingLimitModalProps): React.ReactElement => {
   const classes = useStyles()
 
-  const safeAddress = useSelector(safeParamAddressFromStateSelector)
+  const tokens = useSelector(extendedSafeTokensSelector)
+  const [tokenInfo, setTokenInfo] = React.useState<Token>()
+  React.useEffect(() => {
+    if (tokens) {
+      const tokenAddress =
+        spendingLimit.spent.tokenAddress === ZERO_ADDRESS ? ETH_ADDRESS : spendingLimit.spent.tokenAddress
+      const foundToken = tokens.find((token) => token.address === tokenAddress)
+      setTokenInfo(foundToken)
+    }
+  }, [spendingLimit.spent.tokenAddress, tokens])
 
+  const safeAddress = useSelector(safeParamAddressFromStateSelector)
   const { enqueueSnackbar, closeSnackbar } = useSnackbar()
   const dispatch = useDispatch()
 
@@ -200,6 +89,9 @@ const RemoveSpendingLimitModal = ({
     }
   }
 
+  const resetTimeLabel =
+    RESET_TIME_OPTIONS.find(({ value }) => +value === +spendingLimit.resetTime.resetTimeMin / 24 / 60)?.label ?? ''
+
   return (
     <Modal
       description="Remove the selected Spending Limit"
@@ -223,10 +115,16 @@ const RemoveSpendingLimitModal = ({
           <AddressInfo title="Beneficiary" address={spendingLimit.beneficiary} />
         </Col>
         <Col margin="lg">
-          <TokenInfo title="Amount" amount={spendingLimit.spent.amount} address={spendingLimit.spent.tokenAddress} />
+          {tokenInfo && (
+            <TokenInfo
+              amount={fromTokenUnit(spendingLimit.spent.amount, tokenInfo.decimals)}
+              title="Amount"
+              token={tokenInfo}
+            />
+          )}
         </Col>
         <Col margin="lg">
-          <ResetTimeInfo title="Reset Time" resetTime={spendingLimit.resetTime} />
+          <ResetTimeInfo title="Reset Time" label={resetTimeLabel} />
         </Col>
       </Block>
 
diff --git a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx b/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
index 908bc4676a..4f4c26edb1 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
@@ -126,7 +126,7 @@ const ReviewSpendingLimit = ({ onBack, onClose, txToken, values }: ReviewSpendin
   }
 
   const resetTimeLabel = values.withResetTime
-    ? RESET_TIME_OPTIONS.find(({ value }) => value === values.resetTime).label
+    ? RESET_TIME_OPTIONS.find(({ value }) => value === values.resetTime)?.label
     : ''
 
   const previousResetTime = (previousSpendingLimit: SpendingLimit) =>

From dacfc4a2f153b66b4970bef0d01cc6bdea626aaf Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 10:44:42 -0300
Subject: [PATCH 48/69] refactor: reorg files and rename components

---
 .../SpendingLimit/{ => FormFields}/Amount.tsx      |  6 ++++--
 .../Beneficiary.tsx}                               |  6 +++---
 .../SpendingLimit/{ => FormFields}/ResetTime.tsx   |  2 +-
 .../{TokenSelect.tsx => FormFields/Token.tsx}      |  4 ++--
 .../Settings/SpendingLimit/FormFields/index.ts     |  6 ++++++
 .../{ => InfoDisplay}/AddressInfo.tsx              |  0
 .../{ => InfoDisplay}/DataDisplay.tsx              |  0
 .../{ => InfoDisplay}/ResetTimeInfo.tsx            |  0
 .../SpendingLimit/{ => InfoDisplay}/TokenInfo.tsx  |  0
 .../Settings/SpendingLimit/InfoDisplay/index.ts    |  6 ++++++
 .../Settings/SpendingLimit/LimitsTable.tsx         |  4 ++--
 .../{NewSpendingLimit.tsx => NewLimit.tsx}         | 13 +++++--------
 .../{SpendingLimitModal.tsx => NewLimitModal.tsx}  | 12 ++++++------
 ...{ReviewSpendingLimit.tsx => NewLimitReview.tsx} | 10 ++++------
 .../{SpendingLimitSteps.tsx => NewLimitSteps.tsx}  |  4 ++--
 ...SpendingLimitModal.tsx => RemoveLimitModal.tsx} | 14 ++++----------
 .../components/Settings/SpendingLimit/index.tsx    |  8 ++++----
 17 files changed, 49 insertions(+), 46 deletions(-)
 rename src/routes/safe/components/Settings/SpendingLimit/{ => FormFields}/Amount.tsx (90%)
 rename src/routes/safe/components/Settings/SpendingLimit/{BeneficiarySelect.tsx => FormFields/Beneficiary.tsx} (94%)
 rename src/routes/safe/components/Settings/SpendingLimit/{ => FormFields}/ResetTime.tsx (97%)
 rename src/routes/safe/components/Settings/SpendingLimit/{TokenSelect.tsx => FormFields/Token.tsx} (87%)
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/FormFields/index.ts
 rename src/routes/safe/components/Settings/SpendingLimit/{ => InfoDisplay}/AddressInfo.tsx (100%)
 rename src/routes/safe/components/Settings/SpendingLimit/{ => InfoDisplay}/DataDisplay.tsx (100%)
 rename src/routes/safe/components/Settings/SpendingLimit/{ => InfoDisplay}/ResetTimeInfo.tsx (100%)
 rename src/routes/safe/components/Settings/SpendingLimit/{ => InfoDisplay}/TokenInfo.tsx (100%)
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/index.ts
 rename src/routes/safe/components/Settings/SpendingLimit/{NewSpendingLimit.tsx => NewLimit.tsx} (88%)
 rename src/routes/safe/components/Settings/SpendingLimit/{SpendingLimitModal.tsx => NewLimitModal.tsx} (77%)
 rename src/routes/safe/components/Settings/SpendingLimit/{ReviewSpendingLimit.tsx => NewLimitReview.tsx} (95%)
 rename src/routes/safe/components/Settings/SpendingLimit/{SpendingLimitSteps.tsx => NewLimitSteps.tsx} (95%)
 rename src/routes/safe/components/Settings/SpendingLimit/{RemoveSpendingLimitModal.tsx => RemoveLimitModal.tsx} (93%)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx b/src/routes/safe/components/Settings/SpendingLimit/FormFields/Amount.tsx
similarity index 90%
rename from src/routes/safe/components/Settings/SpendingLimit/Amount.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/FormFields/Amount.tsx
index aeb1a407ff..9b4a935f68 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/Amount.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/FormFields/Amount.tsx
@@ -8,7 +8,7 @@ import GnoField from 'src/components/forms/Field'
 import { composeValidators, minValue, mustBeFloat, required } from 'src/components/forms/validator'
 import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
 
-import { useStyles } from './style'
+import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
 
 export const Field = styled(GnoField)`
   margin: 8px 0;
@@ -23,7 +23,7 @@ const TextField = styled(SRCTextField)`
   margin: 0;
 `
 
-export const Amount = (): React.ReactElement => {
+const Amount = (): React.ReactElement => {
   const classes = useStyles()
 
   const {
@@ -54,3 +54,5 @@ export const Amount = (): React.ReactElement => {
     </AmountInput>
   )
 }
+
+export default Amount
diff --git a/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx b/src/routes/safe/components/Settings/SpendingLimit/FormFields/Beneficiary.tsx
similarity index 94%
rename from src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/FormFields/Beneficiary.tsx
index dc5151a7b3..5b519a3f40 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/BeneficiarySelect.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/FormFields/Beneficiary.tsx
@@ -10,7 +10,7 @@ import { getAddressBook } from 'src/logic/addressBook/store/selectors'
 import { getNameFromAdbk } from 'src/logic/addressBook/utils'
 import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/screens/AddressBookInput'
 
-import { KEYCODES } from './utils'
+import { KEYCODES } from 'src/routes/safe/components/Settings/SpendingLimit/utils'
 
 const BeneficiaryInput = styled.div`
   grid-area: beneficiaryInput;
@@ -20,7 +20,7 @@ const BeneficiaryScan = styled.div`
   grid-area: beneficiaryScan;
 `
 
-const BeneficiarySelect = (): React.ReactElement => {
+const Beneficiary = (): React.ReactElement => {
   const { initialValues } = useFormState()
   const { mutators } = useForm()
 
@@ -102,4 +102,4 @@ const BeneficiarySelect = (): React.ReactElement => {
   )
 }
 
-export default BeneficiarySelect
+export default Beneficiary
diff --git a/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx b/src/routes/safe/components/Settings/SpendingLimit/FormFields/ResetTime.tsx
similarity index 97%
rename from src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/FormFields/ResetTime.tsx
index d436044a8a..46c5c033b3 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/ResetTime.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/FormFields/ResetTime.tsx
@@ -4,7 +4,7 @@ import React from 'react'
 import { useField } from 'react-final-form'
 import styled from 'styled-components'
 
-import { Field } from './Amount'
+import { Field } from 'src/routes/safe/components/Settings/SpendingLimit/FormFields/Amount'
 
 // TODO: propose refactor in safe-react-components based on this requirements
 const SpendingLimitRadioButtons = styled(RadioButtons)`
diff --git a/src/routes/safe/components/Settings/SpendingLimit/TokenSelect.tsx b/src/routes/safe/components/Settings/SpendingLimit/FormFields/Token.tsx
similarity index 87%
rename from src/routes/safe/components/Settings/SpendingLimit/TokenSelect.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/FormFields/Token.tsx
index 276a84e666..381229c4ff 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/TokenSelect.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/FormFields/Token.tsx
@@ -8,7 +8,7 @@ const TokenInput = styled.div`
   grid-area: tokenInput;
 `
 
-const TokenSelect = (): React.ReactElement => {
+const Token = (): React.ReactElement => {
   const tokens = useSelector(extendedSafeTokensSelector)
 
   return (
@@ -18,4 +18,4 @@ const TokenSelect = (): React.ReactElement => {
   )
 }
 
-export default TokenSelect
+export default Token
diff --git a/src/routes/safe/components/Settings/SpendingLimit/FormFields/index.ts b/src/routes/safe/components/Settings/SpendingLimit/FormFields/index.ts
new file mode 100644
index 0000000000..555ac53768
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/FormFields/index.ts
@@ -0,0 +1,6 @@
+import Amount from './Amount'
+import Beneficiary from './Beneficiary'
+import ResetTime from './ResetTime'
+import Token from './Token'
+
+export { Amount, Beneficiary, ResetTime, Token }
diff --git a/src/routes/safe/components/Settings/SpendingLimit/AddressInfo.tsx b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx
similarity index 100%
rename from src/routes/safe/components/Settings/SpendingLimit/AddressInfo.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx
diff --git a/src/routes/safe/components/Settings/SpendingLimit/DataDisplay.tsx b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/DataDisplay.tsx
similarity index 100%
rename from src/routes/safe/components/Settings/SpendingLimit/DataDisplay.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/DataDisplay.tsx
diff --git a/src/routes/safe/components/Settings/SpendingLimit/ResetTimeInfo.tsx b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/ResetTimeInfo.tsx
similarity index 100%
rename from src/routes/safe/components/Settings/SpendingLimit/ResetTimeInfo.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/ResetTimeInfo.tsx
diff --git a/src/routes/safe/components/Settings/SpendingLimit/TokenInfo.tsx b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/TokenInfo.tsx
similarity index 100%
rename from src/routes/safe/components/Settings/SpendingLimit/TokenInfo.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/TokenInfo.tsx
diff --git a/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/index.ts b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/index.ts
new file mode 100644
index 0000000000..2d6b7eb13d
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/index.ts
@@ -0,0 +1,6 @@
+import AddressInfo from './AddressInfo'
+import ResetTimeInfo from './ResetTimeInfo'
+import TokenInfo from './TokenInfo'
+
+export { AddressInfo, ResetTimeInfo, TokenInfo }
+export default './DataDisplay'
diff --git a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx
index 778e96002b..e1853b2e29 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx
@@ -26,7 +26,7 @@ import {
   SPENDING_LIMIT_TABLE_SPENT_ID,
   SpendingLimitTable,
 } from './dataFetcher'
-import RemoveSpendingLimitModal from './RemoveSpendingLimitModal'
+import RemoveLimitModal from 'src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal'
 import { useStyles } from './style'
 import { fromTokenUnit } from './utils'
 
@@ -191,7 +191,7 @@ const LimitsTable = ({ data }: SpendingLimitTableProps): React.ReactElement => {
         </Table>
       </TableContainer>
       {showRemoveSpendingLimitModal && (
-        <RemoveSpendingLimitModal onClose={closeRemoveSpendingLimitModal} spendingLimit={selectedRow} open={true} />
+        <RemoveLimitModal onClose={closeRemoveSpendingLimitModal} spendingLimit={selectedRow} open={true} />
       )}
     </>
   )
diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimit.tsx
similarity index 88%
rename from src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/NewLimit.tsx
index b5276a05a3..ef80663aec 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimit.tsx
@@ -6,11 +6,8 @@ import styled from 'styled-components'
 import GnoForm from 'src/components/forms/GnoForm'
 import GnoButton from 'src/components/layout/Button'
 
-import { Amount } from './Amount'
-import BeneficiarySelect from './BeneficiarySelect'
 import { TitleSection, StyledButton, FooterSection, FooterWrapper } from '.'
-import ResetTime from './ResetTime'
-import TokenSelect from './TokenSelect'
+import { Amount, Beneficiary, ResetTime, Token } from './FormFields'
 
 const FormContainer = styled.div`
   padding: 24px;
@@ -60,7 +57,7 @@ const canReview = ({ invalid, submitting, dirtyFieldsSinceLastSubmit, values }):
   )
 }
 
-const NewSpendingLimit = ({ initialValues, onCancel, onReview }: NewSpendingLimitProps): React.ReactElement => (
+const NewLimit = ({ initialValues, onCancel, onReview }: NewSpendingLimitProps): React.ReactElement => (
   <>
     <TitleSection>
       <Title size="xs" withoutMargin>
@@ -79,8 +76,8 @@ const NewSpendingLimit = ({ initialValues, onCancel, onReview }: NewSpendingLimi
       {(...args) => (
         <>
           <FormContainer>
-            <BeneficiarySelect />
-            <TokenSelect />
+            <Beneficiary />
+            <Token />
             <Amount />
             <ResetTime />
           </FormContainer>
@@ -109,4 +106,4 @@ const NewSpendingLimit = ({ initialValues, onCancel, onReview }: NewSpendingLimi
   </>
 )
 
-export default NewSpendingLimit
+export default NewLimit
diff --git a/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx
similarity index 77%
rename from src/routes/safe/components/Settings/SpendingLimit/SpendingLimitModal.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx
index 05a765ffb6..620e4abed4 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitModal.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx
@@ -2,8 +2,8 @@ import React from 'react'
 import { useSelector } from 'react-redux'
 import GnoModal from 'src/components/Modal'
 import { Token } from 'src/logic/tokens/store/model/token'
-import NewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/NewSpendingLimit'
-import ReviewSpendingLimit from 'src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit'
+import NewLimit from 'src/routes/safe/components/Settings/SpendingLimit/NewLimit'
+import NewLimitReview from 'src/routes/safe/components/Settings/SpendingLimit/NewLimitReview'
 import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
 import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
 
@@ -56,7 +56,7 @@ interface SpendingLimitModalProps {
   open: boolean
 }
 
-const SpendingLimitModal = ({ close, open }: SpendingLimitModalProps): React.ReactElement => {
+const NewLimitModal = ({ close, open }: SpendingLimitModalProps): React.ReactElement => {
   const classes = useStyles()
 
   const tokens = useSelector(extendedSafeTokensSelector)
@@ -77,10 +77,10 @@ const SpendingLimitModal = ({ close, open }: SpendingLimitModalProps): React.Rea
       description="set rules for specific beneficiaries to access funds from this Safe without having to collect all signatures"
       paperClassName={classes.modal}
     >
-      {step === CREATE && <NewSpendingLimit initialValues={values} onCancel={close} onReview={handleReview} />}
-      {step === REVIEW && <ReviewSpendingLimit onBack={create} onClose={close} txToken={txToken} values={values} />}
+      {step === CREATE && <NewLimit initialValues={values} onCancel={close} onReview={handleReview} />}
+      {step === REVIEW && <NewLimitReview onBack={create} onClose={close} txToken={txToken} values={values} />}
     </GnoModal>
   )
 }
 
-export default SpendingLimitModal
+export default NewLimitModal
diff --git a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitReview.tsx
similarity index 95%
rename from src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/NewLimitReview.tsx
index 4f4c26edb1..16b8002425 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/ReviewSpendingLimit.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitReview.tsx
@@ -16,11 +16,9 @@ import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
 import { FooterSection, FooterWrapper, StyledButton, TitleSection } from '.'
-import AddressInfo from './AddressInfo'
-import { RESET_TIME_OPTIONS } from './ResetTime'
-import ResetTimeInfo from './ResetTimeInfo'
+import { AddressInfo, ResetTimeInfo, TokenInfo } from './InfoDisplay'
+import { RESET_TIME_OPTIONS } from 'src/routes/safe/components/Settings/SpendingLimit/FormFields/ResetTime'
 import { useStyles } from './style'
-import TokenInfo from './TokenInfo'
 import { currentMinutes, fromTokenUnit, SpendingLimitRow, toTokenUnit } from './utils'
 
 interface ReviewSpendingLimitProps {
@@ -31,7 +29,7 @@ interface ReviewSpendingLimitProps {
   existentSpendingLimit?: SpendingLimitRow
 }
 
-const ReviewSpendingLimit = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps): React.ReactElement => {
+const NewLimitReview = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps): React.ReactElement => {
   const classes = useStyles()
 
   const { enqueueSnackbar, closeSnackbar } = useSnackbar()
@@ -199,4 +197,4 @@ const ReviewSpendingLimit = ({ onBack, onClose, txToken, values }: ReviewSpendin
   )
 }
 
-export default ReviewSpendingLimit
+export default NewLimitReview
diff --git a/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitSteps.tsx
similarity index 95%
rename from src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/NewLimitSteps.tsx
index e1372d43c8..0e5b2e9566 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/SpendingLimitSteps.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitSteps.tsx
@@ -28,7 +28,7 @@ const StepsLine = styled.div`
   margin: 46px 0;
 `
 
-const SpendingLimitSteps = (): React.ReactElement => (
+const NewLimitSteps = (): React.ReactElement => (
   <StepWrapper>
     <Step>
       <Img alt="Select Beneficiary" title="Beneficiary" height={96} src={Beneficiary} />
@@ -76,4 +76,4 @@ const SpendingLimitSteps = (): React.ReactElement => (
   </StepWrapper>
 )
 
-export default SpendingLimitSteps
+export default NewLimitSteps
diff --git a/src/routes/safe/components/Settings/SpendingLimit/RemoveSpendingLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
similarity index 93%
rename from src/routes/safe/components/Settings/SpendingLimit/RemoveSpendingLimitModal.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
index 0eea238393..3170172bfb 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/RemoveSpendingLimitModal.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
@@ -18,12 +18,10 @@ import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
 import { FooterSection, FooterWrapper, StyledButton, TitleSection } from '.'
-import AddressInfo from './AddressInfo'
 import { SpendingLimitTable } from './dataFetcher'
-import { RESET_TIME_OPTIONS } from './ResetTime'
-import ResetTimeInfo from './ResetTimeInfo'
+import { AddressInfo, TokenInfo, ResetTimeInfo } from './InfoDisplay'
+import { RESET_TIME_OPTIONS } from 'src/routes/safe/components/Settings/SpendingLimit/FormFields/ResetTime'
 import { useStyles } from './style'
-import TokenInfo from './TokenInfo'
 import { fromTokenUnit } from './utils'
 
 interface RemoveSpendingLimitModalProps {
@@ -32,11 +30,7 @@ interface RemoveSpendingLimitModalProps {
   open: boolean
 }
 
-const RemoveSpendingLimitModal = ({
-  onClose,
-  spendingLimit,
-  open,
-}: RemoveSpendingLimitModalProps): React.ReactElement => {
+const RemoveLimitModal = ({ onClose, spendingLimit, open }: RemoveSpendingLimitModalProps): React.ReactElement => {
   const classes = useStyles()
 
   const tokens = useSelector(extendedSafeTokensSelector)
@@ -142,4 +136,4 @@ const RemoveSpendingLimitModal = ({
   )
 }
 
-export default RemoveSpendingLimitModal
+export default RemoveLimitModal
diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 312e77e2e3..e45f4b0063 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -11,8 +11,8 @@ import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/con
 
 import { getSpendingLimitData, SpendingLimitTable } from './dataFetcher'
 import LimitsTable from './LimitsTable'
-import SpendingLimitModal from './SpendingLimitModal'
-import SpendingLimitSteps from './SpendingLimitSteps'
+import NewLimitModal from 'src/routes/safe/components/Settings/SpendingLimit/NewLimitModal'
+import NewLimitSteps from 'src/routes/safe/components/Settings/SpendingLimit/NewLimitSteps'
 import { useStyles } from './style'
 import { requestAllowancesByDelegatesAndTokens, requestModuleData, requestTokensByDelegate } from './utils'
 
@@ -91,7 +91,7 @@ const SpendingLimitSettings = (): React.ReactElement => {
           You can set rules for specific beneficiaries to access funds from this Safe without having to collect all
           signatures.
         </InfoText>
-        {spendingLimitData?.length ? <LimitsTable data={spendingLimitData} /> : <SpendingLimitSteps />}
+        {spendingLimitData?.length ? <LimitsTable data={spendingLimitData} /> : <NewLimitSteps />}
       </Block>
 
       {granted && (
@@ -110,7 +110,7 @@ const SpendingLimitSettings = (): React.ReactElement => {
               </Button>
             </Col>
           </Row>
-          {showNewSpendingLimitModal && <SpendingLimitModal close={closeNewSpendingLimitModal} open={true} />}
+          {showNewSpendingLimitModal && <NewLimitModal close={closeNewSpendingLimitModal} open={true} />}
         </>
       )}
     </>

From 767ecb628cfedfa071e0f659f518cee47f87d2bd Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 12:32:52 -0300
Subject: [PATCH 49/69] refactor: move token discovery into hook

---
 .../Settings/SpendingLimit/NewLimitModal.tsx         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx
index 620e4abed4..2ff0de4198 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx
@@ -15,6 +15,7 @@ type Step = typeof CREATE | typeof REVIEW
 type SpendingLimitModalReducerState = {
   step: Step
   values: Record<string, string> | null
+  tokens: Token[]
   txToken: Token | null
 }
 
@@ -31,7 +32,9 @@ const newSpendingLimitReducer = (state: SpendingLimitModalReducerState, action)
 
     case REVIEW: {
       return {
+        ...state,
         ...newState,
+        txToken: state.tokens.find((token) => token.address === newState.values.token) ?? null,
         step: REVIEW,
       }
     }
@@ -39,9 +42,12 @@ const newSpendingLimitReducer = (state: SpendingLimitModalReducerState, action)
 }
 
 const useSpendingLimit = (initialStep: Step) => {
+  const tokens = useSelector(extendedSafeTokensSelector)
+
   const [state, dispatch] = React.useReducer(newSpendingLimitReducer, {
     step: initialStep,
     values: null,
+    tokens: tokens ?? [],
     txToken: null,
   })
 
@@ -59,14 +65,10 @@ interface SpendingLimitModalProps {
 const NewLimitModal = ({ close, open }: SpendingLimitModalProps): React.ReactElement => {
   const classes = useStyles()
 
-  const tokens = useSelector(extendedSafeTokensSelector)
   const [{ step, txToken, values }, { create, review }] = useSpendingLimit(CREATE)
 
   const handleReview = async (values) => {
-    review({
-      values,
-      txToken: tokens.find((token) => token.address === values.token),
-    })
+    review({ values })
   }
 
   return (

From 4b17b1748b769f700bf602fb4e880daa49ebfa38 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 14:13:12 -0300
Subject: [PATCH 50/69] fix: adjust amount to token's decimals

- also fixed how `toTokenUnit` converts values to tokenUnit
---
 .../Settings/SpendingLimit/NewLimitReview.tsx |  4 +--
 .../Settings/SpendingLimit/utils.ts           | 25 ++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitReview.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitReview.tsx
index 16b8002425..3580db0bb9 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitReview.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitReview.tsx
@@ -19,7 +19,7 @@ import { FooterSection, FooterWrapper, StyledButton, TitleSection } from '.'
 import { AddressInfo, ResetTimeInfo, TokenInfo } from './InfoDisplay'
 import { RESET_TIME_OPTIONS } from 'src/routes/safe/components/Settings/SpendingLimit/FormFields/ResetTime'
 import { useStyles } from './style'
-import { currentMinutes, fromTokenUnit, SpendingLimitRow, toTokenUnit } from './utils'
+import { adjustAmountToToken, currentMinutes, fromTokenUnit, SpendingLimitRow, toTokenUnit } from './utils'
 
 interface ReviewSpendingLimitProps {
   onBack: () => void
@@ -151,7 +151,7 @@ const NewLimitReview = ({ onBack, onClose, txToken, values }: ReviewSpendingLimi
           <AddressInfo address={values.beneficiary} title="Beneficiary" />
         </Col>
         <Col margin="lg">
-          <TokenInfo amount={values.amount} title="Amount" token={txToken} />
+          <TokenInfo amount={adjustAmountToToken(values.amount, txToken.decimals)} title="Amount" token={txToken} />
           {existentSpendingLimit && (
             <Text size="lg" color="error">
               Previous Amount: {existentSpendingLimit.amount}
diff --git a/src/routes/safe/components/Settings/SpendingLimit/utils.ts b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
index 3bb5b824fd..a6352fc637 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/utils.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
@@ -15,10 +15,29 @@ export const KEYCODES = {
 export const fromTokenUnit = (amount: string, decimals: string | number): string =>
   new BigNumber(amount).times(`1e-${decimals}`).toFixed()
 
-export const toTokenUnit = (amount: string, decimals: string | number): string =>
-  new BigNumber(amount).times(`1e${decimals}`).toFixed()
+export const toTokenUnit = (amount: string, decimals: string | number): string => {
+  const amountBN = new BigNumber(amount).times(`1e${decimals}`)
+  const [, amountDecimalPlaces] = amount.split('.')
 
-export const currentMinutes = () => Math.floor(Date.now() / (1000 * 60))
+  if (amountDecimalPlaces?.length >= +decimals) {
+    return amountBN.toFixed(0, BigNumber.ROUND_DOWN)
+  }
+
+  return amountBN.toFixed()
+}
+
+export const adjustAmountToToken = (amount: string, decimals: string | number): string => {
+  const amountBN = new BigNumber(amount)
+  const [, amountDecimalPlaces] = amount.split('.')
+
+  if (amountDecimalPlaces?.length >= 18) {
+    return amountBN.toFixed(+decimals, BigNumber.ROUND_DOWN)
+  }
+
+  return amountBN.toFixed()
+}
+
+export const currentMinutes = (): number => Math.floor(Date.now() / (1000 * 60))
 
 export const requestModuleData = (safeAddress: string): Promise<any[]> => {
   const batch = new web3ReadOnly.BatchRequest()

From a42a33c8127f74ff13730a5f4168b3877dba51dd Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 15:46:50 -0300
Subject: [PATCH 51/69] add typings and comments to the NewLimitModal component
 and helper functions

---
 .../Settings/SpendingLimit/NewLimitModal.tsx  | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx
index 2ff0de4198..a7392c644f 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx
@@ -1,5 +1,7 @@
+import { List } from 'immutable'
 import React from 'react'
 import { useSelector } from 'react-redux'
+
 import GnoModal from 'src/components/Modal'
 import { Token } from 'src/logic/tokens/store/model/token'
 import NewLimit from 'src/routes/safe/components/Settings/SpendingLimit/NewLimit'
@@ -12,15 +14,20 @@ const REVIEW = 'REVIEW' as const
 
 type Step = typeof CREATE | typeof REVIEW
 
-type SpendingLimitModalReducerState = {
-  step: Step
-  values: Record<string, string> | null
-  tokens: Token[]
-  txToken: Token | null
+type State = {
+  step?: Step
+  values?: Record<string, string> | null
+  txToken?: Token | null
+}
+
+type Action = {
+  type: Step
+  newState?: State
+  tokens?: List<Token>
 }
 
-const newSpendingLimitReducer = (state: SpendingLimitModalReducerState, action) => {
-  const { type, newState } = action
+const newLimitModalReducer = (state: State, action: Action) => {
+  const { type, newState, tokens } = action
 
   switch (type) {
     case CREATE: {
@@ -34,26 +41,33 @@ const newSpendingLimitReducer = (state: SpendingLimitModalReducerState, action)
       return {
         ...state,
         ...newState,
-        txToken: state.tokens.find((token) => token.address === newState.values.token) ?? null,
+        // we lookup into the list of tokens for the selected token info
+        txToken: tokens.find((token) => token.address === newState.values.token) ?? null,
         step: REVIEW,
       }
     }
   }
 }
 
-const useSpendingLimit = (initialStep: Step) => {
+type ActionCallback = (state?: State) => void
+type NewLimitModalHook = [State, { create: ActionCallback; review: ActionCallback }]
+
+const useNewLimitModal = (initialStep: Step): NewLimitModalHook => {
+  // globally stored tokens
   const tokens = useSelector(extendedSafeTokensSelector)
 
-  const [state, dispatch] = React.useReducer(newSpendingLimitReducer, {
+  // setup the reducer with initial values
+  const [state, dispatch] = React.useReducer(newLimitModalReducer, {
     step: initialStep,
     values: null,
-    tokens: tokens ?? [],
     txToken: null,
   })
 
-  const create = React.useCallback(() => dispatch({ type: CREATE }), [])
-  const review = React.useCallback((newState) => dispatch({ type: REVIEW, newState }), [])
+  // define actions
+  const create = React.useCallback<ActionCallback>(() => dispatch({ type: CREATE }), [])
+  const review = React.useCallback<ActionCallback>((newState) => dispatch({ type: REVIEW, newState, tokens }), [tokens])
 
+  // returns state and dispatch
   return [state, { create, review }]
 }
 
@@ -65,9 +79,11 @@ interface SpendingLimitModalProps {
 const NewLimitModal = ({ close, open }: SpendingLimitModalProps): React.ReactElement => {
   const classes = useStyles()
 
-  const [{ step, txToken, values }, { create, review }] = useSpendingLimit(CREATE)
+  // state and dispatch
+  const [{ step, txToken, values }, { create, review }] = useNewLimitModal(CREATE)
 
   const handleReview = async (values) => {
+    // if form is valid, we update the state to REVIEW and sets values
     review({ values })
   }
 

From 9acdf05491b5d3ea412019e440a56e37dc8dc9d2 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 16:55:32 -0300
Subject: [PATCH 52/69] refactor: reorganize Modal and related components

---
 .../Settings/SpendingLimit/Modal/index.tsx    | 102 ++++++++++++++++
 .../Settings/SpendingLimit/NewLimit.tsx       | 109 ------------------
 .../SpendingLimit/NewLimitModal/Create.tsx    |  96 +++++++++++++++
 .../Review.tsx}                               |  65 +++++------
 .../index.tsx}                                |  19 ++-
 .../Settings/SpendingLimit/index.tsx          |  39 +------
 6 files changed, 237 insertions(+), 193 deletions(-)
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/Modal/index.tsx
 delete mode 100644 src/routes/safe/components/Settings/SpendingLimit/NewLimit.tsx
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Create.tsx
 rename src/routes/safe/components/Settings/SpendingLimit/{NewLimitReview.tsx => NewLimitModal/Review.tsx} (82%)
 rename src/routes/safe/components/Settings/SpendingLimit/{NewLimitModal.tsx => NewLimitModal/index.tsx} (79%)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/Modal/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/Modal/index.tsx
new file mode 100644
index 0000000000..2837d00ac2
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/Modal/index.tsx
@@ -0,0 +1,102 @@
+import { Icon, Text, Title } from '@gnosis.pm/safe-react-components'
+import React from 'react'
+import styled from 'styled-components'
+
+import GnoModal from 'src/components/Modal'
+import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
+
+const TitleSection = styled.div`
+  display: flex;
+  justify-content: space-between;
+  padding: 16px 24px;
+  border-bottom: 2px solid ${({ theme }) => theme.colors.separator};
+`
+
+const StyledButton = styled.button`
+  background: none;
+  border: none;
+  padding: 5px;
+  width: 26px;
+  height: 26px;
+
+  span {
+    margin-right: 0;
+  }
+
+  :hover {
+    background: ${({ theme }) => theme.colors.separator};
+    border-radius: 16px;
+    cursor: pointer;
+  }
+`
+
+const FooterSection = styled.div`
+  border-top: 2px solid ${({ theme }) => theme.colors.separator};
+  padding: 16px 24px;
+`
+
+const FooterWrapper = styled.div`
+  display: flex;
+  justify-content: space-around;
+`
+
+export interface TopBarProps {
+  title: string
+  titleNote?: string
+  onClose: () => void
+}
+
+const TopBar = ({ title, titleNote, onClose }: TopBarProps): React.ReactElement => (
+  <TitleSection>
+    <Title size="xs" withoutMargin>
+      {title}
+      {titleNote && (
+        <>
+          {' '}
+          <Text size="lg" color="secondaryLight">
+            {titleNote}
+          </Text>
+        </>
+      )}
+    </Title>
+
+    <StyledButton onClick={onClose}>
+      <Icon size="sm" type="cross" />
+    </StyledButton>
+  </TitleSection>
+)
+
+interface FooterProps {
+  children: React.ReactNodeArray
+}
+
+const Footer = ({ children }: FooterProps): React.ReactElement => (
+  <FooterSection>
+    <FooterWrapper>{children}</FooterWrapper>
+  </FooterSection>
+)
+
+export interface ModalProps {
+  children: React.ReactNode
+  description: string
+  handleClose: () => void
+  open: boolean
+  title: string
+}
+
+// TODO: this is a potential proposal for `safe-react-components` Modal
+//  By being able to combine components for better flexibility, this way Buttons ban be part of the form body
+const Modal = ({ children, ...props }: ModalProps): React.ReactElement => {
+  const classes = useStyles()
+
+  return (
+    <GnoModal {...props} paperClassName={classes.modal}>
+      {children}
+    </GnoModal>
+  )
+}
+
+Modal.TopBar = TopBar
+Modal.Footer = Footer
+
+export default Modal
diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimit.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimit.tsx
deleted file mode 100644
index ef80663aec..0000000000
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimit.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { Button, Icon, Text, Title } from '@gnosis.pm/safe-react-components'
-import { Mutator } from 'final-form'
-import React from 'react'
-import styled from 'styled-components'
-
-import GnoForm from 'src/components/forms/GnoForm'
-import GnoButton from 'src/components/layout/Button'
-
-import { TitleSection, StyledButton, FooterSection, FooterWrapper } from '.'
-import { Amount, Beneficiary, ResetTime, Token } from './FormFields'
-
-const FormContainer = styled.div`
-  padding: 24px;
-  align-items: center;
-  display: grid;
-  grid-template-columns: 4fr 1fr;
-  grid-template-rows: 6fr;
-  gap: 16px 8px;
-  grid-template-areas:
-    'beneficiaryInput beneficiaryScan'
-    'tokenInput .'
-    'amountInput .'
-    'resetTimeLabel resetTimeLabel'
-    'resetTimeToggle resetTimeToggle'
-    'resetTimeOption resetTimeOption';
-`
-
-const YetAnotherButton = styled(GnoButton)`
-  &.Mui-disabled {
-    background-color: ${({ theme }) => theme.colors.primary};
-    color: ${({ theme }) => theme.colors.white};
-    opacity: 0.5;
-  }
-`
-
-const formMutators: Record<string, Mutator<{ beneficiary: { name: string } }>> = {
-  setBeneficiary: (args, state, utils) => {
-    utils.changeValue(state, 'beneficiary', () => args[0])
-  },
-}
-
-interface NewSpendingLimitProps {
-  initialValues?: Record<string, string>
-  onCancel: () => void
-  onReview: (values) => void
-}
-
-const canReview = ({ invalid, submitting, dirtyFieldsSinceLastSubmit, values }): boolean => {
-  return !(
-    submitting ||
-    invalid ||
-    !values.beneficiary ||
-    (values.token && !values.amount) ||
-    // TODO: review the next validation, as resetTime has a default value, this check looks unnecessary
-    (values.withResetTime && !values.resetTime) ||
-    !dirtyFieldsSinceLastSubmit
-  )
-}
-
-const NewLimit = ({ initialValues, onCancel, onReview }: NewSpendingLimitProps): React.ReactElement => (
-  <>
-    <TitleSection>
-      <Title size="xs" withoutMargin>
-        New Spending Limit{' '}
-        <Text size="lg" color="secondaryLight">
-          1 of 2
-        </Text>
-      </Title>
-
-      <StyledButton onClick={onCancel}>
-        <Icon size="sm" type="cross" />
-      </StyledButton>
-    </TitleSection>
-
-    <GnoForm formMutators={formMutators} onSubmit={onReview} initialValues={initialValues}>
-      {(...args) => (
-        <>
-          <FormContainer>
-            <Beneficiary />
-            <Token />
-            <Amount />
-            <ResetTime />
-          </FormContainer>
-
-          <FooterSection>
-            <FooterWrapper>
-              <Button color="primary" size="md" onClick={onCancel}>
-                Cancel
-              </Button>
-
-              {/* TODO: replace this with safe-react-components button. This is used as "submit" SRC Button does not triggers submission up until the 2nd click */}
-              <YetAnotherButton
-                color="primary"
-                size="medium"
-                variant="contained"
-                type="submit"
-                disabled={!canReview(args[2])}
-              >
-                Review
-              </YetAnotherButton>
-            </FooterWrapper>
-          </FooterSection>
-        </>
-      )}
-    </GnoForm>
-  </>
-)
-
-export default NewLimit
diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Create.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Create.tsx
new file mode 100644
index 0000000000..d604302727
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Create.tsx
@@ -0,0 +1,96 @@
+import { Button } from '@gnosis.pm/safe-react-components'
+import { Mutator } from 'final-form'
+import React from 'react'
+import styled from 'styled-components'
+
+import GnoForm from 'src/components/forms/GnoForm'
+import GnoButton from 'src/components/layout/Button'
+
+import { Amount, Beneficiary, ResetTime, Token } from 'src/routes/safe/components/Settings/SpendingLimit/FormFields'
+import Modal from 'src/routes/safe/components/Settings/SpendingLimit/Modal'
+
+const FormContainer = styled.div`
+  padding: 24px;
+  align-items: center;
+  display: grid;
+  grid-template-columns: 4fr 1fr;
+  grid-template-rows: 6fr;
+  gap: 16px 8px;
+  grid-template-areas:
+    'beneficiaryInput beneficiaryScan'
+    'tokenInput .'
+    'amountInput .'
+    'resetTimeLabel resetTimeLabel'
+    'resetTimeToggle resetTimeToggle'
+    'resetTimeOption resetTimeOption';
+`
+
+const YetAnotherButton = styled(GnoButton)`
+  &.Mui-disabled {
+    background-color: ${({ theme }) => theme.colors.primary};
+    color: ${({ theme }) => theme.colors.white};
+    opacity: 0.5;
+  }
+`
+
+const formMutators: Record<string, Mutator<{ beneficiary: { name: string } }>> = {
+  setBeneficiary: (args, state, utils) => {
+    utils.changeValue(state, 'beneficiary', () => args[0])
+  },
+}
+
+interface NewSpendingLimitProps {
+  initialValues?: Record<string, string>
+  onCancel: () => void
+  onReview: (values) => void
+}
+
+const canReview = ({
+  invalid,
+  submitting,
+  dirtyFieldsSinceLastSubmit,
+  values: { beneficiary, token, amount },
+}): boolean => !(submitting || invalid || !beneficiary || !token || !amount || !dirtyFieldsSinceLastSubmit)
+
+const Create = ({ initialValues, onCancel, onReview }: NewSpendingLimitProps): React.ReactElement => {
+  return (
+    <>
+      <Modal.TopBar title="New Spending Limit" titleNote="1 of 2" onClose={onCancel} />
+
+      <GnoForm formMutators={formMutators} onSubmit={onReview} initialValues={initialValues}>
+        {(...args) => {
+          return (
+            <>
+              <FormContainer>
+                <Beneficiary />
+                <Token />
+                <Amount />
+                <ResetTime />
+              </FormContainer>
+
+              <Modal.Footer>
+                <Button color="primary" size="md" onClick={onCancel}>
+                  Cancel
+                </Button>
+
+                {/* TODO: replace this with safe-react-components button. */}
+                {/*  This is used as "submit" SRC Button does not triggers submission up until the 2nd click */}
+                <YetAnotherButton
+                  color="primary"
+                  size="medium"
+                  variant="contained"
+                  type="submit"
+                  disabled={!canReview(args[2])}
+                >
+                  Review
+                </YetAnotherButton>
+              </Modal.Footer>
+            </>
+          )
+        }}
+      </GnoForm>
+    </>
+  )
+}
+
+export default Create
diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitReview.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
similarity index 82%
rename from src/routes/safe/components/Settings/SpendingLimit/NewLimitReview.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
index 3580db0bb9..2eb22ddf91 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitReview.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
@@ -1,4 +1,4 @@
-import { Button, Icon, Text, Title } from '@gnosis.pm/safe-react-components'
+import { Button, Text } from '@gnosis.pm/safe-react-components'
 import { useSnackbar } from 'notistack'
 import React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
@@ -15,11 +15,17 @@ import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
 import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
-import { FooterSection, FooterWrapper, StyledButton, TitleSection } from '.'
-import { AddressInfo, ResetTimeInfo, TokenInfo } from './InfoDisplay'
 import { RESET_TIME_OPTIONS } from 'src/routes/safe/components/Settings/SpendingLimit/FormFields/ResetTime'
-import { useStyles } from './style'
-import { adjustAmountToToken, currentMinutes, fromTokenUnit, SpendingLimitRow, toTokenUnit } from './utils'
+import { AddressInfo, ResetTimeInfo, TokenInfo } from 'src/routes/safe/components/Settings/SpendingLimit/InfoDisplay'
+import Modal from 'src/routes/safe/components/Settings/SpendingLimit/Modal'
+import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
+import {
+  adjustAmountToToken,
+  currentMinutes,
+  fromTokenUnit,
+  SpendingLimitRow,
+  toTokenUnit,
+} from 'src/routes/safe/components/Settings/SpendingLimit/utils'
 
 interface ReviewSpendingLimitProps {
   onBack: () => void
@@ -29,7 +35,7 @@ interface ReviewSpendingLimitProps {
   existentSpendingLimit?: SpendingLimitRow
 }
 
-const NewLimitReview = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps): React.ReactElement => {
+const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps): React.ReactElement => {
   const classes = useStyles()
 
   const { enqueueSnackbar, closeSnackbar } = useSnackbar()
@@ -133,18 +139,7 @@ const NewLimitReview = ({ onBack, onClose, txToken, values }: ReviewSpendingLimi
 
   return (
     <>
-      <TitleSection>
-        <Title size="xs" withoutMargin>
-          New Spending Limit{' '}
-          <Text size="lg" color="secondaryLight">
-            2 of 2
-          </Text>
-        </Title>
-
-        <StyledButton onClick={onClose}>
-          <Icon size="sm" type="cross" />
-        </StyledButton>
-      </TitleSection>
+      <Modal.TopBar title="New Spending Limit" titleNote="2 of 2" onClose={onClose} />
 
       <Block className={classes.container}>
         <Col margin="lg">
@@ -176,25 +171,23 @@ const NewLimitReview = ({ onBack, onClose, txToken, values }: ReviewSpendingLimi
         )}
       </Block>
 
-      <FooterSection>
-        <FooterWrapper>
-          <Button color="primary" size="md" onClick={onBack}>
-            Back
-          </Button>
-
-          <Button
-            color="primary"
-            size="md"
-            variant="contained"
-            onClick={handleSubmit}
-            disabled={existentSpendingLimit === undefined}
-          >
-            Submit
-          </Button>
-        </FooterWrapper>
-      </FooterSection>
+      <Modal.Footer>
+        <Button color="primary" size="md" onClick={onBack}>
+          Back
+        </Button>
+
+        <Button
+          color="primary"
+          size="md"
+          variant="contained"
+          onClick={handleSubmit}
+          disabled={existentSpendingLimit === undefined}
+        >
+          Submit
+        </Button>
+      </Modal.Footer>
     </>
   )
 }
 
-export default NewLimitReview
+export default Review
diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/index.tsx
similarity index 79%
rename from src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/index.tsx
index a7392c644f..97d4623166 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/index.tsx
@@ -2,12 +2,12 @@ import { List } from 'immutable'
 import React from 'react'
 import { useSelector } from 'react-redux'
 
-import GnoModal from 'src/components/Modal'
 import { Token } from 'src/logic/tokens/store/model/token'
-import NewLimit from 'src/routes/safe/components/Settings/SpendingLimit/NewLimit'
-import NewLimitReview from 'src/routes/safe/components/Settings/SpendingLimit/NewLimitReview'
-import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
 import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
+import Modal from 'src/routes/safe/components/Settings/SpendingLimit/Modal'
+
+import Create from './Create'
+import Review from './Review'
 
 const CREATE = 'CREATE' as const
 const REVIEW = 'REVIEW' as const
@@ -77,8 +77,6 @@ interface SpendingLimitModalProps {
 }
 
 const NewLimitModal = ({ close, open }: SpendingLimitModalProps): React.ReactElement => {
-  const classes = useStyles()
-
   // state and dispatch
   const [{ step, txToken, values }, { create, review }] = useNewLimitModal(CREATE)
 
@@ -88,16 +86,15 @@ const NewLimitModal = ({ close, open }: SpendingLimitModalProps): React.ReactEle
   }
 
   return (
-    <GnoModal
+    <Modal
       handleClose={close}
       open={open}
       title="New Spending Limit"
       description="set rules for specific beneficiaries to access funds from this Safe without having to collect all signatures"
-      paperClassName={classes.modal}
     >
-      {step === CREATE && <NewLimit initialValues={values} onCancel={close} onReview={handleReview} />}
-      {step === REVIEW && <NewLimitReview onBack={create} onClose={close} txToken={txToken} values={values} />}
-    </GnoModal>
+      {step === CREATE && <Create initialValues={values} onCancel={close} onReview={handleReview} />}
+      {step === REVIEW && <Review onBack={create} onClose={close} txToken={txToken} values={values} />}
+    </Modal>
   )
 }
 
diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index e45f4b0063..88039ee969 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -11,8 +11,8 @@ import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/con
 
 import { getSpendingLimitData, SpendingLimitTable } from './dataFetcher'
 import LimitsTable from './LimitsTable'
-import NewLimitModal from 'src/routes/safe/components/Settings/SpendingLimit/NewLimitModal'
-import NewLimitSteps from 'src/routes/safe/components/Settings/SpendingLimit/NewLimitSteps'
+import NewLimitModal from './NewLimitModal'
+import NewLimitSteps from './NewLimitSteps'
 import { useStyles } from './style'
 import { requestAllowancesByDelegatesAndTokens, requestModuleData, requestTokensByDelegate } from './utils'
 
@@ -20,41 +20,6 @@ const InfoText = styled(Text)`
   margin-top: 16px;
 `
 
-export const TitleSection = styled.div`
-  display: flex;
-  justify-content: space-between;
-  padding: 16px 24px;
-  border-bottom: 2px solid ${({ theme }) => theme.colors.separator};
-`
-
-export const StyledButton = styled.button`
-  background: none;
-  border: none;
-  padding: 5px;
-  width: 26px;
-  height: 26px;
-
-  span {
-    margin-right: 0;
-  }
-
-  :hover {
-    background: ${({ theme }) => theme.colors.separator};
-    border-radius: 16px;
-    cursor: pointer;
-  }
-`
-
-export const FooterSection = styled.div`
-  border-top: 2px solid ${({ theme }) => theme.colors.separator};
-  padding: 16px 24px;
-`
-
-export const FooterWrapper = styled.div`
-  display: flex;
-  justify-content: space-around;
-`
-
 const SpendingLimitSettings = (): React.ReactElement => {
   const classes = useStyles()
   const granted = useSelector(grantedSelector)

From 6aa4b5956b95eb44b907fc8512e718c3ee94324c Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 19:17:50 -0300
Subject: [PATCH 53/69] refactor: use Modal component for RemoveLimitModal

---
 .../SpendingLimit/RemoveLimitModal.tsx        | 40 +++++++------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
index 3170172bfb..c57a804ee5 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
@@ -1,11 +1,10 @@
-import { Button, Icon, Title } from '@gnosis.pm/safe-react-components'
+import { Button } from '@gnosis.pm/safe-react-components'
 import { useSnackbar } from 'notistack'
 import React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
-import Modal from 'src/components/Modal'
 import createTransaction from 'src/logic/safe/store/actions/createTransaction'
 import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
 import { TX_NOTIFICATION_TYPES } from 'src/logic/safe/transactions'
@@ -17,10 +16,10 @@ import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
 import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
-import { FooterSection, FooterWrapper, StyledButton, TitleSection } from '.'
 import { SpendingLimitTable } from './dataFetcher'
 import { AddressInfo, TokenInfo, ResetTimeInfo } from './InfoDisplay'
-import { RESET_TIME_OPTIONS } from 'src/routes/safe/components/Settings/SpendingLimit/FormFields/ResetTime'
+import { RESET_TIME_OPTIONS } from './FormFields/ResetTime'
+import Modal from './Modal'
 import { useStyles } from './style'
 import { fromTokenUnit } from './utils'
 
@@ -88,21 +87,12 @@ const RemoveLimitModal = ({ onClose, spendingLimit, open }: RemoveSpendingLimitM
 
   return (
     <Modal
-      description="Remove the selected Spending Limit"
       handleClose={onClose}
-      paperClassName={classes.modal}
-      title="Remove Spending Limit"
       open={open}
+      title="Remove Spending Limit"
+      description="Remove the selected Spending Limit"
     >
-      <TitleSection>
-        <Title size="xs" withoutMargin>
-          Remove Spending Limit
-        </Title>
-
-        <StyledButton onClick={onClose}>
-          <Icon size="sm" type="cross" />
-        </StyledButton>
-      </TitleSection>
+      <Modal.TopBar title="Remove Spending Limit" onClose={onClose} />
 
       <Block className={classes.container}>
         <Col margin="lg">
@@ -122,16 +112,14 @@ const RemoveLimitModal = ({ onClose, spendingLimit, open }: RemoveSpendingLimitM
         </Col>
       </Block>
 
-      <FooterSection>
-        <FooterWrapper>
-          <Button size="md" color="secondary" onClick={onClose}>
-            Cancel
-          </Button>
-          <Button color="error" size="md" variant="contained" onClick={removeSelectedSpendingLimit}>
-            Remove
-          </Button>
-        </FooterWrapper>
-      </FooterSection>
+      <Modal.Footer>
+        <Button size="md" color="secondary" onClick={onClose}>
+          Cancel
+        </Button>
+        <Button color="error" size="md" variant="contained" onClick={removeSelectedSpendingLimit}>
+          Remove
+        </Button>
+      </Modal.Footer>
     </Modal>
   )
 }

From 37daea172659294e4d51ac6c45b2ff919449e3ab Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 19:24:04 -0300
Subject: [PATCH 54/69] refactor: retrieve allowances data from store

- also make container grow with the content
---
 .../Settings/SpendingLimit/index.tsx          | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 88039ee969..147d025040 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -6,15 +6,14 @@ import styled from 'styled-components'
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
 import Row from 'src/components/layout/Row'
-import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
-import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
+import { safeSpendingLimitsSelector } from 'src/logic/safe/store/selectors'
+import { grantedSelector } from 'src/routes/safe/container/selector'
 
-import { getSpendingLimitData, SpendingLimitTable } from './dataFetcher'
+import { getSpendingLimitData } from './dataFetcher'
 import LimitsTable from './LimitsTable'
 import NewLimitModal from './NewLimitModal'
 import NewLimitSteps from './NewLimitSteps'
 import { useStyles } from './style'
-import { requestAllowancesByDelegatesAndTokens, requestModuleData, requestTokensByDelegate } from './utils'
 
 const InfoText = styled(Text)`
   margin-top: 16px;
@@ -23,20 +22,8 @@ const InfoText = styled(Text)`
 const SpendingLimitSettings = (): React.ReactElement => {
   const classes = useStyles()
   const granted = useSelector(grantedSelector)
-  const tokens = useSelector(extendedSafeTokensSelector)
-
-  // TODO: Refactor `delegates` for better performance. This is just to verify allowance works
-  const safeAddress = useSelector(safeParamAddressFromStateSelector)
-  const [spendingLimitData, setSpendingLimitData] = React.useState<SpendingLimitTable[]>()
-  React.useEffect(() => {
-    const doRequestData = async () => {
-      const [, delegates] = await requestModuleData(safeAddress)
-      const tokensByDelegate = await requestTokensByDelegate(safeAddress, delegates.results)
-      const allowances = await requestAllowancesByDelegatesAndTokens(safeAddress, tokensByDelegate)
-      setSpendingLimitData(getSpendingLimitData(allowances))
-    }
-    doRequestData()
-  }, [safeAddress, tokens])
+  const allowances = useSelector(safeSpendingLimitsSelector)
+  const spendingLimitData = getSpendingLimitData(allowances)
 
   const [showNewSpendingLimitModal, setShowNewSpendingLimitModal] = React.useState(false)
   const openNewSpendingLimitModal = () => {
@@ -48,7 +35,7 @@ const SpendingLimitSettings = (): React.ReactElement => {
 
   return (
     <>
-      <Block className={classes.container}>
+      <Block className={classes.container} grow>
         <Title size="xs" withoutMargin>
           Spending Limit
         </Title>

From 2298533f721a9be2a804497fc6acb67aec5a5d7b Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 20:20:10 -0300
Subject: [PATCH 55/69] refactor: reword "one-time" legend

---
 .../Settings/SpendingLimit/InfoDisplay/ResetTimeInfo.tsx     | 5 +----
 .../Settings/SpendingLimit/NewLimitModal/Review.tsx          | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/ResetTimeInfo.tsx b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/ResetTimeInfo.tsx
index 3629cf87db..e12c717411 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/ResetTimeInfo.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/ResetTimeInfo.tsx
@@ -19,10 +19,7 @@ const ResetTimeInfo = ({ title, label }: ResetTimeInfoProps): React.ReactElement
         </Row>
       ) : (
         <Row align="center" margin="md">
-          <Text size="lg">
-            {/* TODO: review message */}
-            One-time spending limit allowance
-          </Text>
+          <Text size="lg">One-time spending limit</Text>
         </Row>
       )}
     </DataDisplay>
diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
index 2eb22ddf91..b3ce3c1a33 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
@@ -135,7 +135,7 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
 
   const previousResetTime = (previousSpendingLimit: SpendingLimit) =>
     RESET_TIME_OPTIONS.find(({ value }) => value === (+previousSpendingLimit.resetTimeMin / 60 / 24).toString())
-      ?.label ?? 'One-time spending limit allowance'
+      ?.label ?? 'One-time spending limit'
 
   return (
     <>

From 0de201bcceb174341bde9c50959481dea8f25119 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 20:48:55 -0300
Subject: [PATCH 56/69] refactor: reorg code and use AddressInfo to display
 address info

---
 .../SpendingLimit/InfoDisplay/AddressInfo.tsx |  4 +-
 .../Settings/SpendingLimit/LimitsTable.tsx    | 62 +++++++------------
 2 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx
index ce69009819..90c20e3265 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx
@@ -10,10 +10,11 @@ import DataDisplay from './DataDisplay'
 
 interface AddressInfoProps {
   address: string
+  cut?: number
   title?: string
 }
 
-const AddressInfo = ({ address, title }: AddressInfoProps): React.ReactElement => {
+const AddressInfo = ({ address, cut, title }: AddressInfoProps): React.ReactElement => {
   const addressBook = useSelector(getAddressBook)
 
   return (
@@ -26,6 +27,7 @@ const AddressInfo = ({ address, title }: AddressInfoProps): React.ReactElement =
         showIdenticon
         textSize="lg"
         network={getNetwork()}
+        shortenHash={cut}
       />
     </DataDisplay>
   )
diff --git a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx
index e1853b2e29..fade436f54 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx
@@ -1,4 +1,4 @@
-import { Button, EthHashInfo, Text } from '@gnosis.pm/safe-react-components'
+import { Button, Text } from '@gnosis.pm/safe-react-components'
 import TableContainer from '@material-ui/core/TableContainer'
 import cn from 'classnames'
 import React from 'react'
@@ -8,9 +8,6 @@ import styled from 'styled-components'
 import Row from 'src/components/layout/Row'
 import { TableCell, TableRow } from 'src/components/layout/Table'
 import Table from 'src/components/Table'
-import { getNetwork } from 'src/config'
-import { getAddressBook } from 'src/logic/addressBook/store/selectors'
-import { getNameFromAdbk } from 'src/logic/addressBook/utils'
 import { Token } from 'src/logic/tokens/store/model/token'
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
 import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
@@ -26,7 +23,8 @@ import {
   SPENDING_LIMIT_TABLE_SPENT_ID,
   SpendingLimitTable,
 } from './dataFetcher'
-import RemoveLimitModal from 'src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal'
+import { AddressInfo } from './InfoDisplay'
+import RemoveLimitModal from './RemoveLimitModal'
 import { useStyles } from './style'
 import { fromTokenUnit } from './utils'
 
@@ -86,6 +84,20 @@ const HumanReadableSpent = ({ spent, amount, tokenAddress }: HumanReadableSpentP
   ) : null
 }
 
+const useWidthState = (width: number): number | null => {
+  const [cut, setCut] = React.useState(null)
+
+  React.useEffect(() => {
+    if (width <= 1024) {
+      setCut(4)
+    } else {
+      setCut(8)
+    }
+  }, [width])
+
+  return cut
+}
+
 interface SpendingLimitTableProps {
   data?: SpendingLimitTable[]
 }
@@ -93,34 +105,14 @@ interface SpendingLimitTableProps {
 const LimitsTable = ({ data }: SpendingLimitTableProps): React.ReactElement => {
   const classes = useStyles()
   const granted = useSelector(grantedSelector)
-  const addressBook = useSelector(getAddressBook)
 
   const columns = generateColumns()
   const autoColumns = columns.filter(({ custom }) => !custom)
 
-  const [cut, setCut] = React.useState(undefined)
   const { width } = useWindowDimensions()
-  React.useEffect(() => {
-    if (width <= 1024) {
-      setCut(4)
-    } else {
-      setCut(8)
-    }
-  }, [width])
+  const cut = useWidthState(width)
 
-  const [showRemoveSpendingLimitModal, setShowRemoveSpendingLimitModal] = React.useState(false)
   const [selectedRow, setSelectedRow] = React.useState<SpendingLimitTable>(null)
-  const openRemoveSpendingLimitModal = (row: SpendingLimitTable) => {
-    setSelectedRow(row)
-    setShowRemoveSpendingLimitModal(true)
-  }
-  const closeRemoveSpendingLimitModal = () => {
-    setShowRemoveSpendingLimitModal(false)
-    setSelectedRow(null)
-  }
-  const handleDeleteSpendingLimit = (row: SpendingLimitTable): void => {
-    openRemoveSpendingLimitModal(row)
-  }
 
   return (
     <>
@@ -150,18 +142,8 @@ const LimitsTable = ({ data }: SpendingLimitTableProps): React.ReactElement => {
                   return (
                     <TableCell align={column.align} component="td" key={`${columnId}-${index}`}>
                       {columnId === SPENDING_LIMIT_TABLE_BENEFICIARY_ID && (
-                        <EthHashInfo
-                          hash={rowElement}
-                          name={addressBook ? getNameFromAdbk(addressBook, rowElement) : ''}
-                          showCopyBtn
-                          showEtherscanBtn
-                          showIdenticon
-                          textSize="lg"
-                          shortenHash={cut}
-                          network={getNetwork()}
-                        />
+                        <AddressInfo address={rowElement} cut={cut} />
                       )}
-
                       {columnId === SPENDING_LIMIT_TABLE_SPENT_ID && <HumanReadableSpent {...rowElement} />}
                       {columnId === SPENDING_LIMIT_TABLE_RESET_TIME_ID && (
                         <Text size="lg">{rowElement.relativeTime}</Text>
@@ -177,7 +159,7 @@ const LimitsTable = ({ data }: SpendingLimitTableProps): React.ReactElement => {
                         iconType="delete"
                         color="error"
                         variant="outlined"
-                        onClick={() => handleDeleteSpendingLimit(row)}
+                        onClick={() => setSelectedRow(row)}
                         data-testid="remove-action"
                       >
                         {null}
@@ -190,8 +172,8 @@ const LimitsTable = ({ data }: SpendingLimitTableProps): React.ReactElement => {
           }
         </Table>
       </TableContainer>
-      {showRemoveSpendingLimitModal && (
-        <RemoveLimitModal onClose={closeRemoveSpendingLimitModal} spendingLimit={selectedRow} open={true} />
+      {selectedRow !== null && (
+        <RemoveLimitModal onClose={() => setSelectedRow(null)} spendingLimit={selectedRow} open={true} />
       )}
     </>
   )

From de07e5c191c218d84ce2aae9cde7ddfe7fa930c1 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 21 Aug 2020 21:13:38 -0300
Subject: [PATCH 57/69] refactor: reorg LimitsTable and split into components
 for better readability

---
 .../LimitsTable/SpentVsAmount.tsx             | 78 +++++++++++++++++++
 .../index.tsx}                                | 71 +++--------------
 2 files changed, 88 insertions(+), 61 deletions(-)
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/LimitsTable/SpentVsAmount.tsx
 rename src/routes/safe/components/Settings/SpendingLimit/{LimitsTable.tsx => LimitsTable/index.tsx} (64%)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/SpentVsAmount.tsx b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/SpentVsAmount.tsx
new file mode 100644
index 0000000000..231f062c2e
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/SpentVsAmount.tsx
@@ -0,0 +1,78 @@
+import { Text } from '@gnosis.pm/safe-react-components'
+import React from 'react'
+import { useSelector } from 'react-redux'
+import styled from 'styled-components'
+
+import { Token } from 'src/logic/tokens/store/model/token'
+import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
+import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
+import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
+import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
+import { fromTokenUnit } from 'src/routes/safe/components/Settings/SpendingLimit/utils'
+import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
+import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
+
+const StyledImage = styled.img`
+  width: 32px;
+  height: 32px;
+  object-fit: contain;
+  margin: 0 8px 0 0;
+`
+
+const StyledImageName = styled.div`
+  display: flex;
+  align-items: center;
+`
+
+const useSelectedToken = (address: string): Token => {
+  const tokens = useSelector(extendedSafeTokensSelector)
+  const [token, setToken] = React.useState<Token>(null)
+
+  React.useEffect(() => {
+    if (tokens) {
+      const tokenAddress = address === ZERO_ADDRESS ? ETH_ADDRESS : address
+      setToken(tokens.find((token) => token.address === tokenAddress) ?? null)
+    }
+  }, [address, tokens])
+
+  return token
+}
+
+type FormattedAmountsProps = { amount: string; spent: string; token?: Token }
+
+type FormattedAmounts = { amount: string; spent: string }
+
+const useFormattedAmounts = ({ amount, spent, token }: FormattedAmountsProps): FormattedAmounts => {
+  const [formattedAmounts, setFormattedAmounts] = React.useState<FormattedAmounts>(null)
+
+  React.useEffect(() => {
+    if (token) {
+      const formattedSpent = formatAmount(fromTokenUnit(spent, token.decimals)).toString()
+      const formattedAmount = formatAmount(fromTokenUnit(amount, token.decimals)).toString()
+      setFormattedAmounts({ amount: formattedAmount, spent: formattedSpent })
+    }
+  }, [amount, spent, token])
+
+  return formattedAmounts
+}
+
+interface SpentVsAmountProps {
+  amount: string
+  spent: string
+  tokenAddress: string
+}
+
+const SpentVsAmount = ({ amount, spent, tokenAddress }: SpentVsAmountProps): React.ReactElement => {
+  const { width } = useWindowDimensions()
+  const token = useSelectedToken(tokenAddress)
+  const spentInfo = useFormattedAmounts({ amount, spent, token })
+
+  return spentInfo ? (
+    <StyledImageName>
+      {width > 1024 && <StyledImage alt={token.name} onError={setImageToPlaceholder} src={token.logoUri} />}
+      <Text size="lg">{`${spentInfo.spent} of ${spentInfo.amount} ${token.symbol}`}</Text>
+    </StyledImageName>
+  ) : null
+}
+
+export default SpentVsAmount
diff --git a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx
similarity index 64%
rename from src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx
rename to src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx
index fade436f54..8ea2d0467b 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx
@@ -8,13 +8,6 @@ import styled from 'styled-components'
 import Row from 'src/components/layout/Row'
 import { TableCell, TableRow } from 'src/components/layout/Table'
 import Table from 'src/components/Table'
-import { Token } from 'src/logic/tokens/store/model/token'
-import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
-import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
-import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
-import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
-import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
-import { extendedSafeTokensSelector, grantedSelector } from 'src/routes/safe/container/selector'
 
 import {
   generateColumns,
@@ -22,22 +15,15 @@ import {
   SPENDING_LIMIT_TABLE_RESET_TIME_ID,
   SPENDING_LIMIT_TABLE_SPENT_ID,
   SpendingLimitTable,
-} from './dataFetcher'
-import { AddressInfo } from './InfoDisplay'
-import RemoveLimitModal from './RemoveLimitModal'
-import { useStyles } from './style'
-import { fromTokenUnit } from './utils'
-
-const StyledImage = styled.img`
-  width: 32px;
-  height: 32px;
-  object-fit: contain;
-  margin: 0 8px 0 0;
-`
-const StyledImageName = styled.div`
-  display: flex;
-  align-items: center;
-`
+} from 'src/routes/safe/components/Settings/SpendingLimit/dataFetcher'
+import { AddressInfo } from 'src/routes/safe/components/Settings/SpendingLimit/InfoDisplay'
+import RemoveLimitModal from 'src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal'
+import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
+import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
+import { grantedSelector } from 'src/routes/safe/container/selector'
+
+import SpentVsAmount from './SpentVsAmount'
+
 const TableActionButton = styled(Button)`
   background-color: transparent;
   padding: 0;
@@ -46,43 +32,6 @@ const TableActionButton = styled(Button)`
     background-color: transparent;
   }
 `
-type SpentInfo = {
-  token: Token
-  spent: string
-  amount: string
-}
-
-interface HumanReadableSpentProps {
-  spent: string
-  amount: string
-  tokenAddress: string
-}
-
-const HumanReadableSpent = ({ spent, amount, tokenAddress }: HumanReadableSpentProps): React.ReactElement => {
-  const tokens = useSelector(extendedSafeTokensSelector)
-  const { width } = useWindowDimensions()
-  const [spentInfo, setSpentInfo] = React.useState<SpentInfo>()
-
-  React.useEffect(() => {
-    if (tokens) {
-      const safeTokenAddress = tokenAddress === ZERO_ADDRESS ? ETH_ADDRESS : tokenAddress
-      const token = tokens.find((token) => token.address === safeTokenAddress)
-      const formattedSpent = formatAmount(fromTokenUnit(spent, token.decimals)).toString()
-      const formattedAmount = formatAmount(fromTokenUnit(amount, token.decimals)).toString()
-
-      setSpentInfo({ token, spent: formattedSpent, amount: formattedAmount })
-    }
-  }, [amount, spent, tokenAddress, tokens])
-
-  return spentInfo ? (
-    <StyledImageName>
-      {width > 1024 && (
-        <StyledImage alt={spentInfo.token.name} onError={setImageToPlaceholder} src={spentInfo.token.logoUri} />
-      )}
-      <Text size="lg">{`${spentInfo.spent} of ${spentInfo.amount} ${spentInfo.token.symbol}`}</Text>
-    </StyledImageName>
-  ) : null
-}
 
 const useWidthState = (width: number): number | null => {
   const [cut, setCut] = React.useState(null)
@@ -144,7 +93,7 @@ const LimitsTable = ({ data }: SpendingLimitTableProps): React.ReactElement => {
                       {columnId === SPENDING_LIMIT_TABLE_BENEFICIARY_ID && (
                         <AddressInfo address={rowElement} cut={cut} />
                       )}
-                      {columnId === SPENDING_LIMIT_TABLE_SPENT_ID && <HumanReadableSpent {...rowElement} />}
+                      {columnId === SPENDING_LIMIT_TABLE_SPENT_ID && <SpentVsAmount {...rowElement} />}
                       {columnId === SPENDING_LIMIT_TABLE_RESET_TIME_ID && (
                         <Text size="lg">{rowElement.relativeTime}</Text>
                       )}

From 81c1dd0b8e78eeb5c89f49e5261962062b66d953 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Sun, 23 Aug 2020 11:24:36 -0300
Subject: [PATCH 58/69] refactor: use `useMemo` whenever is possible

- also cleaned dup code, and used `useToken` custom hook
---
 .../LimitsTable/SpentVsAmount.tsx             | 35 +++++--------------
 .../SpendingLimit/LimitsTable/index.tsx       | 16 +--------
 .../SpendingLimit/NewLimitModal/Review.tsx    | 18 ++++++----
 .../SpendingLimit/RemoveLimitModal.tsx        | 14 ++------
 .../Settings/SpendingLimit/hooks/useToken.tsx | 21 +++++++++++
 .../Settings/SpendingLimit/index.tsx          |  2 +-
 6 files changed, 45 insertions(+), 61 deletions(-)
 create mode 100644 src/routes/safe/components/Settings/SpendingLimit/hooks/useToken.tsx

diff --git a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/SpentVsAmount.tsx b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/SpentVsAmount.tsx
index 231f062c2e..ef572c282e 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/SpentVsAmount.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/SpentVsAmount.tsx
@@ -1,16 +1,13 @@
 import { Text } from '@gnosis.pm/safe-react-components'
 import React from 'react'
-import { useSelector } from 'react-redux'
 import styled from 'styled-components'
 
 import { Token } from 'src/logic/tokens/store/model/token'
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
-import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
-import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
+import useToken from 'src/routes/safe/components/Settings/SpendingLimit/hooks/useToken'
 import { fromTokenUnit } from 'src/routes/safe/components/Settings/SpendingLimit/utils'
 import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
-import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
 
 const StyledImage = styled.img`
   width: 32px;
@@ -24,36 +21,20 @@ const StyledImageName = styled.div`
   align-items: center;
 `
 
-const useSelectedToken = (address: string): Token => {
-  const tokens = useSelector(extendedSafeTokensSelector)
-  const [token, setToken] = React.useState<Token>(null)
-
-  React.useEffect(() => {
-    if (tokens) {
-      const tokenAddress = address === ZERO_ADDRESS ? ETH_ADDRESS : address
-      setToken(tokens.find((token) => token.address === tokenAddress) ?? null)
-    }
-  }, [address, tokens])
-
-  return token
-}
-
 type FormattedAmountsProps = { amount: string; spent: string; token?: Token }
 
 type FormattedAmounts = { amount: string; spent: string }
 
 const useFormattedAmounts = ({ amount, spent, token }: FormattedAmountsProps): FormattedAmounts => {
-  const [formattedAmounts, setFormattedAmounts] = React.useState<FormattedAmounts>(null)
-
-  React.useEffect(() => {
+  return React.useMemo(() => {
     if (token) {
       const formattedSpent = formatAmount(fromTokenUnit(spent, token.decimals)).toString()
       const formattedAmount = formatAmount(fromTokenUnit(amount, token.decimals)).toString()
-      setFormattedAmounts({ amount: formattedAmount, spent: formattedSpent })
+      return { amount: formattedAmount, spent: formattedSpent }
     }
-  }, [amount, spent, token])
 
-  return formattedAmounts
+    return null
+  }, [amount, spent, token])
 }
 
 interface SpentVsAmountProps {
@@ -64,12 +45,14 @@ interface SpentVsAmountProps {
 
 const SpentVsAmount = ({ amount, spent, tokenAddress }: SpentVsAmountProps): React.ReactElement => {
   const { width } = useWindowDimensions()
-  const token = useSelectedToken(tokenAddress)
+  const showIcon = React.useMemo(() => width > 1024, [width])
+
+  const token = useToken(tokenAddress)
   const spentInfo = useFormattedAmounts({ amount, spent, token })
 
   return spentInfo ? (
     <StyledImageName>
-      {width > 1024 && <StyledImage alt={token.name} onError={setImageToPlaceholder} src={token.logoUri} />}
+      {showIcon && <StyledImage alt={token.name} onError={setImageToPlaceholder} src={token.logoUri} />}
       <Text size="lg">{`${spentInfo.spent} of ${spentInfo.amount} ${token.symbol}`}</Text>
     </StyledImageName>
   ) : null
diff --git a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx
index 8ea2d0467b..ea6e673cb7 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx
@@ -33,20 +33,6 @@ const TableActionButton = styled(Button)`
   }
 `
 
-const useWidthState = (width: number): number | null => {
-  const [cut, setCut] = React.useState(null)
-
-  React.useEffect(() => {
-    if (width <= 1024) {
-      setCut(4)
-    } else {
-      setCut(8)
-    }
-  }, [width])
-
-  return cut
-}
-
 interface SpendingLimitTableProps {
   data?: SpendingLimitTable[]
 }
@@ -59,7 +45,7 @@ const LimitsTable = ({ data }: SpendingLimitTableProps): React.ReactElement => {
   const autoColumns = columns.filter(({ custom }) => !custom)
 
   const { width } = useWindowDimensions()
-  const cut = useWidthState(width)
+  const cut = React.useMemo(() => (width <= 1024 ? 4 : 8), [width])
 
   const [selectedRow, setSelectedRow] = React.useState<SpendingLimitTable>(null)
 
diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
index b3ce3c1a33..14f22e2512 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
@@ -129,13 +129,17 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
       .catch(console.error)
   }
 
-  const resetTimeLabel = values.withResetTime
-    ? RESET_TIME_OPTIONS.find(({ value }) => value === values.resetTime)?.label
-    : ''
+  const resetTimeLabel = React.useMemo(
+    () => (values.withResetTime ? RESET_TIME_OPTIONS.find(({ value }) => value === values.resetTime)?.label : ''),
+    [values.resetTime, values.withResetTime],
+  )
 
-  const previousResetTime = (previousSpendingLimit: SpendingLimit) =>
-    RESET_TIME_OPTIONS.find(({ value }) => value === (+previousSpendingLimit.resetTimeMin / 60 / 24).toString())
-      ?.label ?? 'One-time spending limit'
+  const previousResetTime = React.useMemo(
+    () =>
+      RESET_TIME_OPTIONS.find(({ value }) => value === (+existentSpendingLimit.resetTimeMin / 60 / 24).toString())
+        ?.label ?? 'One-time spending limit',
+    [existentSpendingLimit.resetTimeMin],
+  )
 
   return (
     <>
@@ -158,7 +162,7 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
           {existentSpendingLimit && (
             <Row align="center" margin="md">
               <Text size="lg" color="error">
-                Previous Reset Time: {previousResetTime(existentSpendingLimit)}
+                Previous Reset Time: {previousResetTime}
               </Text>
             </Row>
           )}
diff --git a/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
index c57a804ee5..461f948ce3 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
@@ -8,11 +8,10 @@ import Col from 'src/components/layout/Col'
 import createTransaction from 'src/logic/safe/store/actions/createTransaction'
 import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
 import { TX_NOTIFICATION_TYPES } from 'src/logic/safe/transactions'
-import { Token } from 'src/logic/tokens/store/model/token'
 import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
 import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
 import { getWeb3 } from 'src/logic/wallets/getWeb3'
-import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
+import useToken from 'src/routes/safe/components/Settings/SpendingLimit/hooks/useToken'
 import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
@@ -32,16 +31,7 @@ interface RemoveSpendingLimitModalProps {
 const RemoveLimitModal = ({ onClose, spendingLimit, open }: RemoveSpendingLimitModalProps): React.ReactElement => {
   const classes = useStyles()
 
-  const tokens = useSelector(extendedSafeTokensSelector)
-  const [tokenInfo, setTokenInfo] = React.useState<Token>()
-  React.useEffect(() => {
-    if (tokens) {
-      const tokenAddress =
-        spendingLimit.spent.tokenAddress === ZERO_ADDRESS ? ETH_ADDRESS : spendingLimit.spent.tokenAddress
-      const foundToken = tokens.find((token) => token.address === tokenAddress)
-      setTokenInfo(foundToken)
-    }
-  }, [spendingLimit.spent.tokenAddress, tokens])
+  const tokenInfo = useToken(spendingLimit.spent.tokenAddress)
 
   const safeAddress = useSelector(safeParamAddressFromStateSelector)
   const { enqueueSnackbar, closeSnackbar } = useSnackbar()
diff --git a/src/routes/safe/components/Settings/SpendingLimit/hooks/useToken.tsx b/src/routes/safe/components/Settings/SpendingLimit/hooks/useToken.tsx
new file mode 100644
index 0000000000..27b4b38098
--- /dev/null
+++ b/src/routes/safe/components/Settings/SpendingLimit/hooks/useToken.tsx
@@ -0,0 +1,21 @@
+import React from 'react'
+import { useSelector } from 'react-redux'
+import { Token } from 'src/logic/tokens/store/model/token'
+import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
+import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
+import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
+
+const useToken = (address: string): Token => {
+  const tokens = useSelector(extendedSafeTokensSelector)
+
+  return React.useMemo(() => {
+    if (tokens) {
+      const tokenAddress = address === ZERO_ADDRESS ? ETH_ADDRESS : address
+      return tokens.find((token) => token.address === tokenAddress) ?? null
+    }
+
+    return null
+  }, [address, tokens])
+}
+
+export default useToken
diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index 147d025040..a53277879d 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -35,7 +35,7 @@ const SpendingLimitSettings = (): React.ReactElement => {
 
   return (
     <>
-      <Block className={classes.container} grow>
+      <Block className={classes.container} grow="grow">
         <Title size="xs" withoutMargin>
           Spending Limit
         </Title>

From 28347f8d03c361fa7affb7c997bf727337738319 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Mon, 24 Aug 2020 10:30:55 -0300
Subject: [PATCH 59/69] refactor: move `Allowance.json` into
 `src/logic/contracts/artifacts` directory

- also reorganized imports in affected files
---
 .../contracts/artifacts}/AllowanceModule.json |  0
 src/logic/contracts/safeContracts.ts          | 24 ++++++++++---------
 .../SpendingLimit/RemoveLimitModal.tsx        |  4 ++--
 .../Settings/SpendingLimit/utils.ts           |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)
 rename src/{utils => logic/contracts/artifacts}/AllowanceModule.json (100%)

diff --git a/src/utils/AllowanceModule.json b/src/logic/contracts/artifacts/AllowanceModule.json
similarity index 100%
rename from src/utils/AllowanceModule.json
rename to src/logic/contracts/artifacts/AllowanceModule.json
diff --git a/src/logic/contracts/safeContracts.ts b/src/logic/contracts/safeContracts.ts
index b533212044..164a563d13 100644
--- a/src/logic/contracts/safeContracts.ts
+++ b/src/logic/contracts/safeContracts.ts
@@ -1,19 +1,21 @@
-import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
-import { AbiItem } from 'web3-utils'
-import contract from 'truffle-contract'
-import Web3 from 'web3'
-import ProxyFactorySol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafeProxyFactory.json'
 import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
 import SafeProxy from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafeProxy.json'
-import SpendingLimitModule from 'src/utils/AllowanceModule.json'
-import { ensureOnce } from 'src/utils/singleton'
+import ProxyFactorySol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafeProxyFactory.json'
 import memoize from 'lodash.memoize'
-import { getWeb3, getNetworkIdFrom } from 'src/logic/wallets/getWeb3'
-import { calculateGasOf, calculateGasPrice } from 'src/logic/wallets/ethTransactions'
-import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
+import contract from 'truffle-contract'
+import Web3 from 'web3'
+import { AbiItem } from 'web3-utils'
+
 import { isProxyCode } from 'src/logic/contracts/historicProxyCode'
-import { GnosisSafeProxyFactory } from 'src/types/contracts/GnosisSafeProxyFactory.d';
+import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
+import { calculateGasOf, calculateGasPrice } from 'src/logic/wallets/ethTransactions'
+import { getNetworkIdFrom, getWeb3 } from 'src/logic/wallets/getWeb3'
 import { GnosisSafe } from 'src/types/contracts/GnosisSafe.d'
+import { GnosisSafeProxyFactory } from 'src/types/contracts/GnosisSafeProxyFactory.d'
+import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
+import { ensureOnce } from 'src/utils/singleton'
+
+import SpendingLimitModule from './artifacts/AllowanceModule.json'
 
 export const SENTINEL_ADDRESS = '0x0000000000000000000000000000000000000001'
 export const MULTI_SEND_ADDRESS = '0x8d29be29923b68abfdd21e541b9374737b49cdad'
diff --git a/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
index 461f948ce3..3ce050992d 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
@@ -5,6 +5,7 @@ import { useDispatch, useSelector } from 'react-redux'
 
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
+import SpendingLimitModule from 'src/logic/contracts/artifacts/AllowanceModule.json'
 import createTransaction from 'src/logic/safe/store/actions/createTransaction'
 import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
 import { TX_NOTIFICATION_TYPES } from 'src/logic/safe/transactions'
@@ -12,12 +13,11 @@ import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
 import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
 import { getWeb3 } from 'src/logic/wallets/getWeb3'
 import useToken from 'src/routes/safe/components/Settings/SpendingLimit/hooks/useToken'
-import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
 import { SpendingLimitTable } from './dataFetcher'
-import { AddressInfo, TokenInfo, ResetTimeInfo } from './InfoDisplay'
 import { RESET_TIME_OPTIONS } from './FormFields/ResetTime'
+import { AddressInfo, ResetTimeInfo, TokenInfo } from './InfoDisplay'
 import Modal from './Modal'
 import { useStyles } from './style'
 import { fromTokenUnit } from './utils'
diff --git a/src/routes/safe/components/Settings/SpendingLimit/utils.ts b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
index a6352fc637..66ce0290ad 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/utils.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/utils.ts
@@ -1,10 +1,10 @@
 import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
 import { BigNumber } from 'bignumber.js'
 
+import SpendingLimitModule from 'src/logic/contracts/artifacts/AllowanceModule.json'
 import generateBatchRequests from 'src/logic/contracts/generateBatchRequests'
 import { SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
 import { web3ReadOnly } from 'src/logic/wallets/getWeb3'
-import SpendingLimitModule from 'src/utils/AllowanceModule.json'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
 export const KEYCODES = {

From 330e1deb9f7fce1051533daf7df2236e3a2411c9 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Mon, 24 Aug 2020 10:45:23 -0300
Subject: [PATCH 60/69] refactor: moved `dataFetcher` into `/LimitsTable`

- also reorganized imports in affected files
---
 .../SpendingLimit/{ => LimitsTable}/dataFetcher.ts  |  2 +-
 .../Settings/SpendingLimit/LimitsTable/index.tsx    | 13 ++++++-------
 .../Settings/SpendingLimit/RemoveLimitModal.tsx     |  2 +-
 .../components/Settings/SpendingLimit/index.tsx     |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename src/routes/safe/components/Settings/SpendingLimit/{ => LimitsTable}/dataFetcher.ts (96%)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/dataFetcher.ts
similarity index 96%
rename from src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
rename to src/routes/safe/components/Settings/SpendingLimit/LimitsTable/dataFetcher.ts
index 2564289a09..dd1cfb1d9c 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/dataFetcher.ts
+++ b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/dataFetcher.ts
@@ -3,7 +3,7 @@ import { List } from 'immutable'
 
 import { TableColumn } from 'src/components/Table/types.d'
 
-import { SpendingLimitRow } from './utils'
+import { SpendingLimitRow } from 'src/routes/safe/components/Settings/SpendingLimit/utils'
 
 export const SPENDING_LIMIT_TABLE_BENEFICIARY_ID = 'beneficiary'
 export const SPENDING_LIMIT_TABLE_SPENT_ID = 'spent'
diff --git a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx
index ea6e673cb7..df2967cd2c 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx
@@ -8,6 +8,11 @@ import styled from 'styled-components'
 import Row from 'src/components/layout/Row'
 import { TableCell, TableRow } from 'src/components/layout/Table'
 import Table from 'src/components/Table'
+import { AddressInfo } from 'src/routes/safe/components/Settings/SpendingLimit/InfoDisplay'
+import RemoveLimitModal from 'src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal'
+import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
+import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
+import { grantedSelector } from 'src/routes/safe/container/selector'
 
 import {
   generateColumns,
@@ -15,13 +20,7 @@ import {
   SPENDING_LIMIT_TABLE_RESET_TIME_ID,
   SPENDING_LIMIT_TABLE_SPENT_ID,
   SpendingLimitTable,
-} from 'src/routes/safe/components/Settings/SpendingLimit/dataFetcher'
-import { AddressInfo } from 'src/routes/safe/components/Settings/SpendingLimit/InfoDisplay'
-import RemoveLimitModal from 'src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal'
-import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
-import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
-import { grantedSelector } from 'src/routes/safe/container/selector'
-
+} from './dataFetcher'
 import SpentVsAmount from './SpentVsAmount'
 
 const TableActionButton = styled(Button)`
diff --git a/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
index 3ce050992d..853f524588 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
@@ -15,9 +15,9 @@ import { getWeb3 } from 'src/logic/wallets/getWeb3'
 import useToken from 'src/routes/safe/components/Settings/SpendingLimit/hooks/useToken'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
-import { SpendingLimitTable } from './dataFetcher'
 import { RESET_TIME_OPTIONS } from './FormFields/ResetTime'
 import { AddressInfo, ResetTimeInfo, TokenInfo } from './InfoDisplay'
+import { SpendingLimitTable } from './LimitsTable/dataFetcher'
 import Modal from './Modal'
 import { useStyles } from './style'
 import { fromTokenUnit } from './utils'
diff --git a/src/routes/safe/components/Settings/SpendingLimit/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
index a53277879d..b11eb350dc 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/index.tsx
@@ -9,8 +9,8 @@ import Row from 'src/components/layout/Row'
 import { safeSpendingLimitsSelector } from 'src/logic/safe/store/selectors'
 import { grantedSelector } from 'src/routes/safe/container/selector'
 
-import { getSpendingLimitData } from './dataFetcher'
 import LimitsTable from './LimitsTable'
+import { getSpendingLimitData } from './LimitsTable/dataFetcher'
 import NewLimitModal from './NewLimitModal'
 import NewLimitSteps from './NewLimitSteps'
 import { useStyles } from './style'

From bdee93959a5a783cbbee7192da4b7bd72f16e921 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Mon, 24 Aug 2020 11:56:56 -0300
Subject: [PATCH 61/69] refactor: move away from Apps' `sendTransactions`
 method. Using custom multiSend txs

- Added notifications messages (this is extremely verbose, not sure if I should only use the Settings messages)
---
 .../notifications/notificationBuilder.tsx     | 30 +++++++++++
 src/logic/notifications/notificationTypes.ts  | 50 +++++++++++++++++++
 .../safe/transactions/notifiedTransactions.ts |  2 +
 .../SpendingLimit/NewLimitModal/Review.tsx    | 31 ++++++++----
 .../SpendingLimit/RemoveLimitModal.tsx        |  2 +-
 5 files changed, 103 insertions(+), 12 deletions(-)

diff --git a/src/logic/notifications/notificationBuilder.tsx b/src/logic/notifications/notificationBuilder.tsx
index a3bd0978a3..3bcf7d6778 100644
--- a/src/logic/notifications/notificationBuilder.tsx
+++ b/src/logic/notifications/notificationBuilder.tsx
@@ -99,6 +99,28 @@ const settingsChangeTxNotificationsQueue = {
   afterExecutionError: NOTIFICATIONS.SETTINGS_CHANGE_FAILED_MSG,
 }
 
+const newSpendingLimitTxNotificationsQueue = {
+  beforeExecution: NOTIFICATIONS.SIGN_NEW_SPENDING_LIMIT_MSG,
+  pendingExecution: NOTIFICATIONS.NEW_SPENDING_LIMIT_PENDING_MSG,
+  afterRejection: NOTIFICATIONS.NEW_SPENDING_LIMIT_REJECTED_MSG,
+  afterExecution: {
+    noMoreConfirmationsNeeded: NOTIFICATIONS.NEW_SPENDING_LIMIT_EXECUTED_MSG,
+    moreConfirmationsNeeded: NOTIFICATIONS.NEW_SPENDING_LIMIT_EXECUTED_MORE_CONFIRMATIONS_MSG,
+  },
+  afterExecutionError: NOTIFICATIONS.NEW_SPENDING_LIMIT_FAILED_MSG,
+}
+
+const removeSpendingLimitTxNotificationsQueue = {
+  beforeExecution: NOTIFICATIONS.SIGN_REMOVE_SPENDING_LIMIT_MSG,
+  pendingExecution: NOTIFICATIONS.REMOVE_SPENDING_LIMIT_PENDING_MSG,
+  afterRejection: NOTIFICATIONS.REMOVE_SPENDING_LIMIT_REJECTED_MSG,
+  afterExecution: {
+    noMoreConfirmationsNeeded: NOTIFICATIONS.REMOVE_SPENDING_LIMIT_EXECUTED_MSG,
+    moreConfirmationsNeeded: NOTIFICATIONS.REMOVE_SPENDING_LIMIT_EXECUTED_MORE_CONFIRMATIONS_MSG,
+  },
+  afterExecutionError: NOTIFICATIONS.REMOVE_SPENDING_LIMIT_FAILED_MSG,
+}
+
 const defaultNotificationsQueue = {
   beforeExecution: NOTIFICATIONS.SIGN_TX_MSG,
   pendingExecution: NOTIFICATIONS.TX_PENDING_MSG,
@@ -166,6 +188,14 @@ export const getNotificationsFromTxType: any = (txType, origin) => {
       notificationsQueue = settingsChangeTxNotificationsQueue
       break
     }
+    case TX_NOTIFICATION_TYPES.NEW_SPENDING_LIMIT_TX: {
+      notificationsQueue = newSpendingLimitTxNotificationsQueue
+      break
+    }
+    case TX_NOTIFICATION_TYPES.REMOVE_SPENDING_LIMIT_TX: {
+      notificationsQueue = removeSpendingLimitTxNotificationsQueue
+      break
+    }
     case TX_NOTIFICATION_TYPES.SAFE_NAME_CHANGE_TX: {
       notificationsQueue = safeNameChangeNotificationsQueue
       break
diff --git a/src/logic/notifications/notificationTypes.ts b/src/logic/notifications/notificationTypes.ts
index 30c31eed0c..6ca65bdd38 100644
--- a/src/logic/notifications/notificationTypes.ts
+++ b/src/logic/notifications/notificationTypes.ts
@@ -147,6 +147,56 @@ export const NOTIFICATIONS = {
     options: { variant: ERROR, persist: false, autoHideDuration: longDuration },
   },
 
+  // Spending Limit
+  SIGN_NEW_SPENDING_LIMIT_MSG: {
+    message: 'Please sign the new Spending Limit tx',
+    options: { variant: INFO, persist: true },
+  },
+  NEW_SPENDING_LIMIT_PENDING_MSG: {
+    message: 'New Spending Limit tx pending',
+    options: { variant: INFO, persist: true },
+  },
+  NEW_SPENDING_LIMIT_REJECTED_MSG: {
+    message: 'New Spending Limit tx rejected',
+    options: { variant: ERROR, persist: false, autoHideDuration: longDuration },
+  },
+  NEW_SPENDING_LIMIT_EXECUTED_MSG: {
+    message: 'New Spending Limit tx successfully executed',
+    options: { variant: SUCCESS, persist: false, autoHideDuration: longDuration },
+  },
+  NEW_SPENDING_LIMIT_EXECUTED_MORE_CONFIRMATIONS_MSG: {
+    message: 'New Spending Limit tx successfully created. More confirmations needed to execute',
+    options: { variant: SUCCESS, persist: false, autoHideDuration: longDuration },
+  },
+  NEW_SPENDING_LIMIT_FAILED_MSG: {
+    message: 'New Spending Limit tx failed',
+    options: { variant: ERROR, persist: false, autoHideDuration: longDuration },
+  },
+  SIGN_REMOVE_SPENDING_LIMIT_MSG: {
+    message: 'Please sign the remove Spending Limit tx',
+    options: { variant: INFO, persist: true },
+  },
+  REMOVE_SPENDING_LIMIT_PENDING_MSG: {
+    message: 'Remove Spending Limit tx pending',
+    options: { variant: INFO, persist: true },
+  },
+  REMOVE_SPENDING_LIMIT_REJECTED_MSG: {
+    message: 'Remove Spending Limit tx rejected',
+    options: { variant: ERROR, persist: false, autoHideDuration: longDuration },
+  },
+  REMOVE_SPENDING_LIMIT_EXECUTED_MSG: {
+    message: 'Remove Spending Limit tx successfully executed',
+    options: { variant: SUCCESS, persist: false, autoHideDuration: longDuration },
+  },
+  REMOVE_SPENDING_LIMIT_EXECUTED_MORE_CONFIRMATIONS_MSG: {
+    message: 'Remove Spending Limit tx successfully created. More confirmations needed to execute',
+    options: { variant: SUCCESS, persist: false, autoHideDuration: longDuration },
+  },
+  REMOVE_SPENDING_LIMIT_FAILED_MSG: {
+    message: 'Remove Spending Limit tx failed',
+    options: { variant: ERROR, persist: false, autoHideDuration: longDuration },
+  },
+
   // Network
   RINKEBY_VERSION_MSG: {
     message: "Rinkeby Version: Don't send Mainnet assets to this Safe",
diff --git a/src/logic/safe/transactions/notifiedTransactions.ts b/src/logic/safe/transactions/notifiedTransactions.ts
index 83700fd98e..79867eddd1 100644
--- a/src/logic/safe/transactions/notifiedTransactions.ts
+++ b/src/logic/safe/transactions/notifiedTransactions.ts
@@ -4,6 +4,8 @@ export const TX_NOTIFICATION_TYPES: any = {
   CANCELLATION_TX: 'CANCELLATION_TX',
   WAITING_TX: 'WAITING_TX',
   SETTINGS_CHANGE_TX: 'SETTINGS_CHANGE_TX',
+  NEW_SPENDING_LIMIT_TX: 'NEW_SPENDING_LIMIT_TX',
+  REMOVE_SPENDING_LIMIT_TX: 'REMOVE_SPENDING_LIMIT_TX',
   SAFE_NAME_CHANGE_TX: 'SAFE_NAME_CHANGE_TX',
   OWNER_NAME_CHANGE_TX: 'OWNER_NAME_CHANGE_TX',
   ADDRESSBOOK_NEW_ENTRY: 'ADDRESSBOOK_NEW_ENTRY',
diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
index 14f22e2512..2f17b1d563 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
@@ -6,13 +6,20 @@ import { useDispatch, useSelector } from 'react-redux'
 import Block from 'src/components/layout/Block'
 import Col from 'src/components/layout/Col'
 import Row from 'src/components/layout/Row'
-import { getGnosisSafeInstanceAt, getSpendingLimitContract } from 'src/logic/contracts/safeContracts'
+import {
+  getGnosisSafeInstanceAt,
+  getSpendingLimitContract,
+  MULTI_SEND_ADDRESS,
+} from 'src/logic/contracts/safeContracts'
+import createTransaction from 'src/logic/safe/store/actions/createTransaction'
 import { SpendingLimit } from 'src/logic/safe/store/models/safe'
 import { safeParamAddressFromStateSelector, safeSpendingLimitsSelector } from 'src/logic/safe/store/selectors'
+import { DELEGATE_CALL, TX_NOTIFICATION_TYPES } from 'src/logic/safe/transactions'
+import { getEncodedMultiSendCallData } from 'src/logic/safe/utils/upgradeSafe'
 import { Token } from 'src/logic/tokens/store/model/token'
 import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
 import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
-import sendTransactions from 'src/routes/safe/components/Apps/sendTransactions'
+import { getWeb3 } from 'src/logic/wallets/getWeb3'
 import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
 import { RESET_TIME_OPTIONS } from 'src/routes/safe/components/Settings/SpendingLimit/FormFields/ResetTime'
@@ -117,16 +124,18 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
         .encodeABI(),
     })
 
-    await sendTransactions(
-      dispatch,
-      safeAddress,
-      transactions,
-      enqueueSnackbar,
-      closeSnackbar,
-      JSON.stringify({ name: 'Spending Limit', message: 'New Allowance' }),
+    dispatch(
+      createTransaction({
+        safeAddress,
+        to: MULTI_SEND_ADDRESS,
+        valueInWei: '0',
+        txData: getEncodedMultiSendCallData(transactions, getWeb3()),
+        notifiedTransaction: TX_NOTIFICATION_TYPES.NEW_SPENDING_LIMIT_TX,
+        enqueueSnackbar,
+        closeSnackbar,
+        operation: DELEGATE_CALL,
+      }),
     )
-      .then(onClose)
-      .catch(console.error)
   }
 
   const resetTimeLabel = React.useMemo(
diff --git a/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
index 853f524588..57e9644f24 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
@@ -59,7 +59,7 @@ const RemoveLimitModal = ({ onClose, spendingLimit, open }: RemoveSpendingLimitM
           to: SPENDING_LIMIT_MODULE_ADDRESS,
           valueInWei: '0',
           txData,
-          notifiedTransaction: TX_NOTIFICATION_TYPES.SETTINGS_CHANGE_TX,
+          notifiedTransaction: TX_NOTIFICATION_TYPES.REMOVE_SPENDING_LIMIT_TX,
           enqueueSnackbar,
           closeSnackbar,
         }),

From d5bec404f96bdea602a42d4e177134b7f59dc279 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Mon, 24 Aug 2020 11:57:51 -0300
Subject: [PATCH 62/69] refactor: undo `previousResetTime` as a memoized value

---
 .../Settings/SpendingLimit/NewLimitModal/Review.tsx   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
index 2f17b1d563..66e420b450 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
@@ -143,12 +143,9 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
     [values.resetTime, values.withResetTime],
   )
 
-  const previousResetTime = React.useMemo(
-    () =>
-      RESET_TIME_OPTIONS.find(({ value }) => value === (+existentSpendingLimit.resetTimeMin / 60 / 24).toString())
-        ?.label ?? 'One-time spending limit',
-    [existentSpendingLimit.resetTimeMin],
-  )
+  const previousResetTime = (existentSpendingLimit: SpendingLimit) =>
+    RESET_TIME_OPTIONS.find(({ value }) => value === (+existentSpendingLimit.resetTimeMin / 60 / 24).toString())
+      ?.label ?? 'One-time spending limit'
 
   return (
     <>
@@ -171,7 +168,7 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
           {existentSpendingLimit && (
             <Row align="center" margin="md">
               <Text size="lg" color="error">
-                Previous Reset Time: {previousResetTime}
+                Previous Reset Time: {previousResetTime(existentSpendingLimit)}
               </Text>
             </Row>
           )}

From b7f60837bdd01c6365bd7046ca874ef76bb72eaf Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Mon, 24 Aug 2020 12:26:06 -0300
Subject: [PATCH 63/69] feature: use `multiSend` txs only when needed

---
 .../SpendingLimit/NewLimitModal/Review.tsx    | 47 +++++++++++++------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
index 66e420b450..62f2ab0e9d 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
@@ -110,7 +110,7 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
 
     // prepare the setAllowance tx
     const startTime = currentMinutes() - 30
-    transactions.push({
+    const setAllowanceTx = {
       to: SPENDING_LIMIT_MODULE_ADDRESS,
       value: 0,
       data: spendingLimitContract.methods
@@ -122,20 +122,37 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
           values.withResetTime ? startTime : 0,
         )
         .encodeABI(),
-    })
-
-    dispatch(
-      createTransaction({
-        safeAddress,
-        to: MULTI_SEND_ADDRESS,
-        valueInWei: '0',
-        txData: getEncodedMultiSendCallData(transactions, getWeb3()),
-        notifiedTransaction: TX_NOTIFICATION_TYPES.NEW_SPENDING_LIMIT_TX,
-        enqueueSnackbar,
-        closeSnackbar,
-        operation: DELEGATE_CALL,
-      }),
-    )
+    }
+
+    // if there's no tx for enable module or adding a delegate, then we avoid using multiSend Tx
+    if (transactions.length === 0) {
+      dispatch(
+        createTransaction({
+          safeAddress,
+          to: SPENDING_LIMIT_MODULE_ADDRESS,
+          valueInWei: '0',
+          txData: setAllowanceTx.data,
+          notifiedTransaction: TX_NOTIFICATION_TYPES.NEW_SPENDING_LIMIT_TX,
+          enqueueSnackbar,
+          closeSnackbar,
+        }),
+      )
+    } else {
+      transactions.push(setAllowanceTx)
+
+      dispatch(
+        createTransaction({
+          safeAddress,
+          to: MULTI_SEND_ADDRESS,
+          valueInWei: '0',
+          txData: getEncodedMultiSendCallData(transactions, getWeb3()),
+          notifiedTransaction: TX_NOTIFICATION_TYPES.NEW_SPENDING_LIMIT_TX,
+          enqueueSnackbar,
+          closeSnackbar,
+          operation: DELEGATE_CALL,
+        }),
+      )
+    }
   }
 
   const resetTimeLabel = React.useMemo(

From 2fab251fc918bb94a8a2f921da58b9116af4f304 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Mon, 24 Aug 2020 12:29:29 -0300
Subject: [PATCH 64/69] fix: add support for ETH allowance modification

---
 .../components/Settings/SpendingLimit/NewLimitModal/Review.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
index 62f2ab0e9d..f1466cb561 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
@@ -61,7 +61,7 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
       const currentDelegate = spendingLimits.find(
         ({ delegate, token }) =>
           delegate.toLowerCase() === values.beneficiary.toLowerCase() &&
-          token.toLowerCase() === values.token.toLowerCase(),
+          token.toLowerCase() === (values.token === ETH_ADDRESS ? ZERO_ADDRESS : values.token.toLowerCase()),
       )
 
       // let the user know that is about to replace an existent allowance

From a35be6d77db715b81dd2a5889b6a9b9dab02c95f Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Mon, 24 Aug 2020 12:37:07 -0300
Subject: [PATCH 65/69] fix: support non existent `spendingLimits`

---
 .../Settings/SpendingLimit/NewLimitModal/Review.tsx           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
index f1466cb561..62d438f4e4 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
@@ -58,7 +58,7 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
   React.useEffect(() => {
     const checkExistence = async () => {
       // if `delegate` already exist, check what tokens were delegated to the _beneficiary_ `getTokens(safe, delegate)`
-      const currentDelegate = spendingLimits.find(
+      const currentDelegate = spendingLimits?.find(
         ({ delegate, token }) =>
           delegate.toLowerCase() === values.beneficiary.toLowerCase() &&
           token.toLowerCase() === (values.token === ETH_ADDRESS ? ZERO_ADDRESS : values.token.toLowerCase()),
@@ -97,7 +97,7 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
     // does `delegate` already exist? (`getDelegates`, previously queried to build the table with allowances (??))
     //                                  ^ - shall we rely on this or query the list of delegates once again?
     const isDelegateAlreadyAdded =
-      spendingLimits.some(({ delegate }) => delegate.toLowerCase() === values?.beneficiary.toLowerCase()) ?? false
+      spendingLimits?.some(({ delegate }) => delegate.toLowerCase() === values?.beneficiary.toLowerCase()) ?? false
 
     // if `delegate` does not exist, add it by calling `addDelegate(beneficiary)`
     if (!isDelegateAlreadyAdded && values?.beneficiary) {

From 5550ca9c842a54928146979d265dfaf9f8730996 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Tue, 25 Aug 2020 09:27:34 -0300
Subject: [PATCH 66/69] fix: set fixed length for addresses

---
 .../Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx    | 2 +-
 .../Settings/SpendingLimit/LimitsTable/index.tsx          | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx
index 90c20e3265..1abeb5960a 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx
@@ -14,7 +14,7 @@ interface AddressInfoProps {
   title?: string
 }
 
-const AddressInfo = ({ address, cut, title }: AddressInfoProps): React.ReactElement => {
+const AddressInfo = ({ address, cut = 4, title }: AddressInfoProps): React.ReactElement => {
   const addressBook = useSelector(getAddressBook)
 
   return (
diff --git a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx
index df2967cd2c..7502088996 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/index.tsx
@@ -11,7 +11,6 @@ import Table from 'src/components/Table'
 import { AddressInfo } from 'src/routes/safe/components/Settings/SpendingLimit/InfoDisplay'
 import RemoveLimitModal from 'src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal'
 import { useStyles } from 'src/routes/safe/components/Settings/SpendingLimit/style'
-import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
 import { grantedSelector } from 'src/routes/safe/container/selector'
 
 import {
@@ -43,9 +42,6 @@ const LimitsTable = ({ data }: SpendingLimitTableProps): React.ReactElement => {
   const columns = generateColumns()
   const autoColumns = columns.filter(({ custom }) => !custom)
 
-  const { width } = useWindowDimensions()
-  const cut = React.useMemo(() => (width <= 1024 ? 4 : 8), [width])
-
   const [selectedRow, setSelectedRow] = React.useState<SpendingLimitTable>(null)
 
   return (
@@ -75,9 +71,7 @@ const LimitsTable = ({ data }: SpendingLimitTableProps): React.ReactElement => {
 
                   return (
                     <TableCell align={column.align} component="td" key={`${columnId}-${index}`}>
-                      {columnId === SPENDING_LIMIT_TABLE_BENEFICIARY_ID && (
-                        <AddressInfo address={rowElement} cut={cut} />
-                      )}
+                      {columnId === SPENDING_LIMIT_TABLE_BENEFICIARY_ID && <AddressInfo address={rowElement} />}
                       {columnId === SPENDING_LIMIT_TABLE_SPENT_ID && <SpentVsAmount {...rowElement} />}
                       {columnId === SPENDING_LIMIT_TABLE_RESET_TIME_ID && (
                         <Text size="lg">{rowElement.relativeTime}</Text>

From e8c8c34847b85fa5c7c99255773ca72f89c89dde Mon Sep 17 00:00:00 2001
From: Daniel Sanchez <daniel.sanchez@gnosis.pm>
Date: Wed, 26 Aug 2020 15:31:59 +0200
Subject: [PATCH 67/69] Update React import

---
 src/components/Modal/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx
index 94ff2e8981..a758c041e7 100644
--- a/src/components/Modal/index.tsx
+++ b/src/components/Modal/index.tsx
@@ -1,7 +1,7 @@
 import Modal from '@material-ui/core/Modal'
 import { makeStyles, createStyles } from '@material-ui/core/styles'
 import cn from 'classnames'
-import * as React from 'react'
+import React from 'react'
 
 import { sm } from 'src/theme/variables'
 

From 073a065025b2cc33e610bbbc5fae15247a919775 Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 26 Aug 2020 12:25:13 -0300
Subject: [PATCH 68/69] fix: avoid `UNKNOWN` as contact name

---
 .../Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx
index 1abeb5960a..eae0f7016d 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/InfoDisplay/AddressInfo.tsx
@@ -3,8 +3,7 @@ import React from 'react'
 import { useSelector } from 'react-redux'
 
 import { getNetwork } from 'src/config'
-import { getAddressBook } from 'src/logic/addressBook/store/selectors'
-import { getNameFromAdbk } from 'src/logic/addressBook/utils'
+import { getNameFromAddressBook } from 'src/logic/addressBook/store/selectors'
 
 import DataDisplay from './DataDisplay'
 
@@ -15,13 +14,13 @@ interface AddressInfoProps {
 }
 
 const AddressInfo = ({ address, cut = 4, title }: AddressInfoProps): React.ReactElement => {
-  const addressBook = useSelector(getAddressBook)
+  const name = useSelector((state) => getNameFromAddressBook(state, address))
 
   return (
     <DataDisplay title={title}>
       <EthHashInfo
         hash={address}
-        name={addressBook ? getNameFromAdbk(addressBook, address) : ''}
+        name={name !== 'UNKNOWN' && name}
         showCopyBtn
         showEtherscanBtn
         showIdenticon

From 813fa68d97b3b914155087627be716bb1cf6478c Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Fri, 28 Aug 2020 20:20:56 -0300
Subject: [PATCH 69/69] fixes after merge

---
 src/logic/notifications/notificationTypes.ts         | 12 ++++++++++++
 src/logic/safe/store/actions/fetchSafe.ts            |  1 +
 src/routes/safe/components/Layout/index.tsx          |  0
 .../SpendingLimit/LimitsTable/SpentVsAmount.tsx      |  2 +-
 .../Settings/SpendingLimit/NewLimitModal/Review.tsx  |  6 ------
 .../Settings/SpendingLimit/RemoveLimitModal.tsx      |  4 ----
 6 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 src/routes/safe/components/Layout/index.tsx

diff --git a/src/logic/notifications/notificationTypes.ts b/src/logic/notifications/notificationTypes.ts
index eb4cc3942f..9a21310b71 100644
--- a/src/logic/notifications/notificationTypes.ts
+++ b/src/logic/notifications/notificationTypes.ts
@@ -46,6 +46,18 @@ const NOTIFICATION_IDS = {
   SETTINGS_CHANGE_EXECUTED_MSG: 'SETTINGS_CHANGE_EXECUTED_MSG',
   SETTINGS_CHANGE_EXECUTED_MORE_CONFIRMATIONS_MSG: 'SETTINGS_CHANGE_EXECUTED_MORE_CONFIRMATIONS_MSG',
   SETTINGS_CHANGE_FAILED_MSG: 'SETTINGS_CHANGE_FAILED_MSG',
+  SIGN_NEW_SPENDING_LIMIT_MSG: 'SIGN_NEW_SPENDING_LIMIT_MSG',
+  NEW_SPENDING_LIMIT_PENDING_MSG: 'NEW_SPENDING_LIMIT_PENDING_MSG',
+  NEW_SPENDING_LIMIT_REJECTED_MSG: 'NEW_SPENDING_LIMIT_REJECTED_MSG',
+  NEW_SPENDING_LIMIT_EXECUTED_MSG: 'NEW_SPENDING_LIMIT_EXECUTED_MSG',
+  NEW_SPENDING_LIMIT_EXECUTED_MORE_CONFIRMATIONS_MSG: 'NEW_SPENDING_LIMIT_EXECUTED_MORE_CONFIRMATIONS_MSG',
+  NEW_SPENDING_LIMIT_FAILED_MSG: 'NEW_SPENDING_LIMIT_FAILED_MSG',
+  SIGN_REMOVE_SPENDING_LIMIT_MSG: 'SIGN_REMOVE_SPENDING_LIMIT_MSG',
+  REMOVE_SPENDING_LIMIT_PENDING_MSG: 'REMOVE_SPENDING_LIMIT_PENDING_MSG',
+  REMOVE_SPENDING_LIMIT_REJECTED_MSG: 'REMOVE_SPENDING_LIMIT_REJECTED_MSG',
+  REMOVE_SPENDING_LIMIT_EXECUTED_MSG: 'REMOVE_SPENDING_LIMIT_EXECUTED_MSG',
+  REMOVE_SPENDING_LIMIT_EXECUTED_MORE_CONFIRMATIONS_MSG: 'REMOVE_SPENDING_LIMIT_EXECUTED_MORE_CONFIRMATIONS_MSG',
+  REMOVE_SPENDING_LIMIT_FAILED_MSG: 'REMOVE_SPENDING_LIMIT_FAILED_MSG',
   RINKEBY_VERSION_MSG: 'RINKEBY_VERSION_MSG',
   WRONG_NETWORK_MSG: 'WRONG_NETWORK_MSG',
   ADDRESS_BOOK_NEW_ENTRY_SUCCESS: 'ADDRESS_BOOK_NEW_ENTRY_SUCCESS',
diff --git a/src/logic/safe/store/actions/fetchSafe.ts b/src/logic/safe/store/actions/fetchSafe.ts
index 9cdc1e6055..22fc29635c 100644
--- a/src/logic/safe/store/actions/fetchSafe.ts
+++ b/src/logic/safe/store/actions/fetchSafe.ts
@@ -89,6 +89,7 @@ export const buildSafe = async (
     currentVersion,
     needsUpdate,
     featuresEnabled,
+    spendingLimits: null,
     balances: Map(),
     latestIncomingTxBlock: null,
     activeAssets: Set(),
diff --git a/src/routes/safe/components/Layout/index.tsx b/src/routes/safe/components/Layout/index.tsx
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/SpentVsAmount.tsx b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/SpentVsAmount.tsx
index ef572c282e..bcac4da0c4 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/SpentVsAmount.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/LimitsTable/SpentVsAmount.tsx
@@ -7,7 +7,7 @@ import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 import useToken from 'src/routes/safe/components/Settings/SpendingLimit/hooks/useToken'
 import { fromTokenUnit } from 'src/routes/safe/components/Settings/SpendingLimit/utils'
-import { useWindowDimensions } from 'src/routes/safe/container/hooks/useWindowDimensions'
+import { useWindowDimensions } from 'src/logic/hooks/useWindowDimensions'
 
 const StyledImage = styled.img`
   width: 32px;
diff --git a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
index 62d438f4e4..ecdef8370f 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx
@@ -1,5 +1,4 @@
 import { Button, Text } from '@gnosis.pm/safe-react-components'
-import { useSnackbar } from 'notistack'
 import React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 
@@ -45,7 +44,6 @@ interface ReviewSpendingLimitProps {
 const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps): React.ReactElement => {
   const classes = useStyles()
 
-  const { enqueueSnackbar, closeSnackbar } = useSnackbar()
   const dispatch = useDispatch()
 
   const safeAddress = useSelector(safeParamAddressFromStateSelector)
@@ -133,8 +131,6 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
           valueInWei: '0',
           txData: setAllowanceTx.data,
           notifiedTransaction: TX_NOTIFICATION_TYPES.NEW_SPENDING_LIMIT_TX,
-          enqueueSnackbar,
-          closeSnackbar,
         }),
       )
     } else {
@@ -147,8 +143,6 @@ const Review = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps):
           valueInWei: '0',
           txData: getEncodedMultiSendCallData(transactions, getWeb3()),
           notifiedTransaction: TX_NOTIFICATION_TYPES.NEW_SPENDING_LIMIT_TX,
-          enqueueSnackbar,
-          closeSnackbar,
           operation: DELEGATE_CALL,
         }),
       )
diff --git a/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
index 57e9644f24..0a1cd7bd1d 100644
--- a/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
+++ b/src/routes/safe/components/Settings/SpendingLimit/RemoveLimitModal.tsx
@@ -1,5 +1,4 @@
 import { Button } from '@gnosis.pm/safe-react-components'
-import { useSnackbar } from 'notistack'
 import React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 
@@ -34,7 +33,6 @@ const RemoveLimitModal = ({ onClose, spendingLimit, open }: RemoveSpendingLimitM
   const tokenInfo = useToken(spendingLimit.spent.tokenAddress)
 
   const safeAddress = useSelector(safeParamAddressFromStateSelector)
-  const { enqueueSnackbar, closeSnackbar } = useSnackbar()
   const dispatch = useDispatch()
 
   const removeSelectedSpendingLimit = async (): Promise<void> => {
@@ -60,8 +58,6 @@ const RemoveLimitModal = ({ onClose, spendingLimit, open }: RemoveSpendingLimitM
           valueInWei: '0',
           txData,
           notifiedTransaction: TX_NOTIFICATION_TYPES.REMOVE_SPENDING_LIMIT_TX,
-          enqueueSnackbar,
-          closeSnackbar,
         }),
       )
     } catch (e) {